Skip to content

Commit 70c2ae0

Browse files
weaverryanweaverryan
committed
Merge branch 'issue1387_2.1' of github.com:Sgoettschkes/symfony-docs into Sgoettschkes-issue1387_2.1
Conflicts: reference/forms/types/birthday.rst reference/forms/types/country.rst reference/forms/types/hidden.rst reference/forms/types/language.rst reference/forms/types/locale.rst reference/forms/types/repeated.rst
2 parents af60eb1 + c0e5964 commit 70c2ae0

27 files changed

+116
-9
lines changed

‎reference/forms/types/birthday.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ option defaults to 120 years ago to the current year.
3333
| | - `invalid_message_parameters`_ |
3434
| | - `read_only`_ |
3535
| | - `disabled`_ |
36+
| | - `mapped`_ |
3637
| | - `virtual`_ |
3738
+----------------------+-------------------------------------------------------------------------------+
3839
| Parent type | :doc:`date</reference/forms/types/date>` |
@@ -82,4 +83,6 @@ These options inherit from the :doc:`date</reference/forms/types/field>` type:
8283

8384
These options inherit from the :doc:`date</reference/forms/types/form>` type:
8485

86+
.. include:: /reference/forms/types/options/mapped.rst.inc
87+
8588
.. include:: /reference/forms/types/options/virtual.rst.inc

‎reference/forms/types/checkbox.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ if the box is unchecked, the value will be set to false.
1818
| | - `read_only`_ |
1919
| | - `disabled`_ |
2020
| | - `error_bubbling`_ |
21+
| | - `mapped`_ |
2122
+-------------+------------------------------------------------------------------------+
2223
| Parent type | :doc:`field</reference/forms/types/field>` |
2324
+-------------+------------------------------------------------------------------------+
@@ -59,3 +60,7 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
5960
.. include:: /reference/forms/types/options/disabled.rst.inc
6061

6162
.. include:: /reference/forms/types/options/error_bubbling.rst.inc
63+
64+
These options inherit from the :doc:`date</reference/forms/types/form>` type:
65+
66+
.. include:: /reference/forms/types/options/mapped.rst.inc

‎reference/forms/types/choice.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ option.
2525
| | - `read_only`_ |
2626
| | - `disabled`_ |
2727
| | - `error_bubbling`_ |
28+
| | - `mapped`_ |
2829
| | - `virtual`_ |
2930
| | - `by_reference`_ |
3031
| | - `empty_data`_ |
@@ -122,6 +123,8 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
122123

123124
These options inherit from the :doc:`date</reference/forms/types/form>` type:
124125

126+
.. include:: /reference/forms/types/options/mapped.rst.inc
127+
125128
.. include:: /reference/forms/types/options/virtual.rst.inc
126129

127130
.. include:: /reference/forms/types/options/by_reference.rst.inc

‎reference/forms/types/collection.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ forms, which is useful when creating forms that expose one-to-many relationships
2424
| options | - `error_bubbling`_ |
2525
| | - `by_reference`_ |
2626
| | - `empty_data`_ |
27+
| | - `mapped`_ |
2728
+-------------+-----------------------------------------------------------------------------+
2829
| Parent type | :doc:`form</reference/forms/types/form>` |
2930
+-------------+-----------------------------------------------------------------------------+
@@ -342,6 +343,8 @@ Not all options are listed here - only the most applicable to this type:
342343

343344
.. include:: /reference/forms/types/options/label.rst.inc
344345

346+
.. include:: /reference/forms/types/options/mapped.rst.inc
347+
345348
error_bubbling
346349
~~~~~~~~~~~~~~
347350

‎reference/forms/types/country.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ you should just use the ``choice`` type directly.
3434
| | - `label`_ |
3535
| | - `read_only`_ |
3636
| | - `disabled`_ |
37+
| | - `mapped`_ |
3738
+-------------+-----------------------------------------------------------------------+
3839
| Parent type | :doc:`choice</reference/forms/types/choice>` |
3940
+-------------+-----------------------------------------------------------------------+
@@ -67,7 +68,7 @@ These options inherit from the :doc:`choice</reference/forms/types/choice>` type
6768

6869
.. include:: /reference/forms/types/options/error_bubbling.rst.inc
6970

70-
These options inherit from the :doc:`field</reference/forms/types/field>` type:
71+
These options inherit from the :doc:`date</reference/forms/types/form>` type:
7172

7273
.. include:: /reference/forms/types/options/required.rst.inc
7374

@@ -76,3 +77,5 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
7677
.. include:: /reference/forms/types/options/read_only.rst.inc
7778

7879
.. include:: /reference/forms/types/options/disabled.rst.inc
80+
81+
.. include:: /reference/forms/types/options/mapped.rst.inc

‎reference/forms/types/date.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ day, and year) or three select boxes (see the `widget_` option).
3636
| options | - `invalid_message_parameters`_ |
3737
| | - `read_only`_ |
3838
| | - `disabled`_ |
39+
| | - `mapped`_ |
3940
| | - `virtual`_ |
4041
+----------------------+-----------------------------------------------------------------------------+
4142
| Parent type | ``field`` (if text), ``form`` otherwise |
@@ -146,4 +147,6 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
146147

147148
These options inherit from the :doc:`date</reference/forms/types/form>` type:
148149

150+
.. include:: /reference/forms/types/options/mapped.rst.inc
151+
149152
.. include:: /reference/forms/types/options/virtual.rst.inc

‎reference/forms/types/datetime.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ data can be a ``DateTime`` object, a string, a timestamp or an array.
3333
| options | - `invalid_message_parameters`_ |
3434
| | - `read_only`_ |
3535
| | - `disabled`_ |
36+
| | - `mapped`_ |
3637
| | - `virtual`_ |
3738
+----------------------+-----------------------------------------------------------------------------+
3839
| Parent type | :doc:`form</reference/forms/types/form>` |
@@ -115,4 +116,6 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
115116

116117
These options inherit from the :doc:`date</reference/forms/types/form>` type:
117118

119+
.. include:: /reference/forms/types/options/mapped.rst.inc
120+
118121
.. include:: /reference/forms/types/options/virtual.rst.inc

‎reference/forms/types/email.rst

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ The ``email`` field is a text field that is rendered using the HTML5
1717
| | - `read_only`_ |
1818
| | - `disabled`_ |
1919
| | - `error_bubbling`_ |
20+
| | - `mapped`_ |
2021
+-------------+---------------------------------------------------------------------+
2122
| Parent type | :doc:`field</reference/forms/types/field>` |
2223
+-------------+---------------------------------------------------------------------+
@@ -40,4 +41,8 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
4041

4142
.. include:: /reference/forms/types/options/disabled.rst.inc
4243

43-
.. include:: /reference/forms/types/options/error_bubbling.rst.inc
44+
.. include:: /reference/forms/types/options/error_bubbling.rst.inc
45+
46+
These options inherit from the :doc:`date</reference/forms/types/form>` type:
47+
48+
.. include:: /reference/forms/types/options/mapped.rst.inc

‎reference/forms/types/entity.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ objects from the database.
3030
| | - `read_only`_ |
3131
| | - `disabled`_ |
3232
| | - `error_bubbling`_ |
33+
| | - `mapped`_ |
3334
+-------------+------------------------------------------------------------------+
3435
| Parent type | :doc:`choice</reference/forms/types/choice>` |
3536
+-------------+------------------------------------------------------------------+
@@ -171,3 +172,7 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
171172
.. include:: /reference/forms/types/options/disabled.rst.inc
172173

173174
.. include:: /reference/forms/types/options/error_bubbling.rst.inc
175+
176+
These options inherit from the :doc:`date</reference/forms/types/form>` type:
177+
178+
.. include:: /reference/forms/types/options/mapped.rst.inc

‎reference/forms/types/file.rst

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ The ``file`` type represents a file input in your form.
1414
| | - `read_only`_ |
1515
| | - `disabled`_ |
1616
| | - `error_bubbling`_ |
17+
| | - `mapped`_ |
1718
+-------------+---------------------------------------------------------------------+
1819
| Parent type | :doc:`form</reference/forms/types/form>` |
1920
+-------------+---------------------------------------------------------------------+
@@ -92,4 +93,8 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
9293

9394
.. include:: /reference/forms/types/options/disabled.rst.inc
9495

95-
.. include:: /reference/forms/types/options/error_bubbling.rst.inc
96+
.. include:: /reference/forms/types/options/error_bubbling.rst.inc
97+
98+
These options inherit from the :doc:`date</reference/forms/types/form>` type:
99+
100+
.. include:: /reference/forms/types/options/mapped.rst.inc

0 commit comments

Comments
 (0)