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

‎reference/forms/types/integer.rst

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

103103
.. include:: /reference/forms/types/options/label_attr.rst.inc
104104

105+
.. include:: /reference/forms/types/options/label_html.rst.inc
106+
105107
.. include:: /reference/forms/types/options/label_format.rst.inc
106108

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

‎reference/forms/types/language.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@ The actual default value of this option depends on other field options:
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

‎reference/forms/types/locale.rst

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

107107
.. include:: /reference/forms/types/options/label_attr.rst.inc
108108

109+
.. include:: /reference/forms/types/options/label_html.rst.inc
110+
109111
.. include:: /reference/forms/types/options/label_format.rst.inc
110112

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

‎reference/forms/types/money.rst

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

127127
.. include:: /reference/forms/types/options/label_attr.rst.inc
128128

129+
.. include:: /reference/forms/types/options/label_html.rst.inc
130+
129131
.. include:: /reference/forms/types/options/label_format.rst.inc
130132

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

‎reference/forms/types/number.rst

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

105105
.. include:: /reference/forms/types/options/label_attr.rst.inc
106106

107+
.. include:: /reference/forms/types/options/label_html.rst.inc
108+
107109
.. include:: /reference/forms/types/options/label_format.rst.inc
108110

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

‎reference/forms/types/password.rst

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

121121
.. include:: /reference/forms/types/options/label_attr.rst.inc
122122

123+
.. include:: /reference/forms/types/options/label_html.rst.inc
124+
123125
.. include:: /reference/forms/types/options/label_format.rst.inc
124126

125127
.. _reference-form-password-mapped:

‎reference/forms/types/percent.rst

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

117117
.. include:: /reference/forms/types/options/label_attr.rst.inc
118118

119+
.. include:: /reference/forms/types/options/label_html.rst.inc
120+
119121
.. include:: /reference/forms/types/options/label_format.rst.inc
120122

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

‎reference/forms/types/radio.rst

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

6161
.. include:: /reference/forms/types/options/label_attr.rst.inc
6262

63+
.. include:: /reference/forms/types/options/label_html.rst.inc
64+
6365
.. include:: /reference/forms/types/options/label_format.rst.inc
6466

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

‎reference/forms/types/range.rst

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

7070
.. include:: /reference/forms/types/options/label_attr.rst.inc
7171

72+
.. include:: /reference/forms/types/options/label_html.rst.inc
73+
7274
.. include:: /reference/forms/types/options/mapped.rst.inc
7375

7476
.. include:: /reference/forms/types/options/required.rst.inc

‎reference/forms/types/search.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/tel.rst

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

6161
.. include:: /reference/forms/types/options/label_attr.rst.inc
6262

63+
.. include:: /reference/forms/types/options/label_html.rst.inc
64+
6365
.. include:: /reference/forms/types/options/label_format.rst.inc
6466

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

‎reference/forms/types/text.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ an empty string, explicitly set the ``empty_data`` option to an empty string.
4646

4747
.. include:: /reference/forms/types/options/label_attr.rst.inc
4848

49+
.. include:: /reference/forms/types/options/label_html.rst.inc
50+
4951
.. include:: /reference/forms/types/options/label_format.rst.inc
5052

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

‎reference/forms/types/textarea.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ an empty string, explicitly set the ``empty_data`` option to an empty string.
5959

6060
.. include:: /reference/forms/types/options/label_attr.rst.inc
6161

62+
.. include:: /reference/forms/types/options/label_html.rst.inc
63+
6264
.. include:: /reference/forms/types/options/label_format.rst.inc
6365

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

‎reference/forms/types/timezone.rst

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

128128
.. include:: /reference/forms/types/options/label_attr.rst.inc
129129

130+
.. include:: /reference/forms/types/options/label_html.rst.inc
131+
130132
.. include:: /reference/forms/types/options/label_format.rst.inc
131133

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

‎reference/forms/types/ulid.rst

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

5959
.. include:: /reference/forms/types/options/label_attr.rst.inc
6060

61+
.. include:: /reference/forms/types/options/label_html.rst.inc
62+
6163
.. include:: /reference/forms/types/options/label_format.rst.inc
6264

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

‎reference/forms/types/url.rst

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

6868
.. include:: /reference/forms/types/options/label_attr.rst.inc
6969

70+
.. include:: /reference/forms/types/options/label_html.rst.inc
71+
7072
.. include:: /reference/forms/types/options/label_format.rst.inc
7173

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

‎reference/forms/types/uuid.rst

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

5959
.. include:: /reference/forms/types/options/label_attr.rst.inc
6060

61+
.. include:: /reference/forms/types/options/label_html.rst.inc
62+
6163
.. include:: /reference/forms/types/options/label_format.rst.inc
6264

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

0 commit comments

Comments
 (0)