Skip to content

Commit 94e514c

Browse files
javiereguiluzjaviereguiluz
committed
Merge branch '6.4' into 7.0
* 6.4: Added missing link for label_html in some form types
2 parents 2357d06 + e5650de commit 94e514c

27 files changed

+54
-0
lines changed

‎reference/forms/types/checkbox.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ These options inherit from the :doc:`FormType </reference/forms/types/form>`:
8181

8282
.. include:: /reference/forms/types/options/label_attr.rst.inc
8383

84+
.. include:: /reference/forms/types/options/label_html.rst.inc
85+
8486
.. include:: /reference/forms/types/options/label_format.rst.inc
8587

8688
.. include:: /reference/forms/types/options/mapped.rst.inc

‎reference/forms/types/choice.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,8 @@ These options inherit from the :doc:`FormType </reference/forms/types/form>`:
262262

263263
.. include:: /reference/forms/types/options/label_attr.rst.inc
264264

265+
.. include:: /reference/forms/types/options/label_html.rst.inc
266+
265267
.. include:: /reference/forms/types/options/label_format.rst.inc
266268

267269
.. include:: /reference/forms/types/options/mapped.rst.inc

‎reference/forms/types/collection.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,8 @@ error_bubbling
333333

334334
.. include:: /reference/forms/types/options/label_attr.rst.inc
335335

336+
.. include:: /reference/forms/types/options/label_html.rst.inc
337+
336338
.. include:: /reference/forms/types/options/label_format.rst.inc
337339

338340
.. include:: /reference/forms/types/options/mapped.rst.inc

‎reference/forms/types/color.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ The default value is ``''`` (the empty string).
7373

7474
.. include:: /reference/forms/types/options/label_attr.rst.inc
7575

76+
.. include:: /reference/forms/types/options/label_html.rst.inc
77+
7678
.. include:: /reference/forms/types/options/label_format.rst.inc
7779

7880
.. include:: /reference/forms/types/options/mapped.rst.inc

‎reference/forms/types/country.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ The actual default value of this option depends on other field options:
114114

115115
.. include:: /reference/forms/types/options/label_attr.rst.inc
116116

117+
.. include:: /reference/forms/types/options/label_html.rst.inc
118+
117119
.. include:: /reference/forms/types/options/label_format.rst.inc
118120

119121
.. include:: /reference/forms/types/options/mapped.rst.inc

‎reference/forms/types/currency.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ The actual default value of this option depends on other field options:
9595

9696
.. include:: /reference/forms/types/options/label_attr.rst.inc
9797

98+
.. include:: /reference/forms/types/options/label_html.rst.inc
99+
98100
.. include:: /reference/forms/types/options/label_format.rst.inc
99101

100102
.. include:: /reference/forms/types/options/mapped.rst.inc

‎reference/forms/types/email.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ The default value is ``''`` (the empty string).
5454

5555
.. include:: /reference/forms/types/options/label_attr.rst.inc
5656

57+
.. include:: /reference/forms/types/options/label_html.rst.inc
58+
5759
.. include:: /reference/forms/types/options/label_format.rst.inc
5860

5961
.. include:: /reference/forms/types/options/mapped.rst.inc

‎reference/forms/types/entity.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,8 @@ The actual default value of this option depends on other field options:
324324

325325
.. include:: /reference/forms/types/options/label_attr.rst.inc
326326

327+
.. include:: /reference/forms/types/options/label_html.rst.inc
328+
327329
.. include:: /reference/forms/types/options/label_format.rst.inc
328330

329331
.. include:: /reference/forms/types/options/mapped.rst.inc

‎reference/forms/types/enum.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,8 @@ These options inherit from the :doc:`FormType </reference/forms/types/form>`:
189189

190190
.. include:: /reference/forms/types/options/label_attr.rst.inc
191191

192+
.. include:: /reference/forms/types/options/label_html.rst.inc
193+
192194
.. include:: /reference/forms/types/options/label_format.rst.inc
193195

194196
.. include:: /reference/forms/types/options/mapped.rst.inc

‎reference/forms/types/file.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@ These options inherit from the :doc:`FormType </reference/forms/types/form>`:
129129

130130
.. include:: /reference/forms/types/options/label_attr.rst.inc
131131

132+
.. include:: /reference/forms/types/options/label_html.rst.inc
133+
132134
.. include:: /reference/forms/types/options/label_format.rst.inc
133135

134136
.. include:: /reference/forms/types/options/mapped.rst.inc

0 commit comments

Comments
 (0)