symfony
diff --git a/‎form/form_customization.rst
Lines changed: 3 additions & 0 deletions b/‎form/form_customization.rst
Lines changed: 3 additions & 0 deletions
diff --git a/‎form/form_themes.rst
Lines changed: 3 additions & 0 deletions b/‎form/form_themes.rst
Lines changed: 3 additions & 0 deletions
diff --git a/‎form/rendering.rst
Lines changed: 2 additions & 0 deletions b/‎form/rendering.rst
Lines changed: 2 additions & 0 deletions
diff --git a/‎reference/forms/types/birthday.rst
Lines changed: 3 additions & 0 deletions b/‎reference/forms/types/birthday.rst
Lines changed: 3 additions & 0 deletions
diff --git a/‎reference/forms/types/checkbox.rst
Lines changed: 3 additions & 0 deletions b/‎reference/forms/types/checkbox.rst
Lines changed: 3 additions & 0 deletions
diff --git a/‎reference/forms/types/choice.rst
Lines changed: 3 additions & 0 deletions b/‎reference/forms/types/choice.rst
Lines changed: 3 additions & 0 deletions
diff --git a/‎reference/forms/types/collection.rst
Lines changed: 3 additions & 0 deletions b/‎reference/forms/types/collection.rst
Lines changed: 3 additions & 0 deletions
diff --git a/‎reference/forms/types/color.rst
Lines changed: 3 additions & 0 deletions b/‎reference/forms/types/color.rst
Lines changed: 3 additions & 0 deletions
diff --git a/‎reference/forms/types/country.rst
Lines changed: 3 additions & 0 deletions b/‎reference/forms/types/country.rst
Lines changed: 3 additions & 0 deletions
diff --git a/‎reference/forms/types/currency.rst
Lines changed: 3 additions & 0 deletions b/‎reference/forms/types/currency.rst
Lines changed: 3 additions & 0 deletions
diff --git a/‎reference/forms/types/date.rst
Lines changed: 3 additions & 0 deletions b/‎reference/forms/types/date.rst
Lines changed: 3 additions & 0 deletions
diff --git a/‎reference/forms/types/dateinterval.rst
Lines changed: 3 additions & 0 deletions b/‎reference/forms/types/dateinterval.rst
Lines changed: 3 additions & 0 deletions
diff --git a/‎reference/forms/types/datetime.rst
Lines changed: 3 additions & 0 deletions b/‎reference/forms/types/datetime.rst
Lines changed: 3 additions & 0 deletions
diff --git a/‎reference/forms/types/email.rst
Lines changed: 3 additions & 0 deletions b/‎reference/forms/types/email.rst
Lines changed: 3 additions & 0 deletions
diff --git a/‎reference/forms/types/entity.rst
Lines changed: 3 additions & 0 deletions b/‎reference/forms/types/entity.rst
Lines changed: 3 additions & 0 deletions
diff --git a/‎reference/forms/types/file.rst
Lines changed: 3 additions & 0 deletions b/‎reference/forms/types/file.rst
Lines changed: 3 additions & 0 deletions
diff --git a/‎reference/forms/types/form.rst
Lines changed: 3 additions & 0 deletions b/‎reference/forms/types/form.rst
Lines changed: 3 additions & 0 deletions
diff --git a/‎reference/forms/types/integer.rst
Lines changed: 3 additions & 0 deletions b/‎reference/forms/types/integer.rst
Lines changed: 3 additions & 0 deletions
diff --git a/‎reference/forms/types/language.rst
Lines changed: 3 additions & 0 deletions b/‎reference/forms/types/language.rst
Lines changed: 3 additions & 0 deletions
@@ -36,6 +36,7 @@ You can also render each of the three parts of the field individually:
             {{ form_label(form.age) }}
             {{ form_errors(form.age) }}
             {{ form_widget(form.age) }}
+            {{ form_help(form.age) }}
         </div>
 
     .. code-block:: php
@@ -798,6 +799,7 @@ You can also override the markup for an entire field row using the same method:
                 {{ form_label(form) }}
                 {{ form_errors(form) }}
                 {{ form_widget(form) }}
+                {{ form_help(form) }}
             </div>
         {% endblock %}
 
@@ -1026,6 +1028,7 @@ class to the ``div`` element around each row:
                 {{ form_label(form) }}
                 {{ form_errors(form) }}
                 {{ form_widget(form) }}
+                {{ form_help(form) }}
             </div>
         {% endblock form_row %}
 
 
@@ -35,6 +35,7 @@ do this, create a new template file that will store the new markup:
                 {{ form_label(form) }}
                 {{ form_errors(form) }}
                 {{ form_widget(form) }}
+                {{ form_help(form) }}
             </div>
         {% endspaceless %}
         {% endblock form_row %}
@@ -135,6 +136,8 @@ are 4 possible *parts* of a form that can be rendered:
 +-------------+----------------------------+---------------------------------------------------------+
 | ``errors``  | (e.g. ``form_errors()``)   | renders the field's errors                              |
 +-------------+----------------------------+---------------------------------------------------------+
+| ``help``    | (e.g. ``form_help()``)     | renders the field's help                                |
++-------------+----------------------------+---------------------------------------------------------+
 | ``row``     | (e.g. ``form_row()``)      | renders the field's entire row (label, widget & errors) |
 +-------------+----------------------------+---------------------------------------------------------+
 
 
@@ -82,12 +82,14 @@ used the ``form_row()`` helper:
                 {{ form_label(form.task) }}
                 {{ form_errors(form.task) }}
                 {{ form_widget(form.task) }}
+                {{ form_help(form.task) }}
             </div>
 
             <div>
                 {{ form_label(form.dueDate) }}
                 {{ form_errors(form.dueDate) }}
                 {{ form_widget(form.dueDate) }}
+                {{ form_help(form.dueDate) }}
             </div>
 
             <div>
 
@@ -38,6 +38,7 @@ option defaults to 120 years ago to the current year.
 |                      |                                                                               |
 |                      | - `data`_                                                                     |
 |                      | - `disabled`_                                                                 |
+|                      | - `help`_                                                                     |
 |                      | - `inherit_data`_                                                             |
 |                      | - `invalid_message`_                                                          |
 |                      | - `invalid_message_parameters`_                                               |
@@ -108,6 +109,8 @@ These options inherit from the :doc:`FormType </reference/forms/types/form>`:
 
 .. include:: /reference/forms/types/options/disabled.rst.inc
 
+.. include:: /reference/forms/types/options/help.rst.inc
+
 .. include:: /reference/forms/types/options/inherit_data.rst.inc
 
 .. include:: /reference/forms/types/options/invalid_message.rst.inc
 
@@ -20,6 +20,7 @@ true, if the box is unchecked, the value will be set to false.
 | options     | - `disabled`_                                                          |
 |             | - `error_bubbling`_                                                    |
 |             | - `error_mapping`_                                                     |
+|             | - `help`_                                                              |
 |             | - `label`_                                                             |
 |             | - `label_attr`_                                                        |
 |             | - `label_format`_                                                      |
@@ -69,6 +70,8 @@ These options inherit from the :doc:`FormType </reference/forms/types/form>`:
 
 .. include:: /reference/forms/types/options/error_mapping.rst.inc
 
+.. include:: /reference/forms/types/options/help.rst.inc
+
 .. include:: /reference/forms/types/options/label.rst.inc
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
@@ -35,6 +35,7 @@ To use this field, you must specify *either* ``choices`` or ``choice_loader`` op
 |             | - `data`_                                                                    |
 |             | - `disabled`_                                                                |
 |             | - `error_mapping`_                                                           |
+|             | - `help`_                                                                    |
 |             | - `inherit_data`_                                                            |
 |             | - `label`_                                                                   |
 |             | - `label_attr`_                                                              |
@@ -267,6 +268,8 @@ These options inherit from the :doc:`FormType </reference/forms/types/form>`:
 
 .. include:: /reference/forms/types/options/error_mapping.rst.inc
 
+.. include:: /reference/forms/types/options/help.rst.inc
+
 .. include:: /reference/forms/types/options/inherit_data.rst.inc
 
 .. include:: /reference/forms/types/options/label.rst.inc
 
@@ -27,6 +27,7 @@ photos).
 | options     | - `empty_data`_                                                             |
 |             | - `error_bubbling`_                                                         |
 |             | - `error_mapping`_                                                          |
+|             | - `help`_                                                                   |
 |             | - `label`_                                                                  |
 |             | - `label_attr`_                                                             |
 |             | - `label_format`_                                                           |
@@ -448,6 +449,8 @@ error_bubbling
 
 .. include:: /reference/forms/types/options/error_mapping.rst.inc
 
+.. include:: /reference/forms/types/options/help.rst.inc
+
 .. include:: /reference/forms/types/options/label.rst.inc
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
@@ -22,6 +22,7 @@ element.
 |             | - `empty_data`_                                                     |
 |             | - `error_bubbling`_                                                 |
 |             | - `error_mapping`_                                                  |
+|             | - `help`_                                                           |
 |             | - `label`_                                                          |
 |             | - `label_attr`_                                                     |
 |             | - `label_format`_                                                   |
@@ -55,6 +56,8 @@ The default value is ``''`` (the empty string).
 
 .. include:: /reference/forms/types/options/error_mapping.rst.inc
 
+.. include:: /reference/forms/types/options/help.rst.inc
+
 .. include:: /reference/forms/types/options/label.rst.inc
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
@@ -39,6 +39,7 @@ the option manually, but then you should just use the ``ChoiceType`` directly.
 |             | - `data`_                                                             |
 |             | - `disabled`_                                                         |
 |             | - `empty_data`_                                                       |
+|             | - `help`_                                                             |
 |             | - `label`_                                                            |
 |             | - `label_attr`_                                                       |
 |             | - `label_format`_                                                     |
@@ -103,6 +104,8 @@ The actual default value of this option depends on other field options:
 .. include:: /reference/forms/types/options/empty_data.rst.inc
     :start-after: DEFAULT_PLACEHOLDER
 
+.. include:: /reference/forms/types/options/help.rst.inc
+
 .. include:: /reference/forms/types/options/label.rst.inc
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
@@ -31,6 +31,7 @@ manually, but then you should just use the ``ChoiceType`` directly.
 |             | - `data`_                                                              |
 |             | - `disabled`_                                                          |
 |             | - `empty_data`_                                                        |
+|             | - `help`_                                                              |
 |             | - `label`_                                                             |
 |             | - `label_attr`_                                                        |
 |             | - `label_format`_                                                      |
@@ -92,6 +93,8 @@ The actual default value of this option depends on other field options:
 .. include:: /reference/forms/types/options/empty_data.rst.inc
     :start-after: DEFAULT_PLACEHOLDER
 
+.. include:: /reference/forms/types/options/help.rst.inc
+
 .. include:: /reference/forms/types/options/label.rst.inc
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
@@ -35,6 +35,7 @@ and can understand a number of different input formats via the `input`_ option.
 | Inherited            | - `data`_                                                                   |
 | options              | - `disabled`_                                                               |
 |                      | - `error_mapping`_                                                          |
+|                      | - `help`_                                                                   |
 |                      | - `inherit_data`_                                                           |
 |                      | - `invalid_message`_                                                        |
 |                      | - `invalid_message_parameters`_                                             |
@@ -206,6 +207,8 @@ These options inherit from the :doc:`FormType </reference/forms/types/form>`:
 
 .. include:: /reference/forms/types/options/error_mapping.rst.inc
 
+.. include:: /reference/forms/types/options/help.rst.inc
+
 .. include:: /reference/forms/types/options/inherit_data.rst.inc
 
 .. include:: /reference/forms/types/options/invalid_message.rst.inc
 
@@ -39,6 +39,7 @@ or an array (see `input`_).
 +----------------------+----------------------------------------------------------------------------------+
 | Inherited            | - `data`_                                                                        |
 | options              | - `disabled`_                                                                    |
+|                      | - `help`_                                                                        |
 |                      | - `inherit_data`_                                                                |
 |                      | - `invalid_message`_                                                             |
 |                      | - `invalid_message_parameters`_                                                  |
@@ -307,6 +308,8 @@ These options inherit from the :doc:`form </reference/forms/types/form>` type:
 
 .. include:: /reference/forms/types/options/disabled.rst.inc
 
+.. include:: /reference/forms/types/options/help.rst.inc
+
 .. include:: /reference/forms/types/options/inherit_data.rst.inc
 
 .. include:: /reference/forms/types/options/invalid_message.rst.inc
 
@@ -42,6 +42,7 @@ the data can be a ``DateTime`` object, a string, a timestamp or an array.
 +----------------------+-----------------------------------------------------------------------------+
 | Inherited            | - `data`_                                                                   |
 | options              | - `disabled`_                                                               |
+|                      | - `help`_                                                                   |
 |                      | - `inherit_data`_                                                           |
 |                      | - `invalid_message`_                                                        |
 |                      | - `invalid_message_parameters`_                                             |
@@ -194,6 +195,8 @@ These options inherit from the :doc:`FormType </reference/forms/types/form>`:
 
 .. include:: /reference/forms/types/options/disabled.rst.inc
 
+.. include:: /reference/forms/types/options/help.rst.inc
+
 .. include:: /reference/forms/types/options/inherit_data.rst.inc
 
 .. include:: /reference/forms/types/options/invalid_message.rst.inc
 
@@ -15,6 +15,7 @@ The ``EmailType`` field is a text field that is rendered using the HTML5
 |             | - `empty_data`_                                                     |
 |             | - `error_bubbling`_                                                 |
 |             | - `error_mapping`_                                                  |
+|             | - `help`_                                                           |
 |             | - `label`_                                                          |
 |             | - `label_attr`_                                                     |
 |             | - `label_format`_                                                   |
@@ -48,6 +49,8 @@ The default value is ``''`` (the empty string).
 
 .. include:: /reference/forms/types/options/error_mapping.rst.inc
 
+.. include:: /reference/forms/types/options/help.rst.inc
+
 .. include:: /reference/forms/types/options/label.rst.inc
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
@@ -41,6 +41,7 @@ objects from the database.
 |             | - `empty_data`_                                                  |
 |             | - `error_bubbling`_                                              |
 |             | - `error_mapping`_                                               |
+|             | - `help`_                                                        |
 |             | - `label`_                                                       |
 |             | - `label_attr`_                                                  |
 |             | - `label_format`_                                                |
@@ -306,6 +307,8 @@ The actual default value of this option depends on other field options:
 
 .. include:: /reference/forms/types/options/error_mapping.rst.inc
 
+.. include:: /reference/forms/types/options/help.rst.inc
+
 .. include:: /reference/forms/types/options/label.rst.inc
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
@@ -18,6 +18,7 @@ The ``FileType`` represents a file input in your form.
 | Inherited   | - `disabled`_                                                       |
 | options     | - `error_bubbling`_                                                 |
 |             | - `error_mapping`_                                                  |
+|             | - `help`_                                                           |
 |             | - `label`_                                                          |
 |             | - `label_attr`_                                                     |
 |             | - `label_format`_                                                   |
@@ -124,6 +125,8 @@ These options inherit from the :doc:`FormType </reference/forms/types/form>`:
 
 .. include:: /reference/forms/types/options/error_mapping.rst.inc
 
+.. include:: /reference/forms/types/options/help.rst.inc
+
 .. include:: /reference/forms/types/options/label.rst.inc
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc
 
@@ -19,6 +19,7 @@ on all types for which ``FormType`` is the parent.
 |           | - `error_bubbling`_                                                |
 |           | - `error_mapping`_                                                 |
 |           | - `extra_fields_message`_                                          |
+|           | - `help`_                                                          |
 |           | - `inherit_data`_                                                  |
 |           | - `invalid_message`_                                               |
 |           | - `invalid_message_parameters`_                                    |
@@ -98,6 +99,8 @@ The actual default value of this option depends on other field options:
 
 .. include:: /reference/forms/types/options/extra_fields_message.rst.inc
 
+.. include:: /reference/forms/types/options/help.rst.inc
+
 .. include:: /reference/forms/types/options/inherit_data.rst.inc
 
 .. include:: /reference/forms/types/options/invalid_message.rst.inc
 
@@ -27,6 +27,7 @@ integers. By default, all non-integer values (e.g. 6.78) will round down
 |             | - `empty_data`_                                                       |
 |             | - `error_bubbling`_                                                   |
 |             | - `error_mapping`_                                                    |
+|             | - `help`_                                                             |
 |             | - `invalid_message`_                                                  |
 |             | - `invalid_message_parameters`_                                       |
 |             | - `label`_                                                            |
@@ -110,6 +111,8 @@ The default value is ``''`` (the empty string).
 
 .. include:: /reference/forms/types/options/error_mapping.rst.inc
 
+.. include:: /reference/forms/types/options/help.rst.inc
+
 .. include:: /reference/forms/types/options/invalid_message.rst.inc
 
 .. include:: /reference/forms/types/options/invalid_message_parameters.rst.inc
 
@@ -41,6 +41,7 @@ manually, but then you should just use the ``ChoiceType`` directly.
 |             | - `data`_                                                              |
 |             | - `disabled`_                                                          |
 |             | - `empty_data`_                                                        |
+|             | - `help`_                                                              |
 |             | - `label`_                                                             |
 |             | - `label_attr`_                                                        |
 |             | - `label_format`_                                                      |
@@ -105,6 +106,8 @@ The actual default value of this option depends on other field options:
 .. include:: /reference/forms/types/options/empty_data.rst.inc
     :start-after: DEFAULT_PLACEHOLDER
 
+.. include:: /reference/forms/types/options/help.rst.inc
+
 .. include:: /reference/forms/types/options/label.rst.inc
 
 .. include:: /reference/forms/types/options/label_attr.rst.inc