Commit51c20a1

committed

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

Conflicts:reference/forms/types/datetime.rst

2 parents57f7e98 +87d3d66 commit51c20a1Copy full SHA for 51c20a1

File tree

+10

-10

lines changed

+10

-10

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -26,8 +26,8 @@ day, and year) or three select boxes (see the `widget_` option).
`26`	`26`	\|\| - `months`_\|
`27`	`27`	\|\| - `days`_\|
`28`	`28`	\|\| - `format`_\|
`29`		-\|\| - `data_timezone`_\|
`30`		-\|\| - `user_timezone`_\|
	`29`	+\|\| - `model_timezone`_\|
	`30`	+\|\| - `view_timezone`_\|
`31`	`31`	`+----------------------+-----------------------------------------------------------------------------+`
`32`	`32`	\| Overridden Options\| - `by_reference`_\|
`33`	`33`	\|\| - `error_bubbling`_\|
`@@ -115,9 +115,9 @@ Alternatively, you can specify a string to be displayed for the "blank" value::`
`115`	`115`
`116`	`116`	`..include::/reference/forms/types/options/date_format.rst.inc`
`117`	`117`
`118`		`-..include::/reference/forms/types/options/data_timezone.rst.inc`
	`118`	`+..include::/reference/forms/types/options/model_timezone.rst.inc`
`119`	`119`
`120`		`-..include::/reference/forms/types/options/user_timezone.rst.inc`
	`120`	`+..include::/reference/forms/types/options/view_timezone.rst.inc`
`121`	`121`
`122`	`122`	`Overridden Options`
`123`	`123`	`------------------`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -26,8 +26,8 @@ data can be a ``DateTime`` object, a string, a timestamp or an array.
`26`	`26`	\|\| - `months`_\|
`27`	`27`	\|\| - `days`_\|
`28`	`28`	\|\| - `with_seconds`_\|
`29`		-\|\| - `data_timezone`_\|
`30`		-\|\| - `user_timezone`_\|
	`29`	+\|\| - `model_timezone`_\|
	`30`	+\|\| - `view_timezone`_\|
`31`	`31`	\|\| - `empty_value`_\|
`32`	`32`	`+----------------------+-----------------------------------------------------------------------------+`
`33`	`33`	\| Inherited\| - `invalid_message`_\|
`@@ -98,9 +98,9 @@ for more details.`
`98`	`98`
`99`	`99`	`..include::/reference/forms/types/options/with_seconds.rst.inc`
`100`	`100`
`101`		`-..include::/reference/forms/types/options/data_timezone.rst.inc`
	`101`	`+..include::/reference/forms/types/options/model_timezone.rst.inc`
`102`	`102`
`103`		`-..include::/reference/forms/types/options/user_timezone.rst.inc`
	`103`	`+..include::/reference/forms/types/options/view_timezone.rst.inc`
`104`	`104`
`105`	`105`	`..include::/reference/forms/types/options/empty_value.rst.inc`
`106`	`106`

Lines changed: 1 addition & 1 deletion

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

Lines changed: 1 addition & 1 deletion

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

Comments

(0)