Merge branch '2.3' of git://github.com/blaugueux/symfony-docs into blaugueux-2.3

weaverryan · weaverryan · commit 51c20a1bafba · 2013-06-30T15:53:29.000-05:00
Conflicts:
	reference/forms/types/datetime.rst
diff --git a/reference/forms/types/date.rst b/reference/forms/types/date.rst
@@ -26,8 +26,8 @@ day, and year) or three select boxes (see the `widget_` option).
 |                      | - `months`_                                                                 |
 |                      | - `days`_                                                                   |
 |                      | - `format`_                                                                 |
-|                      | - `data_timezone`_                                                          |
-|                      | - `user_timezone`_                                                          |
+|                      | - `model_timezone`_                                                         |
+|                      | - `view_timezone`_                                                          |
 +----------------------+-----------------------------------------------------------------------------+
 | Overridden Options   | - `by_reference`_                                                           |
 |                      | - `error_bubbling`_                                                         |
@@ -115,9 +115,9 @@ Alternatively, you can specify a string to be displayed for the "blank" value::
 
 .. include:: /reference/forms/types/options/date_format.rst.inc
 
-.. include:: /reference/forms/types/options/data_timezone.rst.inc
+.. include:: /reference/forms/types/options/model_timezone.rst.inc
 
-.. include:: /reference/forms/types/options/user_timezone.rst.inc
+.. include:: /reference/forms/types/options/view_timezone.rst.inc
 
 Overridden Options
 ------------------
diff --git a/reference/forms/types/datetime.rst b/reference/forms/types/datetime.rst
@@ -26,8 +26,8 @@ data can be a ``DateTime`` object, a string, a timestamp or an array.
 |                      | - `months`_                                                                 |
 |                      | - `days`_                                                                   |
 |                      | - `with_seconds`_                                                           |
-|                      | - `data_timezone`_                                                          |
-|                      | - `user_timezone`_                                                          |
+|                      | - `model_timezone`_                                                         |
+|                      | - `view_timezone`_                                                          |
 |                      | - `empty_value`_                                                            |
 +----------------------+-----------------------------------------------------------------------------+
 | Inherited            | - `invalid_message`_                                                        |
@@ -98,9 +98,9 @@ for more details.
 
 .. include:: /reference/forms/types/options/with_seconds.rst.inc
 
-.. include:: /reference/forms/types/options/data_timezone.rst.inc
+.. include:: /reference/forms/types/options/model_timezone.rst.inc
 
-.. include:: /reference/forms/types/options/user_timezone.rst.inc
+.. include:: /reference/forms/types/options/view_timezone.rst.inc
 
 .. include:: /reference/forms/types/options/empty_value.rst.inc
 
diff --git a/reference/forms/types/options/model_timezone.rst.inc b/reference/forms/types/options/model_timezone.rst.inc
@@ -1,4 +1,4 @@
-data_timezone
+model_timezone
 ~~~~~~~~~~~~~
 
 **type**: ``string`` **default**: system default timezone
diff --git a/reference/forms/types/options/view_timezone.rst.inc b/reference/forms/types/options/view_timezone.rst.inc
@@ -1,4 +1,4 @@
-user_timezone
+view_timezone
 ~~~~~~~~~~~~~
 
 **type**: ``string`` **default**: system default timezone

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-data_timezone`
	`1`	`+model_timezone`
`2`	`2`	`~~~~~~~~~~~~~`
`3`	`3`
`4`	`4`	type: ``string`` default: system default timezone
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-user_timezone`
	`1`	`+view_timezone`
`2`	`2`	`~~~~~~~~~~~~~`
`3`	`3`
`4`	`4`	type: ``string`` default: system default timezone