From d945ba2baf53ed00ee1ac7d3033c3616b01d0f5a Mon Sep 17 00:00:00 2001 From: Yannick Date: Wed, 9 Apr 2014 16:24:58 +0200 Subject: [PATCH 01/15] [Form] Fix #9325 --- reference/forms/types/password.rst | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/reference/forms/types/password.rst b/reference/forms/types/password.rst index fa9df3f3b12..4de1b11b2d4 100644 --- a/reference/forms/types/password.rst +++ b/reference/forms/types/password.rst @@ -9,7 +9,8 @@ The ``password`` field renders an input password text box. +-------------+------------------------------------------------------------------------+ | Rendered as | ``input`` ``password`` field | +-------------+------------------------------------------------------------------------+ -| Options | - `always_empty`_ | +| Options | - `always_empty`_ (deprecated as of 2.6) | +| | - `reset_on_submit`_ | +-------------+------------------------------------------------------------------------+ | Inherited | - `max_length`_ (deprecated as of 2.5) | | options | - `empty_data`_ | @@ -34,6 +35,14 @@ Field Options always_empty ~~~~~~~~~~~~ +.. caution:: + + The ``_always_empty`` option has been deprecated and will be removed in 3.0. + Instead, use the ``reset_on_submit`` option. + +reset_on_submit +~~~~~~~~~~~~ + **type**: ``Boolean`` **default**: ``true`` If set to true, the field will *always* render blank, even if the corresponding From 8eae36d856ef32b6c8e87dc006a3169303b6f1c0 Mon Sep 17 00:00:00 2001 From: Yannick Date: Wed, 9 Apr 2014 17:16:31 +0200 Subject: [PATCH 02/15] Revert "[Form] Fix #9325" This reverts commit d945ba2baf53ed00ee1ac7d3033c3616b01d0f5a. --- reference/forms/types/password.rst | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/reference/forms/types/password.rst b/reference/forms/types/password.rst index 4de1b11b2d4..fa9df3f3b12 100644 --- a/reference/forms/types/password.rst +++ b/reference/forms/types/password.rst @@ -9,8 +9,7 @@ The ``password`` field renders an input password text box. +-------------+------------------------------------------------------------------------+ | Rendered as | ``input`` ``password`` field | +-------------+------------------------------------------------------------------------+ -| Options | - `always_empty`_ (deprecated as of 2.6) | -| | - `reset_on_submit`_ | +| Options | - `always_empty`_ | +-------------+------------------------------------------------------------------------+ | Inherited | - `max_length`_ (deprecated as of 2.5) | | options | - `empty_data`_ | @@ -35,14 +34,6 @@ Field Options always_empty ~~~~~~~~~~~~ -.. caution:: - - The ``_always_empty`` option has been deprecated and will be removed in 3.0. - Instead, use the ``reset_on_submit`` option. - -reset_on_submit -~~~~~~~~~~~~ - **type**: ``Boolean`` **default**: ``true`` If set to true, the field will *always* render blank, even if the corresponding From 805c4bdb0bf7d11c894aab25380d0ff2604c30fe Mon Sep 17 00:00:00 2001 From: Yannick Date: Thu, 10 Apr 2014 00:24:52 +0200 Subject: [PATCH 03/15] [WCM][Form] Deprecate "read_only" option --- reference/forms/twig_reference.rst | 2 -- reference/forms/types/birthday.rst | 2 +- reference/forms/types/checkbox.rst | 2 +- reference/forms/types/choice.rst | 2 +- reference/forms/types/country.rst | 2 +- reference/forms/types/currency.rst | 2 +- reference/forms/types/date.rst | 2 +- reference/forms/types/datetime.rst | 2 +- reference/forms/types/email.rst | 2 +- reference/forms/types/entity.rst | 2 +- reference/forms/types/file.rst | 2 +- reference/forms/types/form.rst | 2 +- reference/forms/types/integer.rst | 2 +- reference/forms/types/language.rst | 2 +- reference/forms/types/locale.rst | 2 +- reference/forms/types/money.rst | 2 +- reference/forms/types/number.rst | 2 +- reference/forms/types/options/read_only.rst.inc | 5 +++++ reference/forms/types/password.rst | 2 +- reference/forms/types/percent.rst | 2 +- reference/forms/types/radio.rst | 2 +- reference/forms/types/search.rst | 2 +- reference/forms/types/text.rst | 2 +- reference/forms/types/textarea.rst | 2 +- reference/forms/types/time.rst | 2 +- reference/forms/types/timezone.rst | 2 +- reference/forms/types/url.rst | 2 +- 27 files changed, 30 insertions(+), 27 deletions(-) diff --git a/reference/forms/twig_reference.rst b/reference/forms/twig_reference.rst index fc19dc08b11..f92e23824ff 100644 --- a/reference/forms/twig_reference.rst +++ b/reference/forms/twig_reference.rst @@ -343,8 +343,6 @@ object: +------------------------+-------------------------------------------------------------------------------------+ | ``value`` | The value that will be used when rendering (commonly the ``value`` HTML attribute). | +------------------------+-------------------------------------------------------------------------------------+ -| ``read_only`` | If ``true``, ``readonly="readonly"`` is added to the field. | -+------------------------+-------------------------------------------------------------------------------------+ | ``disabled`` | If ``true``, ``disabled="disabled"`` is added to the field. | +------------------------+-------------------------------------------------------------------------------------+ | ``required`` | If ``true``, a ``required`` attribute is added to the field to activate HTML5 | diff --git a/reference/forms/types/birthday.rst b/reference/forms/types/birthday.rst index d78a25cce2d..77da3be7ec5 100644 --- a/reference/forms/types/birthday.rst +++ b/reference/forms/types/birthday.rst @@ -33,7 +33,7 @@ option defaults to 120 years ago to the current year. | | - `data`_ | | | - `invalid_message`_ | | | - `invalid_message_parameters`_ | -| | - `read_only`_ | +| | - `read_only`_ (deprecated as of 2.6) | | | - `disabled`_ | | | - `mapped`_ | | | - `inherit_data`_ | diff --git a/reference/forms/types/checkbox.rst b/reference/forms/types/checkbox.rst index 546a5bc9933..68fd8564027 100644 --- a/reference/forms/types/checkbox.rst +++ b/reference/forms/types/checkbox.rst @@ -20,7 +20,7 @@ if the box is unchecked, the value will be set to false. | options | - `required`_ | | | - `label`_ | | | - `label_attr`_ | -| | - `read_only`_ | +| | - `read_only`_ (deprecated as of 2.6) | | | - `disabled`_ | | | - `error_bubbling`_ | | | - `error_mapping`_ | diff --git a/reference/forms/types/choice.rst b/reference/forms/types/choice.rst index 4cc88ed5f50..f866a79b6f2 100644 --- a/reference/forms/types/choice.rst +++ b/reference/forms/types/choice.rst @@ -28,7 +28,7 @@ option. | options | - `label`_ | | | - `label_attr`_ | | | - `data`_ | -| | - `read_only`_ | +| | - `read_only`_ (deprecated as of 2.6) | | | - `disabled`_ | | | - `error_mapping`_ | | | - `mapped`_ | diff --git a/reference/forms/types/country.rst b/reference/forms/types/country.rst index e8bb61ae572..cc01e48380e 100644 --- a/reference/forms/types/country.rst +++ b/reference/forms/types/country.rst @@ -36,7 +36,7 @@ you should just use the ``choice`` type directly. | | - `label`_ | | | - `label_attr`_ | | | - `data`_ | -| | - `read_only`_ | +| | - `read_only`_ (deprecated as of 2.6) | | | - `disabled`_ | | | - `mapped`_ | +-------------+-----------------------------------------------------------------------+ diff --git a/reference/forms/types/currency.rst b/reference/forms/types/currency.rst index b91b55f5a48..f9a2fb9da37 100644 --- a/reference/forms/types/currency.rst +++ b/reference/forms/types/currency.rst @@ -29,7 +29,7 @@ should just use the ``choice`` type directly. | | - `label`_ | | | - `label_attr`_ | | | - `data`_ | -| | - `read_only`_ | +| | - `read_only`_ (deprecated as of 2.6) | | | - `disabled`_ | | | - `mapped`_ | +-------------+------------------------------------------------------------------------+ diff --git a/reference/forms/types/date.rst b/reference/forms/types/date.rst index 92459cb2de4..13b7267b3bb 100644 --- a/reference/forms/types/date.rst +++ b/reference/forms/types/date.rst @@ -35,7 +35,7 @@ day, and year) or three select boxes (see the `widget`_ option). | Inherited | - `data`_ | | options | - `invalid_message`_ | | | - `invalid_message_parameters`_ | -| | - `read_only`_ | +| | - `read_only`_ (deprecated as of 2.6) | | | - `disabled`_ | | | - `mapped`_ | | | - `inherit_data`_ | diff --git a/reference/forms/types/datetime.rst b/reference/forms/types/datetime.rst index 4abc048ee5f..2adf3e538ef 100644 --- a/reference/forms/types/datetime.rst +++ b/reference/forms/types/datetime.rst @@ -36,7 +36,7 @@ data can be a ``DateTime`` object, a string, a timestamp or an array. | Inherited | - `data`_ | | options | - `invalid_message`_ | | | - `invalid_message_parameters`_ | -| | - `read_only`_ | +| | - `read_only`_ (deprecated as of 2.6) | | | - `disabled`_ | | | - `mapped`_ | | | - `inherit_data`_ | diff --git a/reference/forms/types/email.rst b/reference/forms/types/email.rst index e03177a47e1..cc9f0ca4501 100644 --- a/reference/forms/types/email.rst +++ b/reference/forms/types/email.rst @@ -17,7 +17,7 @@ The ``email`` field is a text field that is rendered using the HTML5 | | - `label_attr`_ | | | - `data`_ | | | - `trim`_ | -| | - `read_only`_ | +| | - `read_only`_ (deprecated as of 2.6) | | | - `disabled`_ | | | - `error_bubbling`_ | | | - `error_mapping`_ | diff --git a/reference/forms/types/entity.rst b/reference/forms/types/entity.rst index f43cd7c9363..1fe72e5476d 100644 --- a/reference/forms/types/entity.rst +++ b/reference/forms/types/entity.rst @@ -31,7 +31,7 @@ objects from the database. | | - `label`_ | | | - `label_attr`_ | | | - `data`_ | -| | - `read_only`_ | +| | - `read_only`_ (deprecated as of 2.6) | | | - `disabled`_ | | | - `error_bubbling`_ | | | - `error_mapping`_ | diff --git a/reference/forms/types/file.rst b/reference/forms/types/file.rst index c7992b24241..78d7c9f8329 100644 --- a/reference/forms/types/file.rst +++ b/reference/forms/types/file.rst @@ -15,7 +15,7 @@ The ``file`` type represents a file input in your form. | options | - `required`_ | | | - `label`_ | | | - `label_attr`_ | -| | - `read_only`_ | +| | - `read_only`_ (deprecated as of 2.6) | | | - `disabled`_ | | | - `error_bubbling`_ | | | - `error_mapping`_ | diff --git a/reference/forms/types/form.rst b/reference/forms/types/form.rst index 8aedffb86f7..1425d88b4be 100644 --- a/reference/forms/types/form.rst +++ b/reference/forms/types/form.rst @@ -16,7 +16,7 @@ on all types for which ``form`` is the parent type. | | - `label_attr`_ | | | - `constraints`_ | | | - `cascade_validation`_ | -| | - `read_only`_ | +| | - `read_only`_ (deprecated as of 2.6) | | | - `trim`_ | | | - `mapped`_ | | | - `property_path`_ | diff --git a/reference/forms/types/integer.rst b/reference/forms/types/integer.rst index 1b376ca1266..7b9d6911d0f 100644 --- a/reference/forms/types/integer.rst +++ b/reference/forms/types/integer.rst @@ -24,7 +24,7 @@ integers. By default, all non-integer values (e.g. 6.78) will round down (e.g. 6 | | - `label`_ | | | - `label_attr`_ | | | - `data`_ | -| | - `read_only`_ | +| | - `read_only`_ (deprecated as of 2.6) | | | - `disabled`_ | | | - `error_bubbling`_ | | | - `error_mapping`_ | diff --git a/reference/forms/types/language.rst b/reference/forms/types/language.rst index 1b8e78b2db4..5c219cabc3b 100644 --- a/reference/forms/types/language.rst +++ b/reference/forms/types/language.rst @@ -37,7 +37,7 @@ you should just use the ``choice`` type directly. | | - `label`_ | | | - `label_attr`_ | | | - `data`_ | -| | - `read_only`_ | +| | - `read_only`_ (deprecated as of 2.6) | | | - `disabled`_ | | | - `mapped`_ | +-------------+------------------------------------------------------------------------+ diff --git a/reference/forms/types/locale.rst b/reference/forms/types/locale.rst index c5626f71b95..7412af56334 100644 --- a/reference/forms/types/locale.rst +++ b/reference/forms/types/locale.rst @@ -39,7 +39,7 @@ you should just use the ``choice`` type directly. | | - `label`_ | | | - `label_attr`_ | | | - `data`_ | -| | - `read_only`_ | +| | - `read_only`_ (deprecated as of 2.6) | | | - `disabled`_ | | | - `mapped`_ | +-------------+------------------------------------------------------------------------+ diff --git a/reference/forms/types/money.rst b/reference/forms/types/money.rst index 0f6f07248bb..105655ff895 100644 --- a/reference/forms/types/money.rst +++ b/reference/forms/types/money.rst @@ -24,7 +24,7 @@ how the input and output of the data is handled. | | - `label`_ | | | - `label_attr`_ | | | - `data`_ | -| | - `read_only`_ | +| | - `read_only`_ (deprecated as of 2.6) | | | - `disabled`_ | | | - `error_bubbling`_ | | | - `error_mapping`_ | diff --git a/reference/forms/types/number.rst b/reference/forms/types/number.rst index 4858a5de097..2ce03c1c139 100644 --- a/reference/forms/types/number.rst +++ b/reference/forms/types/number.rst @@ -20,7 +20,7 @@ you want to use for your number. | | - `label`_ | | | - `label_attr`_ | | | - `data`_ | -| | - `read_only`_ | +| | - `read_only`_ (deprecated as of 2.6) | | | - `disabled`_ | | | - `error_bubbling`_ | | | - `error_mapping`_ | diff --git a/reference/forms/types/options/read_only.rst.inc b/reference/forms/types/options/read_only.rst.inc index d1c2101591c..66b5796ad61 100644 --- a/reference/forms/types/options/read_only.rst.inc +++ b/reference/forms/types/options/read_only.rst.inc @@ -1,3 +1,8 @@ +.. caution:: + + The ``read_only`` option has been deprecated and will be removed in 3.0. + Instead, use the ``attr`` option by setting it to an array with a ``readonly`` key. + read_only ~~~~~~~~~ diff --git a/reference/forms/types/password.rst b/reference/forms/types/password.rst index fa9df3f3b12..dba8a9a4769 100644 --- a/reference/forms/types/password.rst +++ b/reference/forms/types/password.rst @@ -17,7 +17,7 @@ The ``password`` field renders an input password text box. | | - `label`_ | | | - `label_attr`_ | | | - `trim`_ | -| | - `read_only`_ | +| | - `read_only`_ (deprecated as of 2.6) | | | - `disabled`_ | | | - `error_bubbling`_ | | | - `error_mapping`_ | diff --git a/reference/forms/types/percent.rst b/reference/forms/types/percent.rst index dbde292cc35..fcab977e9de 100644 --- a/reference/forms/types/percent.rst +++ b/reference/forms/types/percent.rst @@ -23,7 +23,7 @@ This field adds a percentage sign "``%``" after the input box. | | - `label`_ | | | - `label_attr`_ | | | - `data`_ | -| | - `read_only`_ | +| | - `read_only`_ (deprecated as of 2.6) | | | - `disabled`_ | | | - `error_bubbling`_ | | | - `error_mapping`_ | diff --git a/reference/forms/types/radio.rst b/reference/forms/types/radio.rst index 946899170cb..35b9418760b 100644 --- a/reference/forms/types/radio.rst +++ b/reference/forms/types/radio.rst @@ -21,7 +21,7 @@ If you want to have a Boolean field, use :doc:`checkbox Date: Sun, 1 Mar 2015 16:15:22 +0100 Subject: [PATCH 04/15] Added February changelog --- changelog.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/changelog.rst b/changelog.rst index d718537af87..e5116fa08ab 100644 --- a/changelog.rst +++ b/changelog.rst @@ -12,13 +12,13 @@ documentation. Do you also want to participate in the Symfony Documentation? Take a look at the ":doc:`/contributing/documentation/overview`" article. - February, 2015 -------------- New Documentation ~~~~~~~~~~~~~~~~~ +- `16dcf53 `_ #4980 [#4974] Added Twig loader priority Documentation (wizhippo) - `a25da10 `_ #4966 [#4231] Clarify that only the main command triggers events (riperez) - `c6bea37 `_ #4957 Added a mention to the @Security annotation (javiereguiluz) - `9cce63c `_ #4924 [swiftmailer] Document whitelist option to email redirect (TerjeBr) @@ -44,10 +44,13 @@ Minor Documentation Changes - `ff44111 `_ Merge branch '2.3' into 2.5 - `2a29225 `_ #4985 Fixed a typo (javiereguiluz) - `f75bc2b `_ #4972 Fix typos (ifdattic) +- `89e626f `_ #4952 symfony 2.7 requires at least php 5.3.9 (scaytrase) - `9fab10b `_ #4854 Removed no longer needed information about PHP 5.3 (WouterJ) - `1726054 `_ #4500 Link to standard edition (harikt) - `91ff6f8 `_ #4329 ensure consistency with the note (greg0ire) +- `f4ab4b6 `_ #5002 Revert very bad merge (WouterJ) - `e5dbd49 `_ #4977 Unnecessary comma (edsonmedina) +- `ed80100 `_ #4977 Unnecessary comma (edsonmedina) - `5d44987 `_ #4991 Fixed typo and tweaked syntax. (cdvrooman) - `b1aadbf `_ #4993 Bumped symfony version number to 2.6 in flat php composer.json example (TSchuermans) - `3845c9c `_ #4979 require_once path fixed (mvanmeerbeck) From 653ac94c95a82de79984bbf62152451431310b7f Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Mon, 2 Mar 2015 08:59:59 +0100 Subject: [PATCH 05/15] fix changelog syntax Terminate the `tip` directive with a blank line. --- changelog.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.rst b/changelog.rst index e5116fa08ab..a23cd8ad4c0 100644 --- a/changelog.rst +++ b/changelog.rst @@ -12,6 +12,7 @@ documentation. Do you also want to participate in the Symfony Documentation? Take a look at the ":doc:`/contributing/documentation/overview`" article. + February, 2015 -------------- From e84182d009949532a8bec606a51f79d15e813d3d Mon Sep 17 00:00:00 2001 From: WouterJ Date: Sun, 5 Apr 2015 17:28:59 +0200 Subject: [PATCH 06/15] Added March changelog --- changelog.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.rst b/changelog.rst index ec6efa1d502..c5460dec526 100644 --- a/changelog.rst +++ b/changelog.rst @@ -106,6 +106,7 @@ Minor Documentation Changes - `3be0081 `_ #4976 Improved sentence (edsonmedina) - `a444220 `_ #4885 Fix typos (ifdattic) - `482502d `_ #4793 [Contributing] Several tweaks (xelaris) +- `a2395ef `_ #5054 [Changelog] fix changelog syntax (xabbuh) - `6b66f03 `_ #5003 Updated the generic Deployment article (javiereguiluz) - `39a1487 `_ #4999 Fixed semantic error (beni0888) From 0c089ec73a3aa77321c961cf6e982497328e3faf Mon Sep 17 00:00:00 2001 From: jackdelin Date: Thu, 28 May 2015 17:13:09 +0300 Subject: [PATCH 07/15] Update create_form_type_extension.rst --- cookbook/form/create_form_type_extension.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook/form/create_form_type_extension.rst b/cookbook/form/create_form_type_extension.rst index 651d53ce849..ab1703c7596 100644 --- a/cookbook/form/create_form_type_extension.rst +++ b/cookbook/form/create_form_type_extension.rst @@ -195,7 +195,7 @@ it in the view:: use Symfony\Component\Form\FormView; use Symfony\Component\Form\FormInterface; use Symfony\Component\PropertyAccess\PropertyAccess; - use Symfony\Component\OptionsResolver\OptionsResolverInterface; + use Symfony\Component\OptionsResolver\OptionsResolver; class ImageTypeExtension extends AbstractTypeExtension { From f2f1ffcba51670e08b90cf1bdc6d91e687566da6 Mon Sep 17 00:00:00 2001 From: Yannick Date: Wed, 9 Apr 2014 16:24:58 +0200 Subject: [PATCH 08/15] [Form] Fix #9325 --- reference/forms/types/password.rst | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/reference/forms/types/password.rst b/reference/forms/types/password.rst index 3ce6256b382..99b594c0e3f 100644 --- a/reference/forms/types/password.rst +++ b/reference/forms/types/password.rst @@ -9,7 +9,8 @@ The ``password`` field renders an input password text box. +-------------+------------------------------------------------------------------------+ | Rendered as | ``input`` ``password`` field | +-------------+------------------------------------------------------------------------+ -| Options | - `always_empty`_ | +| Options | - `always_empty`_ (deprecated as of 2.6) | +| | - `reset_on_submit`_ | +-------------+------------------------------------------------------------------------+ | Inherited | - `disabled`_ | | options | - `empty_data`_ | @@ -34,7 +35,19 @@ Field Options always_empty ~~~~~~~~~~~~ +<<<<<<< HEAD **type**: ``boolean`` **default**: ``true`` +======= +.. caution:: + + The ``_always_empty`` option has been deprecated and will be removed in 3.0. + Instead, use the ``reset_on_submit`` option. + +reset_on_submit +~~~~~~~~~~~~ + +**type**: ``Boolean`` **default**: ``true`` +>>>>>>> [Form] Fix #9325 If set to true, the field will *always* render blank, even if the corresponding field has a value. When set to false, the password field will be rendered From e71355bf4863cfad9773eaf68c8fda0eb132ba5e Mon Sep 17 00:00:00 2001 From: Yannick Date: Wed, 9 Apr 2014 17:16:31 +0200 Subject: [PATCH 09/15] Revert "[Form] Fix #9325" This reverts commit d945ba2baf53ed00ee1ac7d3033c3616b01d0f5a. --- reference/forms/types/password.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/reference/forms/types/password.rst b/reference/forms/types/password.rst index 99b594c0e3f..23a572c5c50 100644 --- a/reference/forms/types/password.rst +++ b/reference/forms/types/password.rst @@ -9,8 +9,7 @@ The ``password`` field renders an input password text box. +-------------+------------------------------------------------------------------------+ | Rendered as | ``input`` ``password`` field | +-------------+------------------------------------------------------------------------+ -| Options | - `always_empty`_ (deprecated as of 2.6) | -| | - `reset_on_submit`_ | +| Options | - `always_empty`_ | +-------------+------------------------------------------------------------------------+ | Inherited | - `disabled`_ | | options | - `empty_data`_ | @@ -35,6 +34,7 @@ Field Options always_empty ~~~~~~~~~~~~ +<<<<<<< HEAD <<<<<<< HEAD **type**: ``boolean`` **default**: ``true`` ======= @@ -46,6 +46,8 @@ always_empty reset_on_submit ~~~~~~~~~~~~ +======= +>>>>>>> Revert "[Form] Fix #9325" **type**: ``Boolean`` **default**: ``true`` >>>>>>> [Form] Fix #9325 From 897cf604aa8a49b0ed434bfec9e5f55729f62e1e Mon Sep 17 00:00:00 2001 From: Yannick Date: Thu, 10 Apr 2014 00:24:52 +0200 Subject: [PATCH 10/15] [WCM][Form] Deprecate "read_only" option --- reference/forms/twig_reference.rst | 2 -- reference/forms/types/birthday.rst | 5 +++++ reference/forms/types/checkbox.rst | 8 ++++++++ reference/forms/types/choice.rst | 8 ++++++++ reference/forms/types/country.rst | 6 ++++++ reference/forms/types/currency.rst | 6 ++++++ reference/forms/types/date.rst | 5 +++++ reference/forms/types/datetime.rst | 5 +++++ reference/forms/types/email.rst | 12 ++++++++++++ reference/forms/types/entity.rst | 4 ++++ reference/forms/types/file.rst | 9 +++++++++ reference/forms/types/form.rst | 13 +++++++++++++ reference/forms/types/integer.rst | 10 ++++++++++ reference/forms/types/language.rst | 6 ++++++ reference/forms/types/locale.rst | 6 ++++++ reference/forms/types/money.rst | 10 ++++++++++ reference/forms/types/number.rst | 10 ++++++++++ reference/forms/types/options/read_only.rst.inc | 5 +++++ reference/forms/types/password.rst | 9 +++++++++ reference/forms/types/percent.rst | 10 ++++++++++ reference/forms/types/radio.rst | 10 ++++++++++ reference/forms/types/search.rst | 9 +++++++++ reference/forms/types/text.rst | 12 ++++++++++++ reference/forms/types/textarea.rst | 11 +++++++++++ reference/forms/types/time.rst | 10 ++++++++++ reference/forms/types/timezone.rst | 4 ++++ reference/forms/types/url.rst | 12 ++++++++++++ 27 files changed, 215 insertions(+), 2 deletions(-) diff --git a/reference/forms/twig_reference.rst b/reference/forms/twig_reference.rst index 68e694f1390..5ee8243c908 100644 --- a/reference/forms/twig_reference.rst +++ b/reference/forms/twig_reference.rst @@ -340,8 +340,6 @@ object: +------------------------+-------------------------------------------------------------------------------------+ | ``value`` | The value that will be used when rendering (commonly the ``value`` HTML attribute). | +------------------------+-------------------------------------------------------------------------------------+ -| ``read_only`` | If ``true``, ``readonly="readonly"`` is added to the field. | -+------------------------+-------------------------------------------------------------------------------------+ | ``disabled`` | If ``true``, ``disabled="disabled"`` is added to the field. | +------------------------+-------------------------------------------------------------------------------------+ | ``required`` | If ``true``, a ``required`` attribute is added to the field to activate HTML5 | diff --git a/reference/forms/types/birthday.rst b/reference/forms/types/birthday.rst index 380d99a3747..fe1a80c206f 100644 --- a/reference/forms/types/birthday.rst +++ b/reference/forms/types/birthday.rst @@ -40,6 +40,11 @@ option defaults to 120 years ago to the current year. | | - `inherit_data`_ | | | - `invalid_message`_ | | | - `invalid_message_parameters`_ | +<<<<<<< HEAD +======= +| | - `read_only`_ (deprecated as of 2.6) | +| | - `disabled`_ | +>>>>>>> [WCM][Form] Deprecate "read_only" option | | - `mapped`_ | | | - `read_only`_ | +----------------------+-------------------------------------------------------------------------------+ diff --git a/reference/forms/types/checkbox.rst b/reference/forms/types/checkbox.rst index abef5a25330..26a8b657cfa 100644 --- a/reference/forms/types/checkbox.rst +++ b/reference/forms/types/checkbox.rst @@ -17,7 +17,15 @@ if the box is unchecked, the value will be set to false. | options | - `empty_data`_ | +-------------+------------------------------------------------------------------------+ | Inherited | - `data`_ | +<<<<<<< HEAD | options | - `disabled`_ | +======= +| options | - `required`_ | +| | - `label`_ | +| | - `label_attr`_ | +| | - `read_only`_ (deprecated as of 2.6) | +| | - `disabled`_ | +>>>>>>> [WCM][Form] Deprecate "read_only" option | | - `error_bubbling`_ | | | - `error_mapping`_ | | | - `label`_ | diff --git a/reference/forms/types/choice.rst b/reference/forms/types/choice.rst index bb2bd05fddc..7d960254916 100644 --- a/reference/forms/types/choice.rst +++ b/reference/forms/types/choice.rst @@ -24,8 +24,16 @@ option. | options | - `empty_data`_ | | | - `error_bubbling`_ | +-------------+------------------------------------------------------------------------------+ +<<<<<<< HEAD | Inherited | - `by_reference`_ | | options | - `data`_ | +======= +| Inherited | - `required`_ | +| options | - `label`_ | +| | - `label_attr`_ | +| | - `data`_ | +| | - `read_only`_ (deprecated as of 2.6) | +>>>>>>> [WCM][Form] Deprecate "read_only" option | | - `disabled`_ | | | - `error_mapping`_ | | | - `inherit_data`_ | diff --git a/reference/forms/types/country.rst b/reference/forms/types/country.rst index fd9840d59d7..1bfd071e254 100644 --- a/reference/forms/types/country.rst +++ b/reference/forms/types/country.rst @@ -41,6 +41,12 @@ you should just use the ``choice`` type directly. | | - `empty_data`_ | | | - `label`_ | | | - `label_attr`_ | +<<<<<<< HEAD +======= +| | - `data`_ | +| | - `read_only`_ (deprecated as of 2.6) | +| | - `disabled`_ | +>>>>>>> [WCM][Form] Deprecate "read_only" option | | - `mapped`_ | | | - `read_only`_ | | | - `required`_ | diff --git a/reference/forms/types/currency.rst b/reference/forms/types/currency.rst index 43cc0deb7bc..d3548a5c51b 100644 --- a/reference/forms/types/currency.rst +++ b/reference/forms/types/currency.rst @@ -34,6 +34,12 @@ you should just use the ``choice`` type directly. | | - `empty_data`_ | | | - `label`_ | | | - `label_attr`_ | +<<<<<<< HEAD +======= +| | - `data`_ | +| | - `read_only`_ (deprecated as of 2.6) | +| | - `disabled`_ | +>>>>>>> [WCM][Form] Deprecate "read_only" option | | - `mapped`_ | | | - `read_only`_ | | | - `required`_ | diff --git a/reference/forms/types/date.rst b/reference/forms/types/date.rst index 0d97757d5d9..01cc7c612d8 100644 --- a/reference/forms/types/date.rst +++ b/reference/forms/types/date.rst @@ -39,6 +39,11 @@ day and year) or three select boxes (see the `widget`_ option). | | - `inherit_data`_ | | | - `invalid_message`_ | | | - `invalid_message_parameters`_ | +<<<<<<< HEAD +======= +| | - `read_only`_ (deprecated as of 2.6) | +| | - `disabled`_ | +>>>>>>> [WCM][Form] Deprecate "read_only" option | | - `mapped`_ | | | - `read_only`_ | +----------------------+-----------------------------------------------------------------------------+ diff --git a/reference/forms/types/datetime.rst b/reference/forms/types/datetime.rst index c4a04e0082d..352bea3e394 100644 --- a/reference/forms/types/datetime.rst +++ b/reference/forms/types/datetime.rst @@ -39,6 +39,11 @@ the data can be a ``DateTime`` object, a string, a timestamp or an array. | | - `inherit_data`_ | | | - `invalid_message`_ | | | - `invalid_message_parameters`_ | +<<<<<<< HEAD +======= +| | - `read_only`_ (deprecated as of 2.6) | +| | - `disabled`_ | +>>>>>>> [WCM][Form] Deprecate "read_only" option | | - `mapped`_ | | | - `read_only`_ | +----------------------+-----------------------------------------------------------------------------+ diff --git a/reference/forms/types/email.rst b/reference/forms/types/email.rst index 0d6f548a033..99d7f78cb5e 100644 --- a/reference/forms/types/email.rst +++ b/reference/forms/types/email.rst @@ -10,9 +10,21 @@ The ``email`` field is a text field that is rendered using the HTML5 +-------------+---------------------------------------------------------------------+ | Rendered as | ``input`` ``email`` field (a text box) | +-------------+---------------------------------------------------------------------+ +<<<<<<< HEAD | Inherited | - `data`_ | | options | - `disabled`_ | | | - `empty_data`_ | +======= +| Inherited | - `max_length`_ (deprecated as of 2.5) | +| options | - `empty_data`_ | +| | - `required`_ | +| | - `label`_ | +| | - `label_attr`_ | +| | - `data`_ | +| | - `trim`_ | +| | - `read_only`_ (deprecated as of 2.6) | +| | - `disabled`_ | +>>>>>>> [WCM][Form] Deprecate "read_only" option | | - `error_bubbling`_ | | | - `error_mapping`_ | | | - `label`_ | diff --git a/reference/forms/types/entity.rst b/reference/forms/types/entity.rst index 43ab2af8915..b22393f5e7e 100644 --- a/reference/forms/types/entity.rst +++ b/reference/forms/types/entity.rst @@ -32,6 +32,10 @@ objects from the database. | | from the :doc:`form ` type: | | | | | | - `data`_ | +<<<<<<< HEAD +======= +| | - `read_only`_ (deprecated as of 2.6) | +>>>>>>> [WCM][Form] Deprecate "read_only" option | | - `disabled`_ | | | - `empty_data`_ | | | - `error_bubbling`_ | diff --git a/reference/forms/types/file.rst b/reference/forms/types/file.rst index 4bfbadf064a..059a213c262 100644 --- a/reference/forms/types/file.rst +++ b/reference/forms/types/file.rst @@ -11,8 +11,17 @@ The ``file`` type represents a file input in your form. +-------------+---------------------------------------------------------------------+ | Options | - `multiple`_ | +-------------+---------------------------------------------------------------------+ +<<<<<<< HEAD | Inherited | - `disabled`_ | | options | - `empty_data`_ | +======= +| Inherited | - `empty_data`_ | +| options | - `required`_ | +| | - `label`_ | +| | - `label_attr`_ | +| | - `read_only`_ (deprecated as of 2.6) | +| | - `disabled`_ | +>>>>>>> [WCM][Form] Deprecate "read_only" option | | - `error_bubbling`_ | | | - `error_mapping`_ | | | - `label`_ | diff --git a/reference/forms/types/form.rst b/reference/forms/types/form.rst index 2ccb0debf17..401312e7b80 100644 --- a/reference/forms/types/form.rst +++ b/reference/forms/types/form.rst @@ -17,6 +17,19 @@ on all types for which ``form`` is the parent type. | | - `data`_ | | | - `data_class`_ | | | - `empty_data`_ | +<<<<<<< HEAD +======= +| | - `required`_ | +| | - `label_attr`_ | +| | - `constraints`_ | +| | - `cascade_validation`_ | +| | - `read_only`_ (deprecated as of 2.6) | +| | - `trim`_ | +| | - `mapped`_ | +| | - `property_path`_ | +| | - `max_length`_ (deprecated as of 2.5) | +| | - `by_reference`_ | +>>>>>>> [WCM][Form] Deprecate "read_only" option | | - `error_bubbling`_ | | | - `error_mapping`_ | | | - `extra_fields_message`_ | diff --git a/reference/forms/types/integer.rst b/reference/forms/types/integer.rst index 4e9e0df2b62..beb24126e51 100644 --- a/reference/forms/types/integer.rst +++ b/reference/forms/types/integer.rst @@ -20,9 +20,19 @@ integers. By default, all non-integer values (e.g. 6.78) will round down | | - `scale`_ | | | - `rounding_mode`_ | +-------------+-----------------------------------------------------------------------+ +<<<<<<< HEAD | Inherited | - `data`_ | | options | - `disabled`_ | | | - `empty_data`_ | +======= +| Inherited | - `empty_data`_ | +| options | - `required`_ | +| | - `label`_ | +| | - `label_attr`_ | +| | - `data`_ | +| | - `read_only`_ (deprecated as of 2.6) | +| | - `disabled`_ | +>>>>>>> [WCM][Form] Deprecate "read_only" option | | - `error_bubbling`_ | | | - `error_mapping`_ | | | - `invalid_message`_ | diff --git a/reference/forms/types/language.rst b/reference/forms/types/language.rst index c9e4ddd08a3..919cd666b9e 100644 --- a/reference/forms/types/language.rst +++ b/reference/forms/types/language.rst @@ -42,6 +42,12 @@ you should just use the ``choice`` type directly. | | - `empty_data`_ | | | - `label`_ | | | - `label_attr`_ | +<<<<<<< HEAD +======= +| | - `data`_ | +| | - `read_only`_ (deprecated as of 2.6) | +| | - `disabled`_ | +>>>>>>> [WCM][Form] Deprecate "read_only" option | | - `mapped`_ | | | - `read_only`_ | | | - `required`_ | diff --git a/reference/forms/types/locale.rst b/reference/forms/types/locale.rst index 5e887150262..6acafaba6aa 100644 --- a/reference/forms/types/locale.rst +++ b/reference/forms/types/locale.rst @@ -44,6 +44,12 @@ you should just use the ``choice`` type directly. | | - `empty_data`_ | | | - `label`_ | | | - `label_attr`_ | +<<<<<<< HEAD +======= +| | - `data`_ | +| | - `read_only`_ (deprecated as of 2.6) | +| | - `disabled`_ | +>>>>>>> [WCM][Form] Deprecate "read_only" option | | - `mapped`_ | | | - `read_only`_ | | | - `required`_ | diff --git a/reference/forms/types/money.rst b/reference/forms/types/money.rst index a3b707b8931..5d24c397312 100644 --- a/reference/forms/types/money.rst +++ b/reference/forms/types/money.rst @@ -19,9 +19,19 @@ how the input and output of the data is handled. | | - `grouping`_ | | | - `scale`_ | +-------------+---------------------------------------------------------------------+ +<<<<<<< HEAD | Inherited | - `data`_ | | options | - `disabled`_ | | | - `empty_data`_ | +======= +| Inherited | - `empty_data`_ | +| options | - `required`_ | +| | - `label`_ | +| | - `label_attr`_ | +| | - `data`_ | +| | - `read_only`_ (deprecated as of 2.6) | +| | - `disabled`_ | +>>>>>>> [WCM][Form] Deprecate "read_only" option | | - `error_bubbling`_ | | | - `error_mapping`_ | | | - `invalid_message`_ | diff --git a/reference/forms/types/number.rst b/reference/forms/types/number.rst index 5bc6d3f052a..78592e139b1 100644 --- a/reference/forms/types/number.rst +++ b/reference/forms/types/number.rst @@ -15,9 +15,19 @@ that you want to use for your number. | | - `scale`_ | | | - `rounding_mode`_ | +-------------+----------------------------------------------------------------------+ +<<<<<<< HEAD | Inherited | - `data`_ | | options | - `disabled`_ | | | - `empty_data`_ | +======= +| Inherited | - `empty_data`_ | +| options | - `required`_ | +| | - `label`_ | +| | - `label_attr`_ | +| | - `data`_ | +| | - `read_only`_ (deprecated as of 2.6) | +| | - `disabled`_ | +>>>>>>> [WCM][Form] Deprecate "read_only" option | | - `error_bubbling`_ | | | - `error_mapping`_ | | | - `invalid_message`_ | diff --git a/reference/forms/types/options/read_only.rst.inc b/reference/forms/types/options/read_only.rst.inc index 7988f0378c8..100c025a2b0 100644 --- a/reference/forms/types/options/read_only.rst.inc +++ b/reference/forms/types/options/read_only.rst.inc @@ -1,3 +1,8 @@ +.. caution:: + + The ``read_only`` option has been deprecated and will be removed in 3.0. + Instead, use the ``attr`` option by setting it to an array with a ``readonly`` key. + read_only ~~~~~~~~~ diff --git a/reference/forms/types/password.rst b/reference/forms/types/password.rst index 23a572c5c50..36ed79cafcc 100644 --- a/reference/forms/types/password.rst +++ b/reference/forms/types/password.rst @@ -13,6 +13,15 @@ The ``password`` field renders an input password text box. +-------------+------------------------------------------------------------------------+ | Inherited | - `disabled`_ | | options | - `empty_data`_ | +<<<<<<< HEAD +======= +| | - `required`_ | +| | - `label`_ | +| | - `label_attr`_ | +| | - `trim`_ | +| | - `read_only`_ (deprecated as of 2.6) | +| | - `disabled`_ | +>>>>>>> [WCM][Form] Deprecate "read_only" option | | - `error_bubbling`_ | | | - `error_mapping`_ | | | - `label`_ | diff --git a/reference/forms/types/percent.rst b/reference/forms/types/percent.rst index 10cca29531d..0d77b81330b 100644 --- a/reference/forms/types/percent.rst +++ b/reference/forms/types/percent.rst @@ -18,9 +18,19 @@ This field adds a percentage sign "``%``" after the input box. | Options | - `scale`_ | | | - `type`_ | +-------------+-----------------------------------------------------------------------+ +<<<<<<< HEAD | Inherited | - `data`_ | | options | - `disabled`_ | | | - `empty_data`_ | +======= +| Inherited | - `empty_data`_ | +| options | - `required`_ | +| | - `label`_ | +| | - `label_attr`_ | +| | - `data`_ | +| | - `read_only`_ (deprecated as of 2.6) | +| | - `disabled`_ | +>>>>>>> [WCM][Form] Deprecate "read_only" option | | - `error_bubbling`_ | | | - `error_mapping`_ | | | - `invalid_message`_ | diff --git a/reference/forms/types/radio.rst b/reference/forms/types/radio.rst index 771f5b13490..ee4383b313c 100644 --- a/reference/forms/types/radio.rst +++ b/reference/forms/types/radio.rst @@ -16,6 +16,7 @@ If you want to have a boolean field, use :doc:`checkbox ` type: | | options | | | | - `value`_ | @@ -23,6 +24,15 @@ If you want to have a boolean field, use :doc:`checkbox ` type: | | | | | | - `data`_ | +======= +| Inherited | - `value`_ | +| options | - `data`_ | +| | - `empty_data`_ | +| | - `required`_ | +| | - `label`_ | +| | - `label_attr`_ | +| | - `read_only`_ (deprecated as of 2.6) | +>>>>>>> [WCM][Form] Deprecate "read_only" option | | - `disabled`_ | | | - `empty_data`_ | | | - `error_bubbling`_ | diff --git a/reference/forms/types/search.rst b/reference/forms/types/search.rst index b491b689f90..22fe96e602a 100644 --- a/reference/forms/types/search.rst +++ b/reference/forms/types/search.rst @@ -14,6 +14,15 @@ Read about the input search field at `DiveIntoHTML5.info`_ +-------------+----------------------------------------------------------------------+ | Inherited | - `disabled`_ | | options | - `empty_data`_ | +<<<<<<< HEAD +======= +| | - `required`_ | +| | - `label`_ | +| | - `label_attr`_ | +| | - `trim`_ | +| | - `read_only`_ (deprecated as of 2.6) | +| | - `disabled`_ | +>>>>>>> [WCM][Form] Deprecate "read_only" option | | - `error_bubbling`_ | | | - `error_mapping`_ | | | - `label`_ | diff --git a/reference/forms/types/text.rst b/reference/forms/types/text.rst index 2aa14cb7a55..41cc80279f8 100644 --- a/reference/forms/types/text.rst +++ b/reference/forms/types/text.rst @@ -9,9 +9,21 @@ The text field represents the most basic input text field. +-------------+--------------------------------------------------------------------+ | Rendered as | ``input`` ``text`` field | +-------------+--------------------------------------------------------------------+ +<<<<<<< HEAD | Inherited | - `data`_ | | options | - `disabled`_ | | | - `empty_data`_ | +======= +| Inherited | - `max_length`_ (deprecated as of 2.5) | +| options | - `empty_data`_ | +| | - `required`_ | +| | - `label`_ | +| | - `label_attr`_ | +| | - `data`_ | +| | - `trim`_ | +| | - `read_only`_ (deprecated as of 2.6) | +| | - `disabled`_ | +>>>>>>> [WCM][Form] Deprecate "read_only" option | | - `error_bubbling`_ | | | - `error_mapping`_ | | | - `label`_ | diff --git a/reference/forms/types/textarea.rst b/reference/forms/types/textarea.rst index 473c69c9d5c..345f6672993 100644 --- a/reference/forms/types/textarea.rst +++ b/reference/forms/types/textarea.rst @@ -9,8 +9,19 @@ Renders a ``textarea`` HTML element. +-------------+------------------------------------------------------------------------+ | Rendered as | ``textarea`` tag | +-------------+------------------------------------------------------------------------+ +<<<<<<< HEAD | Inherited | - `attr`_ | | options | - `data`_ | +======= +| Inherited | - `max_length`_ (deprecated as of 2.5) | +| options | - `empty_data`_ | +| | - `required`_ | +| | - `label`_ | +| | - `label_attr`_ | +| | - `trim`_ | +| | - `data`_ | +| | - `read_only`_ (deprecated as of 2.6) | +>>>>>>> [WCM][Form] Deprecate "read_only" option | | - `disabled`_ | | | - `empty_data`_ | | | - `error_bubbling`_ | diff --git a/reference/forms/types/time.rst b/reference/forms/types/time.rst index 97c291e061b..03687954d4d 100644 --- a/reference/forms/types/time.rst +++ b/reference/forms/types/time.rst @@ -30,8 +30,18 @@ stored as a ``DateTime`` object, a string, a timestamp or an array. | Overridden Options | - `by_reference`_ | | | - `error_bubbling`_ | +----------------------+-----------------------------------------------------------------------------+ +<<<<<<< HEAD | Inherited | - `data`_ | | Options | - `disabled`_ | +======= +| Inherited | - `invalid_message`_ | +| options | - `invalid_message_parameters`_ | +| | - `data`_ | +| | - `read_only`_ (deprecated as of 2.6) | +| | - `disabled`_ | +| | - `mapped`_ | +| | - `inherit_data`_ | +>>>>>>> [WCM][Form] Deprecate "read_only" option | | - `error_mapping`_ | | | - `inherit_data`_ | | | - `invalid_message`_ | diff --git a/reference/forms/types/timezone.rst b/reference/forms/types/timezone.rst index 73537fc1619..0347f068859 100644 --- a/reference/forms/types/timezone.rst +++ b/reference/forms/types/timezone.rst @@ -31,6 +31,10 @@ you should just use the ``choice`` type directly. | | from the :doc:`form ` type | | | | | | - `data`_ | +<<<<<<< HEAD +======= +| | - `read_only`_ (deprecated as of 2.6) | +>>>>>>> [WCM][Form] Deprecate "read_only" option | | - `disabled`_ | | | - `empty_data`_ | | | - `error_bubbling`_ | diff --git a/reference/forms/types/url.rst b/reference/forms/types/url.rst index d4903174d3f..019fd548b8b 100644 --- a/reference/forms/types/url.rst +++ b/reference/forms/types/url.rst @@ -13,9 +13,21 @@ have a protocol. +-------------+-------------------------------------------------------------------+ | Options | - `default_protocol`_ | +-------------+-------------------------------------------------------------------+ +<<<<<<< HEAD | Inherited | - `data`_ | | options | - `disabled`_ | | | - `empty_data`_ | +======= +| Inherited | - `max_length`_ (deprecated as of 2.5) | +| options | - `empty_data`_ | +| | - `required`_ | +| | - `label`_ | +| | - `label_attr`_ | +| | - `data`_ | +| | - `trim`_ | +| | - `read_only`_ (deprecated as of 2.6) | +| | - `disabled`_ | +>>>>>>> [WCM][Form] Deprecate "read_only" option | | - `error_bubbling`_ | | | - `error_mapping`_ | | | - `label`_ | From 2409c9d7c90f481d2a370dbf8b5ac85b83041b40 Mon Sep 17 00:00:00 2001 From: Yannick Snobbert Date: Wed, 10 Jun 2015 23:28:39 +0200 Subject: [PATCH 11/15] Rebase --- changelog.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog.rst b/changelog.rst index d2718d933b7..127a9b6f777 100644 --- a/changelog.rst +++ b/changelog.rst @@ -1,5 +1,5 @@ .. index:: - single: CHANGELOG +single: CHANGELOG The Documentation Changelog =========================== @@ -265,7 +265,6 @@ Minor Documentation Changes - `3be0081 `_ #4976 Improved sentence (edsonmedina) - `a444220 `_ #4885 Fix typos (ifdattic) - `482502d `_ #4793 [Contributing] Several tweaks (xelaris) -- `a2395ef `_ #5054 [Changelog] fix changelog syntax (xabbuh) - `6b66f03 `_ #5003 Updated the generic Deployment article (javiereguiluz) - `39a1487 `_ #4999 Fixed semantic error (beni0888) @@ -306,6 +305,7 @@ Minor Documentation Changes - `1726054 `_ #4500 Link to standard edition (harikt) - `91ff6f8 `_ #4329 ensure consistency with the note (greg0ire) - `f4ab4b6 `_ #5002 Revert very bad merge (WouterJ) +-- `e747392 `_ Revert "#4977 Unnecessary comma (edsonmedina)" - `e5dbd49 `_ #4977 Unnecessary comma (edsonmedina) - `ed80100 `_ #4977 Unnecessary comma (edsonmedina) - `5d44987 `_ #4991 Fixed typo and tweaked syntax. (cdvrooman) From c475f207c4bda2b29234d91499fd3e804e12818e Mon Sep 17 00:00:00 2001 From: Yannick Snobbert Date: Wed, 10 Jun 2015 23:32:35 +0200 Subject: [PATCH 12/15] Rebase --- changelog.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog.rst b/changelog.rst index 127a9b6f777..0762c0124eb 100644 --- a/changelog.rst +++ b/changelog.rst @@ -1,5 +1,5 @@ .. index:: -single: CHANGELOG + single: CHANGELOG The Documentation Changelog =========================== @@ -305,7 +305,7 @@ Minor Documentation Changes - `1726054 `_ #4500 Link to standard edition (harikt) - `91ff6f8 `_ #4329 ensure consistency with the note (greg0ire) - `f4ab4b6 `_ #5002 Revert very bad merge (WouterJ) --- `e747392 `_ Revert "#4977 Unnecessary comma (edsonmedina)" +- `e747392 `_ Revert "#4977 Unnecessary comma (edsonmedina)" - `e5dbd49 `_ #4977 Unnecessary comma (edsonmedina) - `ed80100 `_ #4977 Unnecessary comma (edsonmedina) - `5d44987 `_ #4991 Fixed typo and tweaked syntax. (cdvrooman) From 2055bbcf9bb11739584246cfd52ad9e492755b1a Mon Sep 17 00:00:00 2001 From: Yannick Snobbert Date: Sat, 13 Jun 2015 01:16:02 +0200 Subject: [PATCH 13/15] Fixed table --- reference/forms/types/birthday.rst | 2 +- reference/forms/types/checkbox.rst | 2 +- reference/forms/types/choice.rst | 2 +- reference/forms/types/country.rst | 2 +- reference/forms/types/currency.rst | 2 +- reference/forms/types/date.rst | 2 +- reference/forms/types/datetime.rst | 2 +- reference/forms/types/email.rst | 2 +- reference/forms/types/entity.rst | 2 +- reference/forms/types/file.rst | 2 +- reference/forms/types/form.rst | 2 +- reference/forms/types/integer.rst | 2 +- reference/forms/types/language.rst | 2 +- reference/forms/types/locale.rst | 2 +- reference/forms/types/money.rst | 2 +- reference/forms/types/number.rst | 2 +- reference/forms/types/password.rst | 2 +- reference/forms/types/percent.rst | 2 +- reference/forms/types/radio.rst | 2 +- reference/forms/types/search.rst | 2 +- reference/forms/types/text.rst | 2 +- reference/forms/types/textarea.rst | 2 +- reference/forms/types/time.rst | 2 +- reference/forms/types/timezone.rst | 2 +- reference/forms/types/url.rst | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/reference/forms/types/birthday.rst b/reference/forms/types/birthday.rst index e3e2fd32c0a..740c885efba 100644 --- a/reference/forms/types/birthday.rst +++ b/reference/forms/types/birthday.rst @@ -41,7 +41,7 @@ option defaults to 120 years ago to the current year. | | - `invalid_message`_ | | | - `invalid_message_parameters`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | +| | - `read_only`_ (deprecated as of 2.8) | +----------------------+-------------------------------------------------------------------------------+ | Parent type | :doc:`date ` | +----------------------+-------------------------------------------------------------------------------+ diff --git a/reference/forms/types/checkbox.rst b/reference/forms/types/checkbox.rst index 4200c79752a..3e04856ac4a 100644 --- a/reference/forms/types/checkbox.rst +++ b/reference/forms/types/checkbox.rst @@ -23,7 +23,7 @@ if the box is unchecked, the value will be set to false. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | +| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | +-------------+------------------------------------------------------------------------+ | Parent type | :doc:`form ` | diff --git a/reference/forms/types/choice.rst b/reference/forms/types/choice.rst index 3fd27c3299f..c917f6d1189 100644 --- a/reference/forms/types/choice.rst +++ b/reference/forms/types/choice.rst @@ -32,7 +32,7 @@ option. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | +| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | +-------------+------------------------------------------------------------------------------+ | Parent type | :doc:`form ` | diff --git a/reference/forms/types/country.rst b/reference/forms/types/country.rst index 1cc941d26fc..c33e67d3d35 100644 --- a/reference/forms/types/country.rst +++ b/reference/forms/types/country.rst @@ -42,7 +42,7 @@ you should just use the ``choice`` type directly. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | +| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | +-------------+-----------------------------------------------------------------------+ | Parent type | :doc:`choice ` | diff --git a/reference/forms/types/currency.rst b/reference/forms/types/currency.rst index f687a9bd0df..1d8bbd2d126 100644 --- a/reference/forms/types/currency.rst +++ b/reference/forms/types/currency.rst @@ -35,7 +35,7 @@ you should just use the ``choice`` type directly. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | +| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | +-------------+------------------------------------------------------------------------+ | Parent type | :doc:`choice ` | diff --git a/reference/forms/types/date.rst b/reference/forms/types/date.rst index e91a18373a3..b673477950c 100644 --- a/reference/forms/types/date.rst +++ b/reference/forms/types/date.rst @@ -40,7 +40,7 @@ day and year) or three select boxes (see the `widget`_ option). | | - `invalid_message`_ | | | - `invalid_message_parameters`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | +| | - `read_only`_ (deprecated as of 2.8) | +----------------------+-----------------------------------------------------------------------------+ | Parent type | :doc:`form ` | +----------------------+-----------------------------------------------------------------------------+ diff --git a/reference/forms/types/datetime.rst b/reference/forms/types/datetime.rst index 8914c018cf0..b50c7ec12a7 100644 --- a/reference/forms/types/datetime.rst +++ b/reference/forms/types/datetime.rst @@ -40,7 +40,7 @@ the data can be a ``DateTime`` object, a string, a timestamp or an array. | | - `invalid_message`_ | | | - `invalid_message_parameters`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | +| | - `read_only`_ (deprecated as of 2.8) | +----------------------+-----------------------------------------------------------------------------+ | Parent type | :doc:`form ` | +----------------------+-----------------------------------------------------------------------------+ diff --git a/reference/forms/types/email.rst b/reference/forms/types/email.rst index 9c6502958bc..58b68da5cc8 100644 --- a/reference/forms/types/email.rst +++ b/reference/forms/types/email.rst @@ -19,7 +19,7 @@ The ``email`` field is a text field that is rendered using the HTML5 | | - `label_attr`_ | | | - `mapped`_ | | | - `max_length`_ (deprecated as of 2.5) | -| | - `read_only`_ (deprecated as of 2.8) | +| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | | | - `trim`_ | +-------------+---------------------------------------------------------------------+ diff --git a/reference/forms/types/entity.rst b/reference/forms/types/entity.rst index c5101b153f1..b2a9dc6ebf8 100644 --- a/reference/forms/types/entity.rst +++ b/reference/forms/types/entity.rst @@ -39,7 +39,7 @@ objects from the database. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | +| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | +-------------+------------------------------------------------------------------+ | Parent type | :doc:`choice ` | diff --git a/reference/forms/types/file.rst b/reference/forms/types/file.rst index b5b02ef5d81..1205af33096 100644 --- a/reference/forms/types/file.rst +++ b/reference/forms/types/file.rst @@ -18,7 +18,7 @@ The ``file`` type represents a file input in your form. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | +| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | +-------------+---------------------------------------------------------------------+ | Parent type | :doc:`form ` | diff --git a/reference/forms/types/form.rst b/reference/forms/types/form.rst index 82ceadfa7a7..0d82ef8a9ea 100644 --- a/reference/forms/types/form.rst +++ b/reference/forms/types/form.rst @@ -30,7 +30,7 @@ on all types for which ``form`` is the parent type. | | - `pattern`_ (deprecated as of 2.5) | | | - `post_max_size_message`_ | | | - `property_path`_ | -| | - `read_only`_ (deprecated as of 2.8) | +| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | | | - `trim`_ | +-----------+--------------------------------------------------------------------+ diff --git a/reference/forms/types/integer.rst b/reference/forms/types/integer.rst index c07c16d2a99..6425c1daf7f 100644 --- a/reference/forms/types/integer.rst +++ b/reference/forms/types/integer.rst @@ -30,7 +30,7 @@ integers. By default, all non-integer values (e.g. 6.78) will round down | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | +| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | +-------------+-----------------------------------------------------------------------+ | Parent type | :doc:`form ` | diff --git a/reference/forms/types/language.rst b/reference/forms/types/language.rst index eea07b53c76..e4efe7bf58c 100644 --- a/reference/forms/types/language.rst +++ b/reference/forms/types/language.rst @@ -43,7 +43,7 @@ you should just use the ``choice`` type directly. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | +| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | +-------------+------------------------------------------------------------------------+ | Parent type | :doc:`choice ` | diff --git a/reference/forms/types/locale.rst b/reference/forms/types/locale.rst index c1272093e7f..e822ffd3c18 100644 --- a/reference/forms/types/locale.rst +++ b/reference/forms/types/locale.rst @@ -45,7 +45,7 @@ you should just use the ``choice`` type directly. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | +| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | +-------------+------------------------------------------------------------------------+ | Parent type | :doc:`choice ` | diff --git a/reference/forms/types/money.rst b/reference/forms/types/money.rst index 6b17d4c838c..1a2a856fcc5 100644 --- a/reference/forms/types/money.rst +++ b/reference/forms/types/money.rst @@ -29,7 +29,7 @@ how the input and output of the data is handled. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | +| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | +-------------+---------------------------------------------------------------------+ | Parent type | :doc:`form ` | diff --git a/reference/forms/types/number.rst b/reference/forms/types/number.rst index cbf903cea2f..5881283a376 100644 --- a/reference/forms/types/number.rst +++ b/reference/forms/types/number.rst @@ -25,7 +25,7 @@ that you want to use for your number. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | +| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | +-------------+----------------------------------------------------------------------+ | Parent type | :doc:`form ` | diff --git a/reference/forms/types/password.rst b/reference/forms/types/password.rst index 18a2778c3f1..57fac574bd9 100644 --- a/reference/forms/types/password.rst +++ b/reference/forms/types/password.rst @@ -19,7 +19,7 @@ The ``password`` field renders an input password text box. | | - `label_attr`_ | | | - `mapped`_ | | | - `max_length`_ (deprecated as of 2.5) | -| | - `read_only`_ (deprecated as of 2.8) | +| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | | | - `trim`_ | +-------------+------------------------------------------------------------------------+ diff --git a/reference/forms/types/percent.rst b/reference/forms/types/percent.rst index 3a4ed1c351a..1bbce340b04 100644 --- a/reference/forms/types/percent.rst +++ b/reference/forms/types/percent.rst @@ -28,7 +28,7 @@ This field adds a percentage sign "``%``" after the input box. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | +| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | +-------------+-----------------------------------------------------------------------+ | Parent type | :doc:`form ` | diff --git a/reference/forms/types/radio.rst b/reference/forms/types/radio.rst index 7f581d26e04..b1adec4c6ea 100644 --- a/reference/forms/types/radio.rst +++ b/reference/forms/types/radio.rst @@ -30,7 +30,7 @@ If you want to have a boolean field, use :doc:`checkbox ` | diff --git a/reference/forms/types/search.rst b/reference/forms/types/search.rst index f5085d43198..69f4f449734 100644 --- a/reference/forms/types/search.rst +++ b/reference/forms/types/search.rst @@ -20,7 +20,7 @@ Read about the input search field at `DiveIntoHTML5.info`_ | | - `label_attr`_ | | | - `mapped`_ | | | - `max_length`_ (deprecated as of 2.5) | -| | - `read_only`_ (deprecated as of 2.8) | +| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | | | - `trim`_ | +-------------+----------------------------------------------------------------------+ diff --git a/reference/forms/types/text.rst b/reference/forms/types/text.rst index 83e9f710e3b..d45204ed9b5 100644 --- a/reference/forms/types/text.rst +++ b/reference/forms/types/text.rst @@ -18,7 +18,7 @@ The text field represents the most basic input text field. | | - `label_attr`_ | | | - `mapped`_ | | | - `max_length`_ (deprecated as of 2.5) | -| | - `read_only`_ (deprecated as of 2.8) | +| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | | | - `trim`_ | +-------------+--------------------------------------------------------------------+ diff --git a/reference/forms/types/textarea.rst b/reference/forms/types/textarea.rst index fa5038a63af..18ce38f4a4b 100644 --- a/reference/forms/types/textarea.rst +++ b/reference/forms/types/textarea.rst @@ -19,7 +19,7 @@ Renders a ``textarea`` HTML element. | | - `label_attr`_ | | | - `mapped`_ | | | - `max_length`_ (deprecated as of 2.5) | -| | - `read_only`_ (deprecated as of 2.8) | +| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | | | - `trim`_ | +-------------+------------------------------------------------------------------------+ diff --git a/reference/forms/types/time.rst b/reference/forms/types/time.rst index 251e4c72a13..4b976a02b0d 100644 --- a/reference/forms/types/time.rst +++ b/reference/forms/types/time.rst @@ -37,7 +37,7 @@ stored as a ``DateTime`` object, a string, a timestamp or an array. | | - `invalid_message`_ | | | - `invalid_message_parameters`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | +| | - `read_only`_ (deprecated as of 2.8) | +----------------------+-----------------------------------------------------------------------------+ | Parent type | form | +----------------------+-----------------------------------------------------------------------------+ diff --git a/reference/forms/types/timezone.rst b/reference/forms/types/timezone.rst index 8d5250b1a63..9fe22b11b18 100644 --- a/reference/forms/types/timezone.rst +++ b/reference/forms/types/timezone.rst @@ -38,7 +38,7 @@ you should just use the ``choice`` type directly. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | +| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | +-------------+------------------------------------------------------------------------+ | Parent type | :doc:`choice ` | diff --git a/reference/forms/types/url.rst b/reference/forms/types/url.rst index 04dd3b80215..ff4656dd6ed 100644 --- a/reference/forms/types/url.rst +++ b/reference/forms/types/url.rst @@ -22,7 +22,7 @@ have a protocol. | | - `label_attr`_ | | | - `mapped`_ | | | - `max_length`_ (deprecated as of 2.5) | -| | - `read_only`_ (deprecated as of 2.8) | +| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | | | - `trim`_ | +-------------+-------------------------------------------------------------------+ From 8739ef102cc3dc065259db35adf048a11d7e6730 Mon Sep 17 00:00:00 2001 From: Yannick Snobbert Date: Mon, 15 Jun 2015 12:24:04 +0200 Subject: [PATCH 14/15] Fixed typo --- reference/forms/types/options/read_only.rst.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/reference/forms/types/options/read_only.rst.inc b/reference/forms/types/options/read_only.rst.inc index 100c025a2b0..4b2095b431b 100644 --- a/reference/forms/types/options/read_only.rst.inc +++ b/reference/forms/types/options/read_only.rst.inc @@ -1,11 +1,11 @@ -.. caution:: - - The ``read_only`` option has been deprecated and will be removed in 3.0. - Instead, use the ``attr`` option by setting it to an array with a ``readonly`` key. - read_only ~~~~~~~~~ +.. caution:: + +The ``read_only`` option has been deprecated and will be removed in 3.0. +Instead, use the ``attr`` option by setting it to an array with a ``readonly`` key. + **type**: ``boolean`` **default**: ``false`` If this option is true, the field will be rendered with the ``readonly`` From 677b6a87c79c2b59bd232bbc683443e3c1ca6bc2 Mon Sep 17 00:00:00 2001 From: Yannick Snobbert Date: Mon, 15 Jun 2015 12:47:40 +0200 Subject: [PATCH 15/15] Fixed typo --- reference/forms/types/options/read_only.rst.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reference/forms/types/options/read_only.rst.inc b/reference/forms/types/options/read_only.rst.inc index 4b2095b431b..d19de30612b 100644 --- a/reference/forms/types/options/read_only.rst.inc +++ b/reference/forms/types/options/read_only.rst.inc @@ -3,8 +3,8 @@ read_only .. caution:: -The ``read_only`` option has been deprecated and will be removed in 3.0. -Instead, use the ``attr`` option by setting it to an array with a ``readonly`` key. + The ``read_only`` option has been deprecated and will be removed in 3.0. + Instead, use the ``attr`` option by setting it to an array with a ``readonly`` key. **type**: ``boolean`` **default**: ``false``