From 5354c3559ac3b6bb224cbb87fd318660527eb531 Mon Sep 17 00:00:00 2001 From: Alexandr Kalenyuk Date: Mon, 30 Mar 2015 18:36:12 +0300 Subject: [PATCH 1/3] #3412 correct overriden option's name of timezone --- reference/forms/types/timezone.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/reference/forms/types/timezone.rst b/reference/forms/types/timezone.rst index e7e99266c55..fbfcd4d4b21 100644 --- a/reference/forms/types/timezone.rst +++ b/reference/forms/types/timezone.rst @@ -18,7 +18,7 @@ you should just use the ``choice`` type directly. +-------------+------------------------------------------------------------------------+ | Rendered as | can be various tags (see :ref:`forms-reference-choice-tags`) | +-------------+------------------------------------------------------------------------+ -| Overridden | - `choice_list`_ | +| Overridden | - `choices`_ | | Options | | +-------------+------------------------------------------------------------------------+ | Inherited | from the :doc:`choice ` type | @@ -49,12 +49,12 @@ you should just use the ``choice`` type directly. Overridden Options ------------------ -choice_list +choices ~~~~~~~~~~~ **default**: :class:`Symfony\\Component\\Form\\Extension\\Core\\ChoiceList\\TimezoneChoiceList` -The Timezone type defaults the choice_list to all timezones returned by +The Timezone type defaults the choices to all timezones returned by :phpmethod:`DateTimeZone::listIdentifiers`, broken down by continent. Inherited Options From 81d018f675894a3c73ffa29912714a3d4d9e0e24 Mon Sep 17 00:00:00 2001 From: Alexandr Kalenyuk Date: Tue, 31 Mar 2015 09:55:40 +0300 Subject: [PATCH 2/3] fix table --- reference/forms/types/timezone.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/forms/types/timezone.rst b/reference/forms/types/timezone.rst index fbfcd4d4b21..7fcee1fcd35 100644 --- a/reference/forms/types/timezone.rst +++ b/reference/forms/types/timezone.rst @@ -18,7 +18,7 @@ you should just use the ``choice`` type directly. +-------------+------------------------------------------------------------------------+ | Rendered as | can be various tags (see :ref:`forms-reference-choice-tags`) | +-------------+------------------------------------------------------------------------+ -| Overridden | - `choices`_ | +| Overridden | - `choices`_ | | Options | | +-------------+------------------------------------------------------------------------+ | Inherited | from the :doc:`choice ` type | From 72697076a3d8f85301d1658faa52681a21f9460c Mon Sep 17 00:00:00 2001 From: Alexandr Kalenyuk Date: Tue, 31 Mar 2015 10:01:16 +0300 Subject: [PATCH 3/3] change length of underlining characters --- reference/forms/types/timezone.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/forms/types/timezone.rst b/reference/forms/types/timezone.rst index 7fcee1fcd35..387fd98c44f 100644 --- a/reference/forms/types/timezone.rst +++ b/reference/forms/types/timezone.rst @@ -50,7 +50,7 @@ Overridden Options ------------------ choices -~~~~~~~~~~~ +~~~~~~~ **default**: :class:`Symfony\\Component\\Form\\Extension\\Core\\ChoiceList\\TimezoneChoiceList`