Skip to content

Commit 46d7417

Browse files
javiereguiluzjaviereguiluz
committed
Merge branch '5.4' into 6.3
* 5.4: Added missing link for label_html in some form types
2 parents 92ff56d + 3802560 commit 46d7417

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
@@ -260,6 +260,8 @@ These options inherit from the :doc:`FormType </reference/forms/types/form>`:
260260

261261
.. include:: /reference/forms/types/options/label_attr.rst.inc
262262

263+
.. include:: /reference/forms/types/options/label_html.rst.inc
264+
263265
.. include:: /reference/forms/types/options/label_format.rst.inc
264266

265267
.. 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
@@ -337,6 +337,8 @@ error_bubbling
337337

338338
.. include:: /reference/forms/types/options/label_attr.rst.inc
339339

340+
.. include:: /reference/forms/types/options/label_html.rst.inc
341+
340342
.. include:: /reference/forms/types/options/label_format.rst.inc
341343

342344
.. 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
@@ -112,6 +112,8 @@ The actual default value of this option depends on other field options:
112112

113113
.. include:: /reference/forms/types/options/label_attr.rst.inc
114114

115+
.. include:: /reference/forms/types/options/label_html.rst.inc
116+
115117
.. include:: /reference/forms/types/options/label_format.rst.inc
116118

117119
.. 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
@@ -93,6 +93,8 @@ The actual default value of this option depends on other field options:
9393

9494
.. include:: /reference/forms/types/options/label_attr.rst.inc
9595

96+
.. include:: /reference/forms/types/options/label_html.rst.inc
97+
9698
.. include:: /reference/forms/types/options/label_format.rst.inc
9799

98100
.. 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
@@ -170,6 +170,8 @@ These options inherit from the :doc:`FormType </reference/forms/types/form>`:
170170

171171
.. include:: /reference/forms/types/options/label_attr.rst.inc
172172

173+
.. include:: /reference/forms/types/options/label_html.rst.inc
174+
173175
.. include:: /reference/forms/types/options/label_format.rst.inc
174176

175177
.. 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)