From 03fdc5b4d23d724425239249d9b2d283e61fe592 Mon Sep 17 00:00:00 2001
From: WouterJ <waldio.webdesign@gmail.com>
Date: Sat, 16 May 2015 12:48:11 +0200
Subject: [PATCH 1/2] Reviewed form type options includes

---
 reference/forms/types/options/action.rst.inc    |  8 ++++----
 .../forms/types/options/auto_initialize.rst.inc |  5 +++--
 .../forms/types/options/block_name.rst.inc      |  2 +-
 .../forms/types/options/button_label.rst.inc    |  4 ++--
 .../forms/types/options/by_reference.rst.inc    |  7 ++++---
 .../types/options/cascade_validation.rst.inc    |  9 +++++----
 reference/forms/types/options/compound.rst.inc  |  6 +++---
 reference/forms/types/options/data.rst.inc      | 10 +++++-----
 .../forms/types/options/data_class.rst.inc      |  4 ++--
 .../forms/types/options/date_format.rst.inc     | 17 +++++++++--------
 .../forms/types/options/date_input.rst.inc      |  4 ++--
 .../options/date_widget_description.rst.inc     |  7 ++++---
 reference/forms/types/options/disabled.rst.inc  |  4 ++--
 .../forms/types/options/empty_data.rst.inc      |  9 ++++-----
 .../forms/types/options/empty_value.rst.inc     |  6 +++---
 .../forms/types/options/error_mapping.rst.inc   |  4 ++--
 reference/forms/types/options/grouping.rst.inc  | 10 +++++-----
 .../forms/types/options/inherit_data.rst.inc    |  7 ++++---
 .../forms/types/options/invalid_message.rst.inc |  6 +++---
 .../options/invalid_message_parameters.rst.inc  |  2 +-
 .../forms/types/options/label_attr.rst.inc      | 11 +++++++----
 reference/forms/types/options/mapped.rst.inc    |  4 ++--
 reference/forms/types/options/method.rst.inc    | 12 ++++++------
 reference/forms/types/options/pattern.rst.inc   |  4 ++--
 .../types/options/post_max_size_message.rst.inc |  4 ++--
 .../types/options/preferred_choices.rst.inc     |  9 ++++++---
 .../forms/types/options/property_path.rst.inc   |  9 +++++----
 reference/forms/types/options/required.rst.inc  |  6 +++---
 reference/forms/types/options/trim.rst.inc      |  4 ++--
 .../forms/types/options/view_timezone.rst.inc   |  3 ++-
 30 files changed, 105 insertions(+), 92 deletions(-)

diff --git a/reference/forms/types/options/action.rst.inc b/reference/forms/types/options/action.rst.inc
index 7cfcadae101..dcc557a717f 100644
--- a/reference/forms/types/options/action.rst.inc
+++ b/reference/forms/types/options/action.rst.inc
@@ -6,7 +6,7 @@ action
 
 **type**: ``string`` **default**: empty string
 
-This option specifies where to send the form's data on submission (usually a
-URI). Its value is rendered as the ``action`` attribute of the ``form``
-element. An empty value is considered a same-document reference, i.e. the form
-will be submitted to the same URI that rendered the form.
+This option specifies where to send the form's data on submission (usually
+a URI). Its value is rendered as the ``action`` attribute of the ``form``
+element. An empty value is considered a same-document reference, i.e. the
+form will be submitted to the same URI that rendered the form.
diff --git a/reference/forms/types/options/auto_initialize.rst.inc b/reference/forms/types/options/auto_initialize.rst.inc
index 4accfd816ba..ab42f333438 100644
--- a/reference/forms/types/options/auto_initialize.rst.inc
+++ b/reference/forms/types/options/auto_initialize.rst.inc
@@ -4,5 +4,6 @@ auto_initialize
 **type**: ``boolean``  **default**: ``true``
 
 An internal option: sets whether the form should be initialized automatically.
-For all fields, this option should only be ``true`` for root forms. You won't
-need to change this option and probably won't need to worry about it.
+For all fields, this option should only be ``true`` for root forms. You
+won't need to change this option and probably won't need to worry about
+it.
diff --git a/reference/forms/types/options/block_name.rst.inc b/reference/forms/types/options/block_name.rst.inc
index 6cfdeaf9a10..b31f7ea6a25 100644
--- a/reference/forms/types/options/block_name.rst.inc
+++ b/reference/forms/types/options/block_name.rst.inc
@@ -1,5 +1,5 @@
 block_name
-~~~~~~~~~~~
+~~~~~~~~~~
 
 **type**: ``string`` **default**: the form's name (see :ref:`Knowing which
 block to customize <cookbook-form-customization-sidebar>`)
diff --git a/reference/forms/types/options/button_label.rst.inc b/reference/forms/types/options/button_label.rst.inc
index 9cafe2fc8e4..9ef7cc60fab 100644
--- a/reference/forms/types/options/button_label.rst.inc
+++ b/reference/forms/types/options/button_label.rst.inc
@@ -3,8 +3,8 @@ label
 
 **type**: ``string`` **default**: The label is "guessed" from the field name
 
-Sets the label that will be displayed on the button. The label can also be
-directly set inside the template:
+Sets the label that will be displayed on the button. The label can also
+be directly set inside the template:
 
 .. configuration-block::
 
diff --git a/reference/forms/types/options/by_reference.rst.inc b/reference/forms/types/options/by_reference.rst.inc
index 833552fc5ae..a2e80e1d544 100644
--- a/reference/forms/types/options/by_reference.rst.inc
+++ b/reference/forms/types/options/by_reference.rst.inc
@@ -40,6 +40,7 @@ So, all that ``by_reference=false`` really does is force the framework to
 call the setter on the parent object.
 
 Similarly, if you're using the :doc:`collection</reference/forms/types/collection>`
-form type where your underlying collection data is an object (like with Doctrine's
-``ArrayCollection``), then ``by_reference`` must be set to ``false`` if you
-need the adder and remover (e.g. ``addAuthor()`` and ``removeAuthor()``) to be called.
+form type where your underlying collection data is an object (like with
+Doctrine's ``ArrayCollection``), then ``by_reference`` must be set to ``false``
+if you need the adder and remover (e.g. ``addAuthor()`` and ``removeAuthor()``)
+to be called.
diff --git a/reference/forms/types/options/cascade_validation.rst.inc b/reference/forms/types/options/cascade_validation.rst.inc
index e97c88a02ae..8cb78482461 100644
--- a/reference/forms/types/options/cascade_validation.rst.inc
+++ b/reference/forms/types/options/cascade_validation.rst.inc
@@ -11,9 +11,10 @@ the data from ``CategoryType`` to also be validated.
 .. tip::
 
     Instead of using this option, it is recommended that you use the ``Valid``
-    constraint in your model to force validation on a child object stored on
-    a property. This cascades only the validation but not the use of the
-    ``validation_group`` option on child forms. You can read more about this
-    in the section about :ref:`Embedding a Single Object <forms-embedding-single-object>`.
+    constraint in your model to force validation on a child object stored
+    on a property. This cascades only the validation but not the use of
+    the ``validation_group`` option on child forms. You can read more
+    about this in the section about
+    :ref:`Embedding a Single Object <forms-embedding-single-object>`.
 
 .. include:: /reference/forms/types/options/_error_bubbling_hint.rst.inc
diff --git a/reference/forms/types/options/compound.rst.inc b/reference/forms/types/options/compound.rst.inc
index 009a2c9725a..7736a77567c 100644
--- a/reference/forms/types/options/compound.rst.inc
+++ b/reference/forms/types/options/compound.rst.inc
@@ -3,6 +3,6 @@ compound
 
 **type**: ``boolean`` **default**: ``true``
 
-This option specifies if a form is compound. This is independent of whether the
-form actually has children. A form can be compound but not have any children
-at all (e.g. an empty collection form).
+This option specifies if a form is compound. This is independent of whether
+the form actually has children. A form can be compound but not have any
+children at all (e.g. an empty collection form).
diff --git a/reference/forms/types/options/data.rst.inc b/reference/forms/types/options/data.rst.inc
index 13afdfc44ac..c9bf76424c5 100644
--- a/reference/forms/types/options/data.rst.inc
+++ b/reference/forms/types/options/data.rst.inc
@@ -5,8 +5,8 @@ data
 
 When you create a form, each field initially displays the value of the
 corresponding property of the form's domain object (if an object is bound
-to the form). If you want to override the initial value for the form or just
-an individual field, you can set it in the data option::
+to the form). If you want to override the initial value for the form or
+just an individual field, you can set it in the data option::
 
     $builder->add('token', 'hidden', array(
         'data' => 'abcdef',
@@ -14,6 +14,6 @@ an individual field, you can set it in the data option::
 
 .. note::
 
-    The default values for form fields are taken directly from the
-    underlying data structure (e.g. an entity or an array).
-    The ``data`` option overrides this default value.
+    The default values for form fields are taken directly from the underlying
+    data structure (e.g. an entity or an array). The ``data`` option overrides
+    this default value.
diff --git a/reference/forms/types/options/data_class.rst.inc b/reference/forms/types/options/data_class.rst.inc
index 85024141f81..991e68635ea 100644
--- a/reference/forms/types/options/data_class.rst.inc
+++ b/reference/forms/types/options/data_class.rst.inc
@@ -3,8 +3,8 @@ data_class
 
 **type**: ``string``
 
-This option is used to set the appropriate data mapper to be used by the form,
-so you can use it for any form field type which requires an object.
+This option is used to set the appropriate data mapper to be used by the
+form, so you can use it for any form field type which requires an object.
 
 .. code-block:: php
 
diff --git a/reference/forms/types/options/date_format.rst.inc b/reference/forms/types/options/date_format.rst.inc
index b6db52d68dd..62152ac48ac 100644
--- a/reference/forms/types/options/date_format.rst.inc
+++ b/reference/forms/types/options/date_format.rst.inc
@@ -4,12 +4,12 @@ format
 **type**: ``integer`` or ``string`` **default**: `IntlDateFormatter::MEDIUM`_
 (or ``yyyy-MM-dd`` if `widget`_ is ``single_text``)
 
-Option passed to the ``IntlDateFormatter`` class, used to transform user input
-into the proper format. This is critical when the `widget`_ option is
-set to ``single_text``, and will define how the user will input the data.
+Option passed to the ``IntlDateFormatter`` class, used to transform user
+input into the proper format. This is critical when the `widget`_ option
+is set to ``single_text`` and will define how the user will input the data.
 By default, the format is determined based on the current user locale: meaning
-that *the expected format will be different for different users*. You
-can override it by passing the format as a string.
+that *the expected format will be different for different users*. You can
+override it by passing the format as a string.
 
 For more information on valid formats, see `Date/Time Format Syntax`_::
 
@@ -21,9 +21,10 @@ For more information on valid formats, see `Date/Time Format Syntax`_::
 
 .. note::
 
-    If you want your field to be rendered as an HTML5 "date" field, you have to
-    use a ``single_text`` widget with the ``yyyy-MM-dd`` format (the `RFC 3339`_
-    format) which is the default value if you use the ``single_text`` widget.
+    If you want your field to be rendered as an HTML5 "date" field, you
+    have to use a ``single_text`` widget with the ``yyyy-MM-dd`` format
+    (the `RFC 3339`_ format) which is the default value if you use the
+    ``single_text`` widget.
 
 .. _`Date/Time Format Syntax`: http://userguide.icu-project.org/formatparse/datetime#TOC-Date-Time-Format-Syntax
 .. _`IntlDateFormatter::MEDIUM`: http://www.php.net/manual/en/class.intldateformatter.php#intl.intldateformatter-constants
diff --git a/reference/forms/types/options/date_input.rst.inc b/reference/forms/types/options/date_input.rst.inc
index 43f50abbd9d..e1078d88b6b 100644
--- a/reference/forms/types/options/date_input.rst.inc
+++ b/reference/forms/types/options/date_input.rst.inc
@@ -3,8 +3,8 @@ input
 
 **type**: ``string`` **default**: ``datetime``
 
-The format of the *input* data - i.e. the format that the date is stored on
-your underlying object. Valid values are:
+The format of the *input* data - i.e. the format that the date is stored
+on your underlying object. Valid values are:
 
 * ``string`` (e.g. ``2011-06-05``)
 * ``datetime`` (a ``DateTime`` object)
diff --git a/reference/forms/types/options/date_widget_description.rst.inc b/reference/forms/types/options/date_widget_description.rst.inc
index 865af8472ac..b86bdde5a0e 100644
--- a/reference/forms/types/options/date_widget_description.rst.inc
+++ b/reference/forms/types/options/date_widget_description.rst.inc
@@ -1,11 +1,12 @@
 **type**: ``string`` **default**: ``choice``
 
-The basic way in which this field should be rendered. Can be one of the following:
+The basic way in which this field should be rendered. Can be one of the
+following:
 
 * ``choice``: renders three select inputs. The order of the selects is defined
   in the `format`_ option.
 
 * ``text``: renders a three field input of type ``text`` (month, day, year).
 
-* ``single_text``: renders a single input of type ``date``. User's input is
-  validated based on the `format`_ option.
+* ``single_text``: renders a single input of type ``date``. User's input
+  is validated based on the `format`_ option.
diff --git a/reference/forms/types/options/disabled.rst.inc b/reference/forms/types/options/disabled.rst.inc
index 4a7190f4f10..3585aa2438d 100644
--- a/reference/forms/types/options/disabled.rst.inc
+++ b/reference/forms/types/options/disabled.rst.inc
@@ -6,5 +6,5 @@ disabled
 
 **type**: ``boolean``  **default**: ``false``
 
-If you don't want a user to modify the value of a field, you can set the disabled
-option to true. Any submitted value will be ignored.
+If you don't want a user to modify the value of a field, you can set the
+disabled option to true. Any submitted value will be ignored.
diff --git a/reference/forms/types/options/empty_data.rst.inc b/reference/forms/types/options/empty_data.rst.inc
index 34ca9cb878c..f856d8d73fe 100644
--- a/reference/forms/types/options/empty_data.rst.inc
+++ b/reference/forms/types/options/empty_data.rst.inc
@@ -3,8 +3,9 @@ empty_data
 
 **type**: ``mixed``
 
-.. This file should only be included with start-after or end-before that's set to
-   this placeholder value. Its purpose is to let us include only part of this file.
+.. This file should only be included with start-after or end-before that's
+   set to this placeholder value. Its purpose is to let us include only
+   part of this file.
 
 DEFAULT_PLACEHOLDER
 
@@ -13,9 +14,7 @@ value is empty.
 
 But you can customize this to your needs. For example, if you want the
 ``gender`` choice field to be explicitly set to ``null`` when no value is
-selected, you can do it like this:
-
-.. code-block:: php
+selected, you can do it like this::
 
     $builder->add('gender', 'choice', array(
         'choices' => array(
diff --git a/reference/forms/types/options/empty_value.rst.inc b/reference/forms/types/options/empty_value.rst.inc
index f75b95b2b07..182540a5765 100644
--- a/reference/forms/types/options/empty_value.rst.inc
+++ b/reference/forms/types/options/empty_value.rst.inc
@@ -7,9 +7,9 @@ empty_value
 
 **type**: ``string`` or ``boolean``
 
-This option determines whether or not a special "empty" option (e.g. "Choose an option")
-will appear at the top of a select widget. This option only applies if the
-``multiple`` option is set to false.
+This option determines whether or not a special "empty" option (e.g. "Choose
+an option") will appear at the top of a select widget. This option only
+applies if the ``multiple`` option is set to false.
 
 * Add an empty value with "Choose an option" as the text::
 
diff --git a/reference/forms/types/options/error_mapping.rst.inc b/reference/forms/types/options/error_mapping.rst.inc
index cdca7e12d7c..dafd5e04248 100644
--- a/reference/forms/types/options/error_mapping.rst.inc
+++ b/reference/forms/types/options/error_mapping.rst.inc
@@ -28,8 +28,8 @@ field so that it displays above it::
 Here are the rules for the left and the right side of the mapping:
 
 * The left side contains property paths;
-* If the violation is generated on a property or method of a class, its path
-  is simply ``propertyName``;
+* If the violation is generated on a property or method of a class, its
+  path is simply ``propertyName``;
 * If the violation is generated on an entry of an ``array`` or ``ArrayAccess``
   object, the property path is ``[indexName]``;
 * You can construct nested property paths by concatenating them, separating
diff --git a/reference/forms/types/options/grouping.rst.inc b/reference/forms/types/options/grouping.rst.inc
index 39aeddb6b2b..4362678e339 100644
--- a/reference/forms/types/options/grouping.rst.inc
+++ b/reference/forms/types/options/grouping.rst.inc
@@ -3,8 +3,8 @@ grouping
 
 **type**: ``integer`` **default**: ``false``
 
-This value is used internally as the ``NumberFormatter::GROUPING_USED`` value
-when using PHP's ``NumberFormatter`` class. Its documentation is non-existent,
-but it appears that if you set this to ``true``, numbers will be grouped with
-a comma or period (depending on your locale): ``12345.123`` would display
-as ``12,345.123``.
+This value is used internally as the ``NumberFormatter::GROUPING_USED``
+value when using PHP's ``NumberFormatter`` class. Its documentation is
+non-existent, but it appears that if you set this to ``true``, numbers will
+be grouped with a comma or period (depending on your locale): ``12345.123``
+would display as ``12,345.123``.
diff --git a/reference/forms/types/options/inherit_data.rst.inc b/reference/forms/types/options/inherit_data.rst.inc
index 3025e018660..c65ff78c7e3 100644
--- a/reference/forms/types/options/inherit_data.rst.inc
+++ b/reference/forms/types/options/inherit_data.rst.inc
@@ -13,6 +13,7 @@ multiple forms. See :doc:`/cookbook/form/inherit_data_option`.
 
 .. caution::
 
-    When a field has the ``inherit_data`` option set, it uses the data of the
-    parent form as is. This means that :doc:`Data Transformers </cookbook/form/data_transformers>`
-    won't be applied to that field.
+    When a field has the ``inherit_data`` option set, it uses the data of
+    the parent form as is. This means that
+    :doc:`Data Transformers </cookbook/form/data_transformers>` won't be
+    applied to that field.
diff --git a/reference/forms/types/options/invalid_message.rst.inc b/reference/forms/types/options/invalid_message.rst.inc
index c5c05432492..d96705bf7d2 100644
--- a/reference/forms/types/options/invalid_message.rst.inc
+++ b/reference/forms/types/options/invalid_message.rst.inc
@@ -11,6 +11,6 @@ a :doc:`time</reference/forms/types/time>` field that cannot be converted
 into a real time or if the user enters a string (e.g. ``apple``) into a
 number field.
 
-Normal (business logic) validation (such as when setting a minimum length for
-a field) should be set using validation messages with your validation rules
-(:ref:`reference<book-validation-constraint-configuration>`).
+Normal (business logic) validation (such as when setting a minimum length
+for a field) should be set using validation messages with your validation
+rules (:ref:`reference<book-validation-constraint-configuration>`).
diff --git a/reference/forms/types/options/invalid_message_parameters.rst.inc b/reference/forms/types/options/invalid_message_parameters.rst.inc
index 286fbc45cb6..72a327351a4 100644
--- a/reference/forms/types/options/invalid_message_parameters.rst.inc
+++ b/reference/forms/types/options/invalid_message_parameters.rst.inc
@@ -9,6 +9,6 @@ to that option and including the variables in this option::
 
     $builder->add('some_field', 'some_type', array(
         // ...
-        'invalid_message'            => 'You entered an invalid value - it should include %num% letters',
+        'invalid_message' => 'You entered an invalid value, it should include %num% letters',
         'invalid_message_parameters' => array('%num%' => 6),
     ));
diff --git a/reference/forms/types/options/label_attr.rst.inc b/reference/forms/types/options/label_attr.rst.inc
index 5904b8e8d63..10d438c8c2a 100644
--- a/reference/forms/types/options/label_attr.rst.inc
+++ b/reference/forms/types/options/label_attr.rst.inc
@@ -3,15 +3,18 @@ label_attr
 
 **type**: ``array`` **default**: ``array()``
 
-Sets the HTML attributes for the ``<label>`` element, which will be used when
-rendering the label for the field. It's an associative array with HTML attribute
-as a key. This attributes can also be directly set inside the template:
+Sets the HTML attributes for the ``<label>`` element, which will be used
+when rendering the label for the field. It's an associative array with HTML
+attribute as a key. This attributes can also be directly set inside the
+template:
 
 .. configuration-block::
 
     .. code-block:: jinja
 
-        {{ form_label(form.name, 'Your name', {'label_attr': {'class': 'CUSTOM_LABEL_CLASS'}}) }}
+        {{ form_label(form.name, 'Your name', {
+               'label_attr': {'class': 'CUSTOM_LABEL_CLASS'}
+        }) }}
 
     .. code-block:: php
 
diff --git a/reference/forms/types/options/mapped.rst.inc b/reference/forms/types/options/mapped.rst.inc
index 044eedc815e..c2e8972b480 100644
--- a/reference/forms/types/options/mapped.rst.inc
+++ b/reference/forms/types/options/mapped.rst.inc
@@ -3,5 +3,5 @@ mapped
 
 **type**: ``boolean``  **default**: ``true``
 
-If you wish the field to be ignored when reading or writing to the object, you
-can set the ``mapped`` option to ``false``.
+If you wish the field to be ignored when reading or writing to the object,
+you can set the ``mapped`` option to ``false``.
diff --git a/reference/forms/types/options/method.rst.inc b/reference/forms/types/options/method.rst.inc
index 6a327c21b26..55cf3118775 100644
--- a/reference/forms/types/options/method.rst.inc
+++ b/reference/forms/types/options/method.rst.inc
@@ -7,8 +7,8 @@ method
 **type**: ``string`` **default**: ``POST``
 
 This option specifies the HTTP method used to submit the form's data. Its
-value is rendered as the ``method`` attribute of the ``form`` element and is
-used to decide whether to process the form submission in the
+value is rendered as the ``method`` attribute of the ``form`` element and
+is used to decide whether to process the form submission in the
 ``handleRequest()`` method after submission. Possible values are:
 
 * POST
@@ -26,8 +26,8 @@ used to decide whether to process the form submission in the
 
 .. note::
 
-    The PATCH method allows submitting partial data. In other words, if the
-    submitted form data is missing certain fields, those will be ignored
+    The PATCH method allows submitting partial data. In other words, if
+    the submitted form data is missing certain fields, those will be ignored
     and the default values (if any) will be used. With all other HTTP methods,
-    if the submitted form data is missing some fields, those fields are set
-    to ``null``.
+    if the submitted form data is missing some fields, those fields are
+    set to ``null``.
diff --git a/reference/forms/types/options/pattern.rst.inc b/reference/forms/types/options/pattern.rst.inc
index 2bb115b4483..39521f278db 100644
--- a/reference/forms/types/options/pattern.rst.inc
+++ b/reference/forms/types/options/pattern.rst.inc
@@ -3,8 +3,8 @@ pattern
 
 **type**: ``string`` **default**: ``null``
 
-This adds an HTML5 ``pattern`` attribute to restrict the field input by a
-given regular expression.
+This adds an HTML5 ``pattern`` attribute to restrict the field input by
+a given regular expression.
 
 .. caution::
 
diff --git a/reference/forms/types/options/post_max_size_message.rst.inc b/reference/forms/types/options/post_max_size_message.rst.inc
index 9378edb4941..be8612e6bc1 100644
--- a/reference/forms/types/options/post_max_size_message.rst.inc
+++ b/reference/forms/types/options/post_max_size_message.rst.inc
@@ -3,8 +3,8 @@ post_max_size_message
 
 **type**: ``string`` **default**: ``The uploaded file was too large. Please try to upload a smaller file.``
 
-This is the validation error message that's used if submitted POST form data
-exceeds ``php.ini``'s ``post_max_size`` directive. The ``{{ max }}``
+This is the validation error message that's used if submitted POST form
+data exceeds ``php.ini``'s ``post_max_size`` directive. The ``{{ max }}``
 placeholder can be used to display the allowed size.
 
 .. note::
diff --git a/reference/forms/types/options/preferred_choices.rst.inc b/reference/forms/types/options/preferred_choices.rst.inc
index 96f8268546c..57cfea43830 100644
--- a/reference/forms/types/options/preferred_choices.rst.inc
+++ b/reference/forms/types/options/preferred_choices.rst.inc
@@ -4,8 +4,9 @@ preferred_choices
 **type**: ``array`` **default**: ``array()``
 
 If this option is specified, then a sub-set of all of the options will be
-moved to the top of the select menu. The following would move the "Baz" option
-to the top, with a visual separator between it and the rest of the options::
+moved to the top of the select menu. The following would move the "Baz"
+option to the top, with a visual separator between it and the rest of the
+options::
 
     $builder->add('foo_choices', 'choice', array(
         'choices' => array('foo' => 'Foo', 'bar' => 'Bar', 'baz' => 'Baz'),
@@ -25,4 +26,6 @@ This can be customized when rendering the field:
 
     .. code-block:: php
 
-        <?php echo $view['form']->widget($form['foo_choices'], array('separator' => '=====')) ?>
+        <?php echo $view['form']->widget($form['foo_choices'], array(
+                  'separator' => '====='
+        )) ?>
diff --git a/reference/forms/types/options/property_path.rst.inc b/reference/forms/types/options/property_path.rst.inc
index e6661fcfeea..0c3e1394b78 100644
--- a/reference/forms/types/options/property_path.rst.inc
+++ b/reference/forms/types/options/property_path.rst.inc
@@ -3,11 +3,12 @@ property_path
 
 **type**: ``any`` **default**: ``the field's name``
 
-Fields display a property value of the form's domain object by default. When
-the form is submitted, the submitted value is written back into the object.
+Fields display a property value of the form's domain object by default.
+When the form is submitted, the submitted value is written back into the
+object.
 
-If you want to override the property that a field reads from and writes to,
-you can set the ``property_path`` option. Its default value is the field's
+If you want to override the property that a field reads from and writes
+to, you can set the ``property_path`` option. Its default value is the field's
 name.
 
 If you wish the field to be ignored when reading or writing to the object
diff --git a/reference/forms/types/options/required.rst.inc b/reference/forms/types/options/required.rst.inc
index 6bc444d31d8..6d9b09319b1 100644
--- a/reference/forms/types/options/required.rst.inc
+++ b/reference/forms/types/options/required.rst.inc
@@ -6,9 +6,9 @@ required
 If true, an `HTML5 required attribute`_ will be rendered. The corresponding
 ``label`` will also render with a ``required`` class.
 
-This is superficial and independent from validation. At best, if you let Symfony
-guess your field type, then the value of this option will be guessed from
-your validation information.
+This is superficial and independent from validation. At best, if you let
+Symfony guess your field type, then the value of this option will be guessed
+from your validation information.
 
 .. note::
 
diff --git a/reference/forms/types/options/trim.rst.inc b/reference/forms/types/options/trim.rst.inc
index 7e8ede35d45..8d96380ee4a 100644
--- a/reference/forms/types/options/trim.rst.inc
+++ b/reference/forms/types/options/trim.rst.inc
@@ -4,6 +4,6 @@ trim
 **type**: ``boolean`` **default**: ``true``
 
 If true, the whitespace of the submitted string value will be stripped
-via the :phpfunction:`trim` function when the data is bound. This guarantees that
-if a value is submitted with extra whitespace, it will be removed before
+via the :phpfunction:`trim` function when the data is bound. This guarantees
+that if a value is submitted with extra whitespace, it will be removed before
 the value is merged back onto the underlying object.
diff --git a/reference/forms/types/options/view_timezone.rst.inc b/reference/forms/types/options/view_timezone.rst.inc
index d2ab65adcbf..de3f49568d2 100644
--- a/reference/forms/types/options/view_timezone.rst.inc
+++ b/reference/forms/types/options/view_timezone.rst.inc
@@ -4,6 +4,7 @@ view_timezone
 **type**: ``string`` **default**: system default timezone
 
 Timezone for how the data should be shown to the user (and therefore also
-the data that the user submits). This must be one of the `PHP supported timezones`_.
+the data that the user submits). This must be one of the
+`PHP supported timezones`_.
 
 .. _`PHP supported timezones`: http://php.net/manual/en/timezones.php

From 55246be0234e5411728b8a9b2e70879589b3ff76 Mon Sep 17 00:00:00 2001
From: WouterJ <waldio.webdesign@gmail.com>
Date: Sat, 16 May 2015 20:17:44 +0200
Subject: [PATCH 2/2] Updated types articles

---
 reference/forms/types/birthday.rst   | 10 +--
 reference/forms/types/button.rst     |  6 +-
 reference/forms/types/checkbox.rst   |  3 +-
 reference/forms/types/choice.rst     | 29 +++++----
 reference/forms/types/collection.rst | 91 +++++++++++++++-------------
 reference/forms/types/country.rst    | 10 +--
 reference/forms/types/currency.rst   | 16 ++---
 reference/forms/types/date.rst       | 19 +++---
 reference/forms/types/datetime.rst   | 18 +++---
 reference/forms/types/email.rst      |  3 +-
 reference/forms/types/entity.rst     | 47 +++++++-------
 reference/forms/types/file.rst       | 19 +++---
 reference/forms/types/form.rst       |  3 +-
 reference/forms/types/hidden.rst     |  3 +-
 reference/forms/types/integer.rst    |  8 ++-
 reference/forms/types/language.rst   | 16 ++---
 reference/forms/types/locale.rst     |  6 +-
 reference/forms/types/money.rst      |  7 ++-
 reference/forms/types/number.rst     | 44 +++++++-------
 reference/forms/types/password.rst   |  7 ++-
 reference/forms/types/percent.rst    |  4 +-
 reference/forms/types/radio.rst      | 12 ++--
 reference/forms/types/repeated.rst   | 39 ++++++------
 reference/forms/types/search.rst     |  3 +-
 reference/forms/types/submit.rst     |  7 ++-
 reference/forms/types/text.rst       |  3 +-
 reference/forms/types/textarea.rst   |  3 +-
 reference/forms/types/time.rst       | 35 ++++++-----
 reference/forms/types/timezone.rst   | 10 +--
 reference/forms/types/url.rst        |  3 +-
 30 files changed, 261 insertions(+), 223 deletions(-)

diff --git a/reference/forms/types/birthday.rst b/reference/forms/types/birthday.rst
index d77551c3b29..9651cc315b5 100644
--- a/reference/forms/types/birthday.rst
+++ b/reference/forms/types/birthday.rst
@@ -7,7 +7,7 @@ birthday Field Type
 A :doc:`date </reference/forms/types/date>` field that specializes in handling
 birthdate data.
 
-Can be rendered as a single text box, three text boxes (month, day, and year),
+Can be rendered as a single text box, three text boxes (month, day and year),
 or three select boxes.
 
 This type is essentially the same as the :doc:`date </reference/forms/types/date>`
@@ -22,7 +22,7 @@ option defaults to 120 years ago to the current year.
 +----------------------+-------------------------------------------------------------------------------+
 | Overridden options   | - `years`_                                                                    |
 +----------------------+-------------------------------------------------------------------------------+
-| Inherited options    | from  the :doc:`date </reference/forms/types/date>` type:                     |
+| Inherited options    | from the :doc:`date </reference/forms/types/date>` type:                      |
 |                      |                                                                               |
 |                      | - `days`_                                                                     |
 |                      | - `empty_value`_                                                              |
@@ -62,7 +62,8 @@ relevant when the ``widget`` option is set to ``choice``.
 Inherited Options
 -----------------
 
-These options inherit from the :doc:`date </reference/forms/types/date>` type:
+These options inherit from the :doc:`date </reference/forms/types/date>`
+type:
 
 .. include:: /reference/forms/types/options/days.rst.inc
 
@@ -80,7 +81,8 @@ These options inherit from the :doc:`date </reference/forms/types/date>` type:
 
 .. include:: /reference/forms/types/options/date_widget.rst.inc
 
-These options inherit from the :doc:`form </reference/forms/types/form>` type:
+These options inherit from the :doc:`form </reference/forms/types/form>`
+type:
 
 .. include:: /reference/forms/types/options/data.rst.inc
 
diff --git a/reference/forms/types/button.rst b/reference/forms/types/button.rst
index 67d8bef4055..2ed5ac1750d 100644
--- a/reference/forms/types/button.rst
+++ b/reference/forms/types/button.rst
@@ -27,9 +27,9 @@ Inherited Options
 
 The following options are defined in the
 :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\BaseType` class.
-The ``BaseType`` class is the parent class for both the ``button`` type and
-the :doc:`form type </reference/forms/types/form>`, but it is not part of
-the form type tree (i.e. it can not be used as a form type on its own).
+The ``BaseType`` class is the parent class for both the ``button`` type
+and the :doc:`form type </reference/forms/types/form>`, but it is not part
+of the form type tree (i.e. it can not be used as a form type on its own).
 
 .. include:: /reference/forms/types/options/button_attr.rst.inc
 
diff --git a/reference/forms/types/checkbox.rst b/reference/forms/types/checkbox.rst
index 7fa3730b11a..abef5a25330 100644
--- a/reference/forms/types/checkbox.rst
+++ b/reference/forms/types/checkbox.rst
@@ -56,7 +56,8 @@ Overridden Options
 Inherited Options
 -----------------
 
-These options inherit from the :doc:`form </reference/forms/types/form>` type:
+These options inherit from the :doc:`form </reference/forms/types/form>`
+type:
 
 .. include:: /reference/forms/types/options/data.rst.inc
 
diff --git a/reference/forms/types/choice.rst b/reference/forms/types/choice.rst
index 006101b4e26..9a317b86660 100644
--- a/reference/forms/types/choice.rst
+++ b/reference/forms/types/choice.rst
@@ -43,8 +43,8 @@ option.
 Example Usage
 -------------
 
-The easiest way to use this field is to specify the choices directly via the
-``choices`` option. The key of the array becomes the value that's actually
+The easiest way to use this field is to specify the choices directly via
+the ``choices`` option. The key of the array becomes the value that's actually
 set on your underlying object (e.g. ``m``), while the value is what the
 user sees on the form (e.g. ``Male``).
 
@@ -57,9 +57,7 @@ user sees on the form (e.g. ``Male``).
 
 By setting ``multiple`` to true, you can allow the user to choose multiple
 values. The widget will be rendered as a multiple ``select`` tag or a series
-of checkboxes depending on the ``expanded`` option:
-
-.. code-block:: php
+of checkboxes depending on the ``expanded`` option::
 
     $builder->add('availability', 'choice', array(
         'choices' => array(
@@ -70,8 +68,8 @@ of checkboxes depending on the ``expanded`` option:
         'multiple' => true,
     ));
 
-You can also use the ``choice_list`` option, which takes an object that can
-specify the choices for your widget.
+You can also use the ``choice_list`` option, which takes an object that
+can specify the choices for your widget.
 
 .. _forms-reference-choice-tags:
 
@@ -95,11 +93,11 @@ is the item value and the array value is the item's label::
 
 .. tip::
 
-    When the values to choose from are not integers or strings (but e.g. floats
-    or booleans), you should use the `choice_list`_ option instead. With this
-    option you are able to keep the original data format which is important
-    to ensure that the user input is validated properly and useless database
-    updates caused by a data type mismatch are avoided.
+    When the values to choose from are not integers or strings (but e.g.
+    floats or booleans), you should use the `choice_list`_ option instead.
+    With this option you are able to keep the original data format which
+    is important to ensure that the user input is validated properly and
+    useless database updates caused by a data type mismatch are avoided.
 
 choice_list
 ~~~~~~~~~~~
@@ -164,7 +162,8 @@ the parent field (the form in most cases).
 Inherited Options
 -----------------
 
-These options inherit from the :doc:`form </reference/forms/types/form>` type:
+These options inherit from the :doc:`form </reference/forms/types/form>`
+type:
 
 .. include:: /reference/forms/types/options/by_reference.rst.inc
 
@@ -215,5 +214,5 @@ Field Variables
 
 .. tip::
 
-    It's significantly faster to use the :ref:`form-twig-selectedchoice` test
-    instead when using Twig.
+    It's significantly faster to use the :ref:`form-twig-selectedchoice`
+    test instead when using Twig.
diff --git a/reference/forms/types/collection.rst b/reference/forms/types/collection.rst
index 03005733173..d2c79145479 100644
--- a/reference/forms/types/collection.rst
+++ b/reference/forms/types/collection.rst
@@ -4,11 +4,12 @@
 collection Field Type
 =====================
 
-This field type is used to render a "collection" of some field or form. In
-the easiest sense, it could be an array of ``text`` fields that populate
+This field type is used to render a "collection" of some field or form.
+In the easiest sense, it could be an array of ``text`` fields that populate
 an array ``emails`` field. In more complex examples, you can embed entire
-forms, which is useful when creating forms that expose one-to-many relationships
-(e.g. a product from where you can manage many related product photos).
+forms, which is useful when creating forms that expose one-to-many
+relationships (e.g. a product from where you can manage many related product
+photos).
 
 +-------------+-----------------------------------------------------------------------------+
 | Rendered as | depends on the `type`_ option                                               |
@@ -45,8 +46,8 @@ forms, which is useful when creating forms that expose one-to-many relationships
 Basic Usage
 -----------
 
-This type is used when you want to manage a collection of similar items in
-a form. For example, suppose you have an ``emails`` field that corresponds
+This type is used when you want to manage a collection of similar items
+in a form. For example, suppose you have an ``emails`` field that corresponds
 to an array of email addresses. In the form, you want to expose each email
 address as its own input text box::
 
@@ -104,8 +105,8 @@ A much more flexible method would look like this:
         <?php endforeach ?>
         </ul>
 
-In both cases, no input fields would render unless your ``emails`` data array
-already contained some emails.
+In both cases, no input fields would render unless your ``emails`` data
+array already contained some emails.
 
 In this simple example, it's still impossible to add new addresses or remove
 existing addresses. Adding new addresses is possible by using the `allow_add`_
@@ -141,7 +142,11 @@ will look like this:
 
 .. code-block:: html
 
-    <input type="email" id="form_emails___name__" name="form[emails][__name__]" value="" />
+    <input type="email"
+        id="form_emails___name__"
+        name="form[emails][__name__]"
+        value=""
+    />
 
 By replacing ``__name__`` with some unique value (e.g. ``2``),
 you can build and insert new HTML fields into your form.
@@ -160,7 +165,8 @@ you need is the JavaScript:
             {# ... #}
 
             {# store the prototype on the data-prototype attribute #}
-            <ul id="email-fields-list" data-prototype="{{ form_widget(form.emails.vars.prototype)|e }}">
+            <ul id="email-fields-list"
+                data-prototype="{{ form_widget(form.emails.vars.prototype)|e }}">
             {% for emailField in form.emails %}
                 <li>
                     {{ form_errors(emailField) }}
@@ -203,10 +209,10 @@ you need is the JavaScript:
 
     If you're rendering the entire collection at once, then the prototype
     is automatically available on the ``data-prototype`` attribute of the
-    element (e.g. ``div`` or ``table``) that surrounds your collection. The
-    only difference is that the entire "form row" is rendered for you, meaning
-    you wouldn't have to wrap it in any container element as it was done
-    above.
+    element (e.g. ``div`` or ``table``) that surrounds your collection.
+    The only difference is that the entire "form row" is rendered for you,
+    meaning you wouldn't have to wrap it in any container element as it
+    was done above.
 
 Field Options
 -------------
@@ -222,8 +228,9 @@ items as well as the new item that was in the submitted data. See the above
 example for more details.
 
 The `prototype`_ option can be used to help render a prototype item that
-can be used - with JavaScript - to create new form items dynamically on the
-client side. For more information, see the above example and :ref:`cookbook-form-collections-new-prototype`.
+can be used - with JavaScript - to create new form items dynamically on
+the client side. For more information, see the above example and
+:ref:`cookbook-form-collections-new-prototype`.
 
 .. caution::
 
@@ -249,11 +256,11 @@ For more information, see :ref:`cookbook-form-collections-remove`.
 
     Be careful when using this option when you're embedding a collection
     of objects. In this case, if any embedded forms are removed, they *will*
-    correctly be missing from the final array of objects. However, depending on
-    your application logic, when one of those objects is removed, you may want
-    to delete it or at least remove its foreign key reference to the main object.
-    None of this is handled automatically. For more information, see
-    :ref:`cookbook-form-collections-remove`.
+    correctly be missing from the final array of objects. However, depending
+    on your application logic, when one of those objects is removed, you
+    may want to delete it or at least remove its foreign key reference to
+    the main object. None of this is handled automatically. For more
+    information, see :ref:`cookbook-form-collections-remove`.
 
 options
 ~~~~~~~
@@ -262,8 +269,9 @@ options
 
 This is the array that's passed to the form type specified in the `type`_
 option. For example, if you used the :doc:`choice </reference/forms/types/choice>`
-type as your `type`_ option (e.g. for a collection of drop-down menus), then
-you'd need to at least pass the ``choices`` option to the underlying type::
+type as your `type`_ option (e.g. for a collection of drop-down menus),
+then you'd need to at least pass the ``choices`` option to the underlying
+type::
 
     $builder->add('favorite_cities', 'collection', array(
         'type'   => 'choice',
@@ -283,13 +291,13 @@ prototype
 **type**: ``boolean`` **default**: ``true``
 
 This option is useful when using the `allow_add`_ option. If ``true`` (and
-if `allow_add`_ is also ``true``), a special "prototype" attribute will be
-available so that you can render a "template" example on your page of what
-a new element should look like. The ``name`` attribute given to this element
-is ``__name__``. This allows you to add a "add another" button via JavaScript
-which reads the prototype, replaces ``__name__`` with some unique name or
-number, and render it inside your form. When submitted, it will be added
-to your underlying array due to the `allow_add`_ option.
+if `allow_add`_ is also ``true``), a special "prototype" attribute will
+be available so that you can render a "template" example on your page of
+what a new element should look like. The ``name`` attribute given to this
+element is ``__name__``. This allows you to add a "add another" button via
+JavaScript which reads the prototype, replaces ``__name__`` with some unique
+name or number and render it inside your form. When submitted, it will
+be added to your underlying array due to the `allow_add`_ option.
 
 The prototype field can be rendered via the ``prototype`` variable in the
 collection field:
@@ -313,8 +321,8 @@ rendering your form, having the entire "form row" may be easier for you.
     form row is automatically available on the ``data-prototype`` attribute
     of the element (e.g. ``div`` or ``table``) that surrounds your collection.
 
-For details on how to actually use this option, see the above example as well
-as :ref:`cookbook-form-collections-new-prototype`.
+For details on how to actually use this option, see the above example as
+well as :ref:`cookbook-form-collections-new-prototype`.
 
 prototype_name
 ~~~~~~~~~~~~~~
@@ -322,25 +330,26 @@ prototype_name
 **type**: ``String`` **default**: ``__name__``
 
 If you have several collections in your form, or worse, nested collections
-you may want to change the placeholder so that unrelated placeholders are not
-replaced with the same value.
+you may want to change the placeholder so that unrelated placeholders are
+not replaced with the same value.
 
 type
 ~~~~
 
 **type**: ``string`` or :class:`Symfony\\Component\\Form\\FormTypeInterface` **required**
 
-This is the field type for each item in this collection (e.g. ``text``, ``choice``,
-etc). For example, if you have an array of email addresses, you'd use the
-:doc:`email </reference/forms/types/email>` type. If you want to embed
-a collection of some other form, create a new instance of your form type
-and pass it as this option.
+This is the field type for each item in this collection (e.g. ``text``,
+``choice``, etc). For example, if you have an array of email addresses,
+you'd use the :doc:`email </reference/forms/types/email>` type. If you want
+to embed a collection of some other form, create a new instance of your
+form type and pass it as this option.
 
 Inherited Options
 -----------------
 
-These options inherit from the :doc:`form </reference/forms/types/form>` type.
-Not all options are listed here - only the most applicable to this type:
+These options inherit from the :doc:`form </reference/forms/types/form>`
+type. Not all options are listed here - only the most applicable to this
+type:
 
 .. _reference-form-types-by-reference:
 
diff --git a/reference/forms/types/country.rst b/reference/forms/types/country.rst
index c50ac519a48..6efabd4dad1 100644
--- a/reference/forms/types/country.rst
+++ b/reference/forms/types/country.rst
@@ -5,8 +5,8 @@ country Field Type
 ==================
 
 The ``country`` type is a subset of the ``ChoiceType`` that displays countries
-of the world. As an added bonus, the country names are displayed in the language
-of the user.
+of the world. As an added bonus, the country names are displayed in the
+language of the user.
 
 The "value" for each country is the two-letter country code.
 
@@ -64,7 +64,8 @@ The locale is used to translate the countries names.
 Inherited Options
 -----------------
 
-These options inherit from the :doc:`choice </reference/forms/types/choice>` type:
+These options inherit from the :doc:`choice </reference/forms/types/choice>`
+type:
 
 .. include:: /reference/forms/types/options/empty_value.rst.inc
 
@@ -78,7 +79,8 @@ These options inherit from the :doc:`choice </reference/forms/types/choice>` typ
 
 .. include:: /reference/forms/types/options/preferred_choices.rst.inc
 
-These options inherit from the :doc:`form </reference/forms/types/form>` type:
+These options inherit from the :doc:`form </reference/forms/types/form>`
+type:
 
 .. include:: /reference/forms/types/options/data.rst.inc
 
diff --git a/reference/forms/types/currency.rst b/reference/forms/types/currency.rst
index f009d726993..14a433fc188 100644
--- a/reference/forms/types/currency.rst
+++ b/reference/forms/types/currency.rst
@@ -5,13 +5,13 @@ currency Field Type
 ===================
 
 The ``currency`` type is a subset of the
-:doc:`choice type </reference/forms/types/choice>` that allows the user to
-select from a large list of `3-letter ISO 4217`_ currencies.
+:doc:`choice type </reference/forms/types/choice>` that allows the user
+to select from a large list of `3-letter ISO 4217`_ currencies.
 
 Unlike the ``choice`` type, you don't need to specify a ``choices`` or
-``choice_list`` option as the field type automatically uses a large list of
-currencies. You *can* specify either of these options manually, but then you
-should just use the ``choice`` type directly.
+``choice_list`` option as the field type automatically uses a large list
+of currencies. You *can* specify either of these options manually, but then
+you should just use the ``choice`` type directly.
 
 +-------------+------------------------------------------------------------------------+
 | Rendered as | can be various tags (see :ref:`forms-reference-choice-tags`)           |
@@ -56,7 +56,8 @@ The choices option defaults to all currencies.
 Inherited Options
 -----------------
 
-These options inherit from the :doc:`choice</reference/forms/types/choice>` type:
+These options inherit from the :doc:`choice</reference/forms/types/choice>`
+type:
 
 .. include:: /reference/forms/types/options/empty_value.rst.inc
 
@@ -68,7 +69,8 @@ These options inherit from the :doc:`choice</reference/forms/types/choice>` type
 
 .. include:: /reference/forms/types/options/preferred_choices.rst.inc
 
-These options inherit from the :doc:`form</reference/forms/types/form>` type:
+These options inherit from the :doc:`form</reference/forms/types/form>`
+type:
 
 .. include:: /reference/forms/types/options/data.rst.inc
 
diff --git a/reference/forms/types/date.rst b/reference/forms/types/date.rst
index 994ff6156b3..33794d61d78 100644
--- a/reference/forms/types/date.rst
+++ b/reference/forms/types/date.rst
@@ -12,7 +12,7 @@ a string, a timestamp or an array. As long as the `input`_ option is set
 correctly, the field will take care of all of the details.
 
 The field can be rendered as a single text box, three text boxes (month,
-day, and year) or three select boxes (see the `widget`_ option).
+day and year) or three select boxes (see the `widget`_ option).
 
 +----------------------+-----------------------------------------------------------------------------+
 | Underlying Data Type | can be ``DateTime``, string, timestamp, or array (see the ``input`` option) |
@@ -54,9 +54,7 @@ options are ``input`` and ``widget``.
 
 Suppose that you have a ``publishedAt`` field whose underlying date is a
 ``DateTime`` object. The following configures the ``date`` type for that
-field as three different choice fields:
-
-.. code-block:: php
+field as three different choice fields::
 
     $builder->add('publishedAt', 'date', array(
         'input'  => 'datetime',
@@ -64,10 +62,8 @@ field as three different choice fields:
     ));
 
 The ``input`` option *must* be changed to match the type of the underlying
-date data. For example, if the ``publishedAt`` field's data were a unix timestamp,
-you'd need to set ``input`` to ``timestamp``:
-
-.. code-block:: php
+date data. For example, if the ``publishedAt`` field's data were a unix
+timestamp, you'd need to set ``input`` to ``timestamp``::
 
     $builder->add('publishedAt', 'date', array(
         'input'  => 'timestamp',
@@ -88,8 +84,8 @@ empty_value
 **type**: ``string`` or ``array``
 
 If your widget option is set to ``choice``, then this field will be represented
-as a series of ``select`` boxes. The ``empty_value`` option can be used to
-add a "blank" entry to the top of each select box::
+as a series of ``select`` boxes. The ``empty_value`` option can be used
+to add a "blank" entry to the top of each select box::
 
     $builder->add('dueDate', 'date', array(
         'empty_value' => '',
@@ -137,7 +133,8 @@ error_bubbling
 Inherited Options
 -----------------
 
-These options inherit from the :doc:`form </reference/forms/types/form>` type:
+These options inherit from the :doc:`form </reference/forms/types/form>`
+type:
 
 .. include:: /reference/forms/types/options/data.rst.inc
 
diff --git a/reference/forms/types/datetime.rst b/reference/forms/types/datetime.rst
index b5caab71dd6..01ac12fb25c 100644
--- a/reference/forms/types/datetime.rst
+++ b/reference/forms/types/datetime.rst
@@ -7,8 +7,8 @@ datetime Field Type
 This field type allows the user to modify data that represents a specific
 date and time (e.g. ``1984-06-05 12:15:30``).
 
-Can be rendered as a text input or select tags. The underlying format of the
-data can be a ``DateTime`` object, a string, a timestamp or an array.
+Can be rendered as a text input or select tags. The underlying format of
+the data can be a ``DateTime`` object, a string, a timestamp or an array.
 
 +----------------------+-----------------------------------------------------------------------------+
 | Underlying Data Type | can be ``DateTime``, string, timestamp, or array (see the ``input`` option) |
@@ -85,8 +85,8 @@ input
 
 **type**: ``string`` **default**: ``datetime``
 
-The format of the *input* data - i.e. the format that the date is stored on
-your underlying object. Valid values are:
+The format of the *input* data - i.e. the format that the date is stored
+on your underlying object. Valid values are:
 
 * ``string`` (e.g. ``2011-06-05 12:15:00``)
 * ``datetime`` (a ``DateTime`` object)
@@ -111,7 +111,8 @@ time_widget
 
 **type**: ``string`` **default**: ``choice``
 
-Defines the ``widget`` option for the :doc:`time </reference/forms/types/time>` type
+Defines the ``widget`` option for the :doc:`time </reference/forms/types/time>`
+type
 
 .. include:: /reference/forms/types/options/view_timezone.rst.inc
 
@@ -121,8 +122,8 @@ widget
 **type**: ``string`` **default**: ``null``
 
 Defines the ``widget`` option for both the :doc:`date </reference/forms/types/date>`
-type and :doc:`time </reference/forms/types/time>` type. This can be overridden with
-the `date_widget`_ and `time_widget`_ options.
+type and :doc:`time </reference/forms/types/time>` type. This can be overridden
+with the `date_widget`_ and `time_widget`_ options.
 
 .. include:: /reference/forms/types/options/with_minutes.rst.inc
 
@@ -133,7 +134,8 @@ the `date_widget`_ and `time_widget`_ options.
 Inherited Options
 -----------------
 
-These options inherit from the :doc:`form </reference/forms/types/form>` type:
+These options inherit from the :doc:`form </reference/forms/types/form>`
+type:
 
 .. include:: /reference/forms/types/options/data.rst.inc
 
diff --git a/reference/forms/types/email.rst b/reference/forms/types/email.rst
index 9a60ae4f32c..780f47a46d8 100644
--- a/reference/forms/types/email.rst
+++ b/reference/forms/types/email.rst
@@ -31,7 +31,8 @@ The ``email`` field is a text field that is rendered using the HTML5
 Inherited Options
 -----------------
 
-These options inherit from the :doc:`form </reference/forms/types/form>` type:
+These options inherit from the :doc:`form </reference/forms/types/form>`
+type:
 
 .. include:: /reference/forms/types/options/data.rst.inc
 
diff --git a/reference/forms/types/entity.rst b/reference/forms/types/entity.rst
index 85d6d4b4c68..f8cea7271d1 100644
--- a/reference/forms/types/entity.rst
+++ b/reference/forms/types/entity.rst
@@ -58,18 +58,18 @@ be listed inside the choice field::
         'property' => 'username',
     ));
 
-In this case, all ``User`` objects will be loaded from the database and rendered
-as either a ``select`` tag, a set or radio buttons or a series of checkboxes
-(this depends on the ``multiple`` and ``expanded`` values).
-If the entity object does not have a ``__toString()`` method the ``property`` option
-is needed.
+In this case, all ``User`` objects will be loaded from the database and
+rendered as either a ``select`` tag, a set or radio buttons or a series
+of checkboxes (this depends on the ``multiple`` and ``expanded`` values).
+If the entity object does not have a ``__toString()`` method the ``property``
+option is needed.
 
 Using a Custom Query for the Entities
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-If you need to specify a custom query to use when fetching the entities (e.g.
-you only want to return some entities, or need to order them), use the ``query_builder``
-option. The easiest way to use the option is as follows::
+If you need to specify a custom query to use when fetching the entities
+(e.g. you only want to return some entities, or need to order them), use
+the ``query_builder`` option. The easiest way to use the option is as follows::
 
     use Doctrine\ORM\EntityRepository;
     // ...
@@ -129,9 +129,9 @@ group_by
 
 This is a property path (e.g. ``author.name``) used to organize the
 available choices in groups. It only works when rendered as a select tag
-and does so by adding ``optgroup`` elements around options. Choices that do not
-return a value for this property path are rendered directly under the
-select tag, without a surrounding optgroup.
+and does so by adding ``optgroup`` elements around options. Choices that
+do not return a value for this property path are rendered directly under
+the select tag, without a surrounding optgroup.
 
 property
 ~~~~~~~~
@@ -144,12 +144,12 @@ cast into a string and so must have a ``__toString()`` method.
 
 .. note::
 
-    The ``property`` option is the property path used to display the option. So you
-    can use anything supported by the
+    The ``property`` option is the property path used to display the option.
+    So you can use anything supported by the
     :doc:`PropertyAccessor component </components/property_access/introduction>`
 
-    For example, if the translations property is actually an associative array of
-    objects, each with a name property, then you could do this::
+    For example, if the translations property is actually an associative
+    array of objects, each with a name property, then you could do this::
 
         $builder->add('gender', 'entity', array(
            'class' => 'MyBundle:Gender',
@@ -192,7 +192,8 @@ See :ref:`reference-forms-entity-choices`.
 Inherited Options
 -----------------
 
-These options inherit from the :doc:`choice </reference/forms/types/choice>` type:
+These options inherit from the :doc:`choice </reference/forms/types/choice>`
+type:
 
 .. include:: /reference/forms/types/options/empty_value.rst.inc
 
@@ -202,19 +203,21 @@ These options inherit from the :doc:`choice </reference/forms/types/choice>` typ
 
 .. note::
 
-    If you are working with a collection of Doctrine entities, it will be helpful
-    to read the documentation for the :doc:`/reference/forms/types/collection`
-    as well. In addition, there is a complete example in the cookbook article
+    If you are working with a collection of Doctrine entities, it will be
+    helpful to read the documentation for the
+    :doc:`/reference/forms/types/collection` as well. In addition, there
+    is a complete example in the cookbook article
     :doc:`/cookbook/form/form_collections`.
 
 .. include:: /reference/forms/types/options/preferred_choices.rst.inc
 
 .. note::
 
-    This option expects an array of entity objects, unlike the ``choice`` field
-    that requires an array of keys.
+    This option expects an array of entity objects, unlike the ``choice``
+    field that requires an array of keys.
 
-These options inherit from the :doc:`form </reference/forms/types/form>` type:
+These options inherit from the :doc:`form </reference/forms/types/form>`
+type:
 
 .. include:: /reference/forms/types/options/data.rst.inc
 
diff --git a/reference/forms/types/file.rst b/reference/forms/types/file.rst
index 36f6c2d06d0..b60666c3893 100644
--- a/reference/forms/types/file.rst
+++ b/reference/forms/types/file.rst
@@ -27,17 +27,13 @@ The ``file`` type represents a file input in your form.
 Basic Usage
 -----------
 
-Say you have this form definition:
-
-.. code-block:: php
+Say you have this form definition::
 
     $builder->add('attachment', 'file');
 
-When the form is submitted, the ``attachment`` field will be an instance of
-:class:`Symfony\\Component\\HttpFoundation\\File\\UploadedFile`. It can be
-used to move the ``attachment`` file to a permanent location:
-
-.. code-block:: php
+When the form is submitted, the ``attachment`` field will be an instance
+of :class:`Symfony\\Component\\HttpFoundation\\File\\UploadedFile`. It can
+be used to move the ``attachment`` file to a permanent location::
 
     use Symfony\Component\HttpFoundation\File\UploadedFile;
 
@@ -75,13 +71,14 @@ could have been manipulated by the end-user. Moreover, it can contain
 characters that are not allowed in file names. You should sanitize the name
 before using it directly.
 
-Read the :doc:`cookbook </cookbook/doctrine/file_uploads>` for an example of
-how to manage a file upload associated with a Doctrine entity.
+Read the :doc:`cookbook </cookbook/doctrine/file_uploads>` for an example
+of how to manage a file upload associated with a Doctrine entity.
 
 Inherited Options
 -----------------
 
-These options inherit from the :doc:`form </reference/forms/types/form>` type:
+These options inherit from the :doc:`form </reference/forms/types/form>`
+type:
 
 .. include:: /reference/forms/types/options/disabled.rst.inc
 
diff --git a/reference/forms/types/form.rst b/reference/forms/types/form.rst
index 8ea4a6ce437..ac3b96d5a0c 100644
--- a/reference/forms/types/form.rst
+++ b/reference/forms/types/form.rst
@@ -73,7 +73,8 @@ The actual default value of this option depends on other field options:
 * If ``data_class`` is set and ``required`` is ``false``, then ``null``;
 * If ``data_class`` is not set and ``compound`` is ``true``, then ``array()``
   (empty array);
-* If ``data_class`` is not set and ``compound`` is ``false``, then ``''`` (empty string).
+* If ``data_class`` is not set and ``compound`` is ``false``, then ``''``
+  (empty string).
 
 .. include:: /reference/forms/types/options/empty_data.rst.inc
     :start-after: DEFAULT_PLACEHOLDER
diff --git a/reference/forms/types/hidden.rst b/reference/forms/types/hidden.rst
index 18a293015b2..6e1b8500fab 100644
--- a/reference/forms/types/hidden.rst
+++ b/reference/forms/types/hidden.rst
@@ -42,7 +42,8 @@ Hidden fields cannot have a required attribute.
 Inherited Options
 -----------------
 
-These options inherit from the :doc:`form </reference/forms/types/form>` type:
+These options inherit from the :doc:`form </reference/forms/types/form>`
+type:
 
 .. include:: /reference/forms/types/options/data.rst.inc
 
diff --git a/reference/forms/types/integer.rst b/reference/forms/types/integer.rst
index a2bac1f0334..e6ea1895cb5 100644
--- a/reference/forms/types/integer.rst
+++ b/reference/forms/types/integer.rst
@@ -10,7 +10,8 @@ like a text box, except that - if the user's browser supports HTML5 - it will
 have some extra front-end functionality.
 
 This field has different options on how to handle input values that aren't
-integers. By default, all non-integer values (e.g. 6.78) will round down (e.g. 6).
+integers. By default, all non-integer values (e.g. 6.78) will round down
+(e.g. 6).
 
 +-------------+-----------------------------------------------------------------------+
 | Rendered as | ``input`` ``number`` field                                            |
@@ -50,7 +51,7 @@ rounding_mode
 **type**: ``integer`` **default**: ``IntegerToLocalizedStringTransformer::ROUND_DOWN``
 
 By default, if the user enters a non-integer number, it will be rounded
-down. There are several other rounding methods, and each is a constant
+down. There are several other rounding methods and each is a constant
 on the :class:`Symfony\\Component\\Form\\Extension\\Core\\DataTransformer\\IntegerToLocalizedStringTransformer`:
 
 *   ``IntegerToLocalizedStringTransformer::ROUND_DOWN`` Rounding mode to
@@ -68,7 +69,8 @@ on the :class:`Symfony\\Component\\Form\\Extension\\Core\\DataTransformer\\Integ
 Inherited Options
 -----------------
 
-These options inherit from the :doc:`form </reference/forms/types/form>` type:
+These options inherit from the :doc:`form </reference/forms/types/form>`
+type:
 
 .. include:: /reference/forms/types/options/data.rst.inc
 
diff --git a/reference/forms/types/language.rst b/reference/forms/types/language.rst
index ede6626279f..75689b88771 100644
--- a/reference/forms/types/language.rst
+++ b/reference/forms/types/language.rst
@@ -4,12 +4,12 @@
 language Field Type
 ===================
 
-The ``language`` type is a subset of the ``ChoiceType`` that allows the user
-to select from a large list of languages. As an added bonus, the language names
-are displayed in the language of the user.
+The ``language`` type is a subset of the ``ChoiceType`` that allows the
+user to select from a large list of languages. As an added bonus, the language
+names are displayed in the language of the user.
 
-The "value" for each language is the *Unicode language identifier* used in
-the `International Components for Unicode`_ (e.g. ``fr`` or ``zh_Hant``).
+The "value" for each language is the *Unicode language identifier* used
+in the `International Components for Unicode`_ (e.g. ``fr`` or ``zh_Hant``).
 
 .. note::
 
@@ -65,7 +65,8 @@ The default locale is used to translate the languages names.
 Inherited Options
 -----------------
 
-These options inherit from the :doc:`choice </reference/forms/types/choice>` type:
+These options inherit from the :doc:`choice </reference/forms/types/choice>`
+type:
 
 .. include:: /reference/forms/types/options/empty_value.rst.inc
 
@@ -79,7 +80,8 @@ These options inherit from the :doc:`choice </reference/forms/types/choice>` typ
 
 .. include:: /reference/forms/types/options/preferred_choices.rst.inc
 
-These options inherit from the :doc:`form </reference/forms/types/form>` type:
+These options inherit from the :doc:`form </reference/forms/types/form>`
+type:
 
 .. include:: /reference/forms/types/options/data.rst.inc
 
diff --git a/reference/forms/types/locale.rst b/reference/forms/types/locale.rst
index e8610495901..daa14e90e41 100644
--- a/reference/forms/types/locale.rst
+++ b/reference/forms/types/locale.rst
@@ -67,7 +67,8 @@ specify the language.
 Inherited Options
 -----------------
 
-These options inherit from the :doc:`choice </reference/forms/types/choice>` type:
+These options inherit from the :doc:`choice </reference/forms/types/choice>`
+type:
 
 .. include:: /reference/forms/types/options/empty_value.rst.inc
 
@@ -81,7 +82,8 @@ These options inherit from the :doc:`choice </reference/forms/types/choice>` typ
 
 .. include:: /reference/forms/types/options/preferred_choices.rst.inc
 
-These options inherit from the :doc:`form </reference/forms/types/form>` type:
+These options inherit from the :doc:`form </reference/forms/types/form>`
+type:
 
 .. include:: /reference/forms/types/options/data.rst.inc
 
diff --git a/reference/forms/types/money.rst b/reference/forms/types/money.rst
index 6db6ead9c06..29d0abedd86 100644
--- a/reference/forms/types/money.rst
+++ b/reference/forms/types/money.rst
@@ -50,8 +50,8 @@ the currency symbol that should be shown by the text box. Depending on
 the currency - the currency symbol may be shown before or after the input
 text field.
 
-This can be any `3 letter ISO 4217 code`_. You can also set this to false to
-hide the currency symbol.
+This can be any `3 letter ISO 4217 code`_. You can also set this to false
+to hide the currency symbol.
 
 divisor
 ~~~~~~~
@@ -86,7 +86,8 @@ to ``0``).
 Inherited Options
 -----------------
 
-These options inherit from the :doc:`form </reference/forms/types/form>` type:
+These options inherit from the :doc:`form </reference/forms/types/form>`
+type:
 
 .. include:: /reference/forms/types/options/data.rst.inc
 
diff --git a/reference/forms/types/number.rst b/reference/forms/types/number.rst
index e476d6bf052..ec85bc52ad4 100644
--- a/reference/forms/types/number.rst
+++ b/reference/forms/types/number.rst
@@ -5,8 +5,8 @@ number Field Type
 =================
 
 Renders an input text field and specializes in handling number input. This
-type offers different options for the precision, rounding, and grouping that
-you want to use for your number.
+type offers different options for the precision, rounding and grouping
+that you want to use for your number.
 
 +-------------+----------------------------------------------------------------------+
 | Rendered as | ``input`` ``text`` field                                             |
@@ -47,36 +47,38 @@ rounding_mode
 
 If a submitted number needs to be rounded (based on the ``precision``
 option), you have several configurable options for that rounding. Each
-option is a constant on the :class:`Symfony\\Component\\Form\\Extension\\Core\\DataTransformer\\IntegerToLocalizedStringTransformer`:
+option is a constant on the
+:class:`Symfony\\Component\\Form\\Extension\\Core\\DataTransformer\\IntegerToLocalizedStringTransformer`:
 
-*   ``IntegerToLocalizedStringTransformer::ROUND_DOWN`` Rounding mode to
-    round towards zero.
+* ``IntegerToLocalizedStringTransformer::ROUND_DOWN`` Rounding mode to
+  round towards zero.
 
-*   ``IntegerToLocalizedStringTransformer::ROUND_FLOOR`` Rounding mode to
-    round towards negative infinity.
+* ``IntegerToLocalizedStringTransformer::ROUND_FLOOR`` Rounding mode to
+  round towards negative infinity.
 
-*   ``IntegerToLocalizedStringTransformer::ROUND_UP`` Rounding mode to round
-    away from zero.
+* ``IntegerToLocalizedStringTransformer::ROUND_UP`` Rounding mode to round
+  away from zero.
 
-*   ``IntegerToLocalizedStringTransformer::ROUND_CEILING`` Rounding mode
-    to round towards positive infinity.
+* ``IntegerToLocalizedStringTransformer::ROUND_CEILING`` Rounding mode
+  to round towards positive infinity.
 
-*   ``IntegerToLocalizedStringTransformer::ROUND_HALFDOWN`` Rounding mode
-    to round towards "nearest neighbor" unless both neighbors are equidistant,
-    in which case round down.
+* ``IntegerToLocalizedStringTransformer::ROUND_HALFDOWN`` Rounding mode
+  to round towards "nearest neighbor" unless both neighbors are equidistant,
+  in which case round down.
 
-*   ``IntegerToLocalizedStringTransformer::ROUND_HALFEVEN`` Rounding mode
-    to round towards the "nearest neighbor" unless both neighbors are equidistant,
-    in which case, round towards the even neighbor.
+* ``IntegerToLocalizedStringTransformer::ROUND_HALFEVEN`` Rounding mode
+  to round towards the "nearest neighbor" unless both neighbors are equidistant,
+  in which case, round towards the even neighbor.
 
-*   ``IntegerToLocalizedStringTransformer::ROUND_HALFUP`` Rounding mode to
-    round towards "nearest neighbor" unless both neighbors are equidistant,
-    in which case round up.
+* ``IntegerToLocalizedStringTransformer::ROUND_HALFUP`` Rounding mode
+  to round towards "nearest neighbor" unless both neighbors are equidistant,
+  in which case round up.
 
 Inherited Options
 -----------------
 
-These options inherit from the :doc:`form </reference/forms/types/form>` type:
+These options inherit from the :doc:`form </reference/forms/types/form>`
+type:
 
 .. include:: /reference/forms/types/options/data.rst.inc
 
diff --git a/reference/forms/types/password.rst b/reference/forms/types/password.rst
index c0946fe93c1..8382a0fc0e9 100644
--- a/reference/forms/types/password.rst
+++ b/reference/forms/types/password.rst
@@ -48,7 +48,8 @@ and submit the form.
 Inherited Options
 -----------------
 
-These options inherit from the :doc:`form </reference/forms/types/form>` type:
+These options inherit from the :doc:`form </reference/forms/types/form>`
+type:
 
 .. include:: /reference/forms/types/options/disabled.rst.inc
 
@@ -82,6 +83,6 @@ trim
 **type**: ``boolean`` **default**: ``false``
 
 If true, the whitespace of the submitted string value will be stripped
-via the :phpfunction:`trim` function when the data is bound. This guarantees that
-if a value is submitted with extra whitespace, it will be removed before
+via the :phpfunction:`trim` function when the data is bound. This guarantees
+that if a value is submitted with extra whitespace, it will be removed before
 the value is merged back onto the underlying object.
diff --git a/reference/forms/types/percent.rst b/reference/forms/types/percent.rst
index 253a43c69b5..4aea0b90481 100644
--- a/reference/forms/types/percent.rst
+++ b/reference/forms/types/percent.rst
@@ -70,11 +70,13 @@ object. The two "types" handle these two cases:
 Inherited Options
 -----------------
 
-These options inherit from the :doc:`form </reference/forms/types/form>` type:
+These options inherit from the :doc:`form </reference/forms/types/form>`
+type:
 
 .. include:: /reference/forms/types/options/data.rst.inc
 
 .. include:: /reference/forms/types/options/disabled.rst.inc
+
 .. include:: /reference/forms/types/options/empty_data.rst.inc
     :end-before: DEFAULT_PLACEHOLDER
 
diff --git a/reference/forms/types/radio.rst b/reference/forms/types/radio.rst
index af2f813df0f..771f5b13490 100644
--- a/reference/forms/types/radio.rst
+++ b/reference/forms/types/radio.rst
@@ -4,9 +4,10 @@
 radio Field Type
 ================
 
-Creates a single radio button. If the radio button is selected, the field will
-be set to the specified value. Radio buttons cannot be unchecked - the value only
-changes when another radio button with the same name gets checked.
+Creates a single radio button. If the radio button is selected, the field
+will be set to the specified value. Radio buttons cannot be unchecked -
+the value only changes when another radio button with the same name gets
+checked.
 
 The ``radio`` type isn't usually used directly. More commonly it's used
 internally by other types such as :doc:`choice </reference/forms/types/choice>`.
@@ -15,7 +16,7 @@ If you want to have a boolean field, use :doc:`checkbox </reference/forms/types/
 +-------------+---------------------------------------------------------------------+
 | Rendered as | ``input`` ``radio`` field                                           |
 +-------------+---------------------------------------------------------------------+
-| Inherited   | from  the :doc:`checkbox </reference/forms/types/checkbox>` type:   |
+| Inherited   | from the :doc:`checkbox </reference/forms/types/checkbox>` type:    |
 | options     |                                                                     |
 |             | - `value`_                                                          |
 |             |                                                                     |
@@ -45,7 +46,8 @@ type:
 
 .. include:: /reference/forms/types/options/value.rst.inc
 
-These options inherit from the :doc:`form </reference/forms/types/form>` type:
+These options inherit from the :doc:`form </reference/forms/types/form>`
+type:
 
 .. include:: /reference/forms/types/options/data.rst.inc
 
diff --git a/reference/forms/types/repeated.rst b/reference/forms/types/repeated.rst
index 91b85bd4d3b..8a69f565100 100644
--- a/reference/forms/types/repeated.rst
+++ b/reference/forms/types/repeated.rst
@@ -53,9 +53,9 @@ two fields are actually rendered, the end data from the form is just the
 single value (usually a string) that you need.
 
 The most important option is ``type``, which can be any field type and determines
-the actual type of the two underlying fields. The ``options`` option is passed
-to each of those individual fields, meaning - in this example - any option
-supported by the ``password`` type can be passed in this array.
+the actual type of the two underlying fields. The ``options`` option is
+passed to each of those individual fields, meaning - in this example - any
+option supported by the ``password`` type can be passed in this array.
 
 Rendering
 ~~~~~~~~~
@@ -116,19 +116,19 @@ first_name
 **type**: ``string`` **default**: ``first``
 
 This is the actual field name to be used for the first field. This is mostly
-meaningless, however, as the actual data entered into both of the fields will
-be available under the key assigned to the ``repeated`` field itself (e.g.
-``password``). However, if you don't specify a label, this field name is used
-to "guess" the label for you.
+meaningless, however, as the actual data entered into both of the fields
+will be available under the key assigned to the ``repeated`` field itself
+(e.g.  ``password``). However, if you don't specify a label, this field
+name is used to "guess" the label for you.
 
 first_options
 ~~~~~~~~~~~~~
 
 **type**: ``array`` **default**: ``array()``
 
-Additional options (will be merged into `options` above) that should be passed
-*only* to the first field. This is especially useful for customizing the
-label::
+Additional options (will be merged into `options`_ below) that should be
+passed *only* to the first field. This is especially useful for customizing
+the label::
 
     $builder->add('password', 'repeated', array(
         'first_options'  => array('label' => 'Password'),
@@ -140,11 +140,11 @@ options
 
 **type**: ``array`` **default**: ``array()``
 
-This options array will be passed to each of the two underlying fields. In
-other words, these are the options that customize the individual field types.
-For example, if the ``type`` option is set to ``password``, this array might
-contain the options ``always_empty`` or ``required`` - both options that are
-supported by the ``password`` field type.
+This options array will be passed to each of the two underlying fields.
+In other words, these are the options that customize the individual field
+types. For example, if the ``type`` option is set to ``password``, this
+array might contain the options ``always_empty`` or ``required`` - both
+options that are supported by the ``password`` field type.
 
 second_name
 ~~~~~~~~~~~
@@ -158,9 +158,9 @@ second_options
 
 **type**: ``array`` **default**: ``array()``
 
-Additional options (will be merged into `options` above) that should be passed
-*only* to the second field. This is especially useful for customizing the
-label (see `first_options`_).
+Additional options (will be merged into `options`_ above) that should be
+passed *only* to the second field. This is especially useful for customizing
+the label (see `first_options`_).
 
 type
 ~~~~
@@ -181,7 +181,8 @@ error_bubbling
 Inherited Options
 -----------------
 
-These options inherit from the :doc:`form </reference/forms/types/form>` type:
+These options inherit from the :doc:`form </reference/forms/types/form>`
+type:
 
 .. include:: /reference/forms/types/options/data.rst.inc
 
diff --git a/reference/forms/types/search.rst b/reference/forms/types/search.rst
index 955c52cadaf..88f78fcc50c 100644
--- a/reference/forms/types/search.rst
+++ b/reference/forms/types/search.rst
@@ -32,7 +32,8 @@ Read about the input search field at `DiveIntoHTML5.info`_
 Inherited Options
 -----------------
 
-These options inherit from the :doc:`form </reference/forms/types/form>` type:
+These options inherit from the :doc:`form </reference/forms/types/form>`
+type:
 
 .. include:: /reference/forms/types/options/disabled.rst.inc
 
diff --git a/reference/forms/types/submit.rst b/reference/forms/types/submit.rst
index 89c3632999b..9d8c015a8d8 100644
--- a/reference/forms/types/submit.rst
+++ b/reference/forms/types/submit.rst
@@ -25,9 +25,10 @@ A submit button.
 +----------------------+----------------------------------------------------------------------+
 
 The Submit button has an additional method
-:method:`Symfony\\Component\\Form\\ClickableInterface::isClicked` that lets you
-check whether this button was used to submit the form. This is especially
-useful when :ref:`a form has multiple submit buttons <book-form-submitting-multiple-buttons>`::
+:method:`Symfony\\Component\\Form\\ClickableInterface::isClicked` that lets
+you check whether this button was used to submit the form. This is especially
+useful when :ref:`a form has multiple submit buttons
+<book-form-submitting-multiple-buttons>`::
 
     if ($form->get('save')->isClicked()) {
         // ...
diff --git a/reference/forms/types/text.rst b/reference/forms/types/text.rst
index f9fbb152c22..68e2c18875b 100644
--- a/reference/forms/types/text.rst
+++ b/reference/forms/types/text.rst
@@ -31,7 +31,8 @@ The text field represents the most basic input text field.
 Inherited Options
 -----------------
 
-These options inherit from the :doc:`form </reference/forms/types/form>` type:
+These options inherit from the :doc:`form </reference/forms/types/form>`
+type:
 
 .. include:: /reference/forms/types/options/data.rst.inc
 
diff --git a/reference/forms/types/textarea.rst b/reference/forms/types/textarea.rst
index 1352d9e2e6f..caa64a9f9c9 100644
--- a/reference/forms/types/textarea.rst
+++ b/reference/forms/types/textarea.rst
@@ -31,7 +31,8 @@ Renders a ``textarea`` HTML element.
 Inherited Options
 -----------------
 
-These options inherit from the :doc:`form </reference/forms/types/form>` type:
+These options inherit from the :doc:`form </reference/forms/types/form>`
+type:
 
 .. include:: /reference/forms/types/options/attr.rst.inc
 
diff --git a/reference/forms/types/time.rst b/reference/forms/types/time.rst
index f729f419dcc..b8765688db5 100644
--- a/reference/forms/types/time.rst
+++ b/reference/forms/types/time.rst
@@ -7,8 +7,8 @@ time Field Type
 A field to capture time input.
 
 This can be rendered as a text field, a series of text fields (e.g. hour,
-minute, second) or a series of select fields. The underlying data can be stored
-as a ``DateTime`` object, a string, a timestamp or an array.
+minute, second) or a series of select fields. The underlying data can be
+stored as a ``DateTime`` object, a string, a timestamp or an array.
 
 +----------------------+-----------------------------------------------------------------------------+
 | Underlying Data Type | can be ``DateTime``, string, timestamp, or array (see the ``input`` option) |
@@ -49,11 +49,9 @@ Basic Usage
 This field type is highly configurable, but easy to use. The most important
 options are ``input`` and ``widget``.
 
-Suppose that you have a ``startTime`` field whose underlying time data is a
-``DateTime`` object. The following configures the ``time`` type for that
-field as two different choice fields:
-
-.. code-block:: php
+Suppose that you have a ``startTime`` field whose underlying time data is
+a ``DateTime`` object. The following configures the ``time`` type for that
+field as two different choice fields::
 
     $builder->add('startTime', 'time', array(
         'input'  => 'datetime',
@@ -62,9 +60,7 @@ field as two different choice fields:
 
 The ``input`` option *must* be changed to match the type of the underlying
 date data. For example, if the ``startTime`` field's data were a unix timestamp,
-you'd need to set ``input`` to ``timestamp``:
-
-.. code-block:: php
+you'd need to set ``input`` to ``timestamp``::
 
     $builder->add('startTime', 'time', array(
         'input'  => 'timestamp',
@@ -86,8 +82,8 @@ input
 
 **type**: ``string`` **default**: ``datetime``
 
-The format of the *input* data - i.e. the format that the date is stored on
-your underlying object. Valid values are:
+The format of the *input* data - i.e. the format that the date is stored
+on your underlying object. Valid values are:
 
 * ``string`` (e.g. ``12:17:26``)
 * ``datetime`` (a ``DateTime`` object)
@@ -110,7 +106,8 @@ widget
 
 **type**: ``string`` **default**: ``choice``
 
-The basic way in which this field should be rendered. Can be one of the following:
+The basic way in which this field should be rendered. Can be one of the
+following:
 
 * ``choice``: renders one, two (default) or three select inputs (hour, minute,
   second), depending on the `with_minutes`_ and `with_seconds`_ options.
@@ -118,14 +115,15 @@ The basic way in which this field should be rendered. Can be one of the followin
 * ``text``: renders one, two (default) or three text inputs (hour, minute,
   second), depending on the `with_minutes`_ and `with_seconds`_ options.
 
-* ``single_text``: renders a single input of type ``time``. User's input will
-  be validated against the form ``hh:mm`` (or ``hh:mm:ss`` if using seconds).
+* ``single_text``: renders a single input of type ``time``. User's input
+  will be validated against the form ``hh:mm`` (or ``hh:mm:ss`` if using
+  seconds).
 
 .. caution::
 
     Combining the widget type ``single_text`` and the `with_minutes`_ option
-    set to ``false`` can cause unexpected behavior in the client as the input
-    type ``time`` might not support selecting an hour only.
+    set to ``false`` can cause unexpected behavior in the client as the
+    input type ``time`` might not support selecting an hour only.
 
 .. include:: /reference/forms/types/options/with_minutes.rst.inc
 
@@ -149,7 +147,8 @@ error_bubbling
 Inherited Options
 -----------------
 
-These options inherit from the :doc:`form </reference/forms/types/form>` type:
+These options inherit from the :doc:`form </reference/forms/types/form>`
+type:
 
 .. include:: /reference/forms/types/options/data.rst.inc
 
diff --git a/reference/forms/types/timezone.rst b/reference/forms/types/timezone.rst
index cbf191ee683..b8c6fd65d2d 100644
--- a/reference/forms/types/timezone.rst
+++ b/reference/forms/types/timezone.rst
@@ -4,8 +4,8 @@
 timezone Field Type
 ===================
 
-The ``timezone`` type is a subset of the ``ChoiceType`` that allows the user
-to select from all possible timezones.
+The ``timezone`` type is a subset of the ``ChoiceType`` that allows the
+user to select from all possible timezones.
 
 The "value" for each timezone is the full timezone name, such as ``America/Chicago``
 or ``Europe/Istanbul``.
@@ -60,7 +60,8 @@ The Timezone type defaults the choices to all timezones returned by
 Inherited Options
 -----------------
 
-These options inherit from the :doc:`choice </reference/forms/types/choice>` type:
+These options inherit from the :doc:`choice </reference/forms/types/choice>`
+type:
 
 .. include:: /reference/forms/types/options/empty_value.rst.inc
 
@@ -70,7 +71,8 @@ These options inherit from the :doc:`choice </reference/forms/types/choice>` typ
 
 .. include:: /reference/forms/types/options/preferred_choices.rst.inc
 
-These options inherit from the :doc:`form </reference/forms/types/form>` type:
+These options inherit from the :doc:`form </reference/forms/types/form>`
+type:
 
 .. include:: /reference/forms/types/options/data.rst.inc
 
diff --git a/reference/forms/types/url.rst b/reference/forms/types/url.rst
index 1df99a06d30..c87abaaa5ad 100644
--- a/reference/forms/types/url.rst
+++ b/reference/forms/types/url.rst
@@ -46,7 +46,8 @@ the data is submitted to the form.
 Inherited Options
 -----------------
 
-These options inherit from the :doc:`form </reference/forms/types/form>` type:
+These options inherit from the :doc:`form </reference/forms/types/form>`
+type:
 
 .. include:: /reference/forms/types/options/data.rst.inc