Skip to content

Commit e2dea88

Browse files
althausweaverryan
authored andcommitted
Fixed linebreaking
1 parent 889f123 commit e2dea88

File tree

5 files changed

+33
-30
lines changed

5 files changed

+33
-30
lines changed

reference/forms/types/choice.rst

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ of checkboxes depending on the ``expanded`` option::
7777
'multiple' => true,
7878
));
7979

80-
If you rely on your option value attribute (e.g. for JavaScript) you need to
81-
set ``choice_value``, otherwise the option values will be mapped to integer
80+
If you rely on your option value attribute (e.g. for JavaScript) you need
81+
to set ``choice_value``, otherwise the option values will be mapped to integer
8282
values::
8383

8484
$builder->add('availability', 'choice', array(
@@ -94,8 +94,8 @@ values::
9494
'multiple' => true,
9595
));
9696

97-
You can also use the ``choice_loader`` option, which can be used to load the
98-
list only partially in cases where a fully-loaded list is not necessary.
97+
You can also use the ``choice_loader`` option, which can be used to load
98+
the list only partially in cases where a fully-loaded list is not necessary.
9999

100100
.. _forms-reference-choice-tags:
101101

@@ -130,12 +130,14 @@ choices_as_values
130130

131131
.. versionadded:: 2.7
132132

133-
The ``choices_as_values`` option of ChoiceType was introduced in Symfony 2.7.
133+
The ``choices_as_values`` option of ChoiceType was introduced in Symfony
134+
2.7.
134135

135-
The ``choices_as_values`` option was introduced to ensure backward compatibility with the
136-
modified handling of the ``choices`` optio. Being set to ``false`` the choices array
137-
will be read as values mapping the keys. Setting the option to ``true`` will enable the new
138-
handling of the choices mapping keys to values.
136+
The ``choices_as_values`` option was introduced to ensure backward compatibility
137+
with the modified handling of the ``choices`` optio. Being set to ``false``
138+
the choices array will be read as values mapping the keys. Setting the option
139+
to ``true`` will enable the new handling of the choices mapping keys to
140+
values.
139141

140142
* Before 2.7::
141143

@@ -159,9 +161,9 @@ handling of the choices mapping keys to values.
159161

160162
.. caution::
161163

162-
The ``choices_as_values`` option will be removed in Symfony 3.0, where
163-
the choices will be passed in the values of the ``choices`` option by
164-
default.
164+
The ``choices_as_values`` option will be removed in Symfony 3.0,
165+
where the choices will be passed in the values of the ``choices``
166+
option by default.
165167

166168
choice_list
167169
~~~~~~~~~~~
@@ -210,10 +212,11 @@ choice_loader
210212

211213
.. versionadded:: 2.7
212214

213-
The ``choice_loader`` option of ChoiceType was introduced in Symfony 2.7.
215+
The ``choice_loader`` option of ChoiceType was introduced in Symfony
216+
2.7.
214217

215-
The choice loader can be used to load the list only partially in cases where a
216-
fully-loaded list is not necessary.
218+
The choice loader can be used to load the list only partially in cases where
219+
a fully-loaded list is not necessary.
217220

218221
**type**: :class:`Symfony\\Component\\Form\\ChoiceList\\Loader\\ChoiceLoaderInterface`
219222

reference/forms/types/options/choice_label.rst.inc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ choice_label
66

77
**type**: ``callable`` or ``string`` **default**: ``null``
88

9-
Returns the label for each choice. Can be a callable (which receives the choice
10-
as first and the key of the ``choices`` array as second argument) or a property
11-
path.
9+
Returns the label for each choice. Can be a callable (which receives the
10+
choice as first and the key of the ``choices`` array as second argument)
11+
or a property path.
1212

1313
If ``null``, the keys of the ``choices`` array are used as labels.
1414

reference/forms/types/options/choice_name.rst.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ choice_name
88

99
Returns the form name for each choice. That name is used as name of the
1010
checkbox/radio form for this choice. It is also used as index of the choice
11-
views in the template. Can be a callable (like for ``choice_label``) or a
12-
property path.
11+
views in the template. Can be a callable (like for ``choice_label``) or
12+
a property path.
1313

1414
The generated names must be valid form names, i.e. contain alpha-numeric
1515
symbols, underscores, hyphens and colons only. They must start with an

reference/forms/types/options/group_by.rst.inc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ group_by
66

77
**type**: ``array``, ``callable`` or ``string`` **default**: ``null``
88

9-
Returns the grouping used for the choices. Can be an array/Traversable, a
10-
callable (like for ``choice_label``) or a property path.
9+
Returns the grouping used for the choices. Can be an array/Traversable,
10+
a callable (like for ``choice_label``) or a property path.
1111

12-
The return values of the callable/property path are used as group labels. If
13-
``null`` is returned, a choice is not grouped.
12+
The return values of the callable/property path are used as group labels.
13+
If ``null`` is returned, a choice is not grouped.
1414

15-
If ``null``, the structure of the ``choices`` array is used to construct the
16-
groups::
15+
If ``null``, the structure of the ``choices`` array is used to construct
16+
the groups::
1717

1818
$builder->add('attending', 'choice', array(
1919
'choices' => array(

reference/forms/types/options/preferred_choices.rst.inc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ preferred_choices
33

44
**type**: ``array``, ``callable`` or ``string`` **default**: ``array()``
55

6-
If this option is specified as an array, then a sub-set of all of the options will be
7-
moved to the top of the select menu. The following would move the "Baz"
8-
option to the top, with a visual separator between it and the rest of the
9-
options::
6+
If this option is specified as an array, then a sub-set of all of the options
7+
will be moved to the top of the select menu. The following would move the
8+
"Baz" option to the top, with a visual separator between it and the rest
9+
of the options::
1010

1111
$builder->add('attending', 'choice', array(
1212
'choices' => array(

0 commit comments

Comments
 (0)