language and locale inh options fixed

Author: ikwattro

reference/forms/types/language.rst

@@ -23,34 +23,38 @@ you should just use the ``choice`` type directly.
 +-------------+------------------------------------------------------------------------+
 | Rendered as | can be various tags (see :ref:`forms-reference-choice-tags`) |
 +-------------+------------------------------------------------------------------------+
-| Options  | - ``multiple`` |
-|   | - ``expanded`` |
+| Inherited | - ``multiple`` |
+| options | - ``expanded`` |
 | | - ``preferred_choices`` |
 | | - ``required`` |
 | | - ``label`` |
 | | - ``read_only`` |
 | | - ``error_bubbling`` |
 +-------------+------------------------------------------------------------------------+
-| Parent type | :doc:`choice</reference/forms/types/choice>`  |
+| Parent type | :doc:`choice</reference/forms/types/choice>`, field |
 +-------------+------------------------------------------------------------------------+
 | Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\LanguageType` |
 +-------------+------------------------------------------------------------------------+
 
-Options
--------
+Inherited options
+-----------------
+
+These options are inherited from the parent ``choiceType`` class:
 
 .. include:: /reference/forms/types/options/multiple.rst.inc
 
 .. include:: /reference/forms/types/options/expanded.rst.inc
 
 .. include:: /reference/forms/types/options/preferred_choices.rst.inc
 
+.. include:: /reference/forms/types/options/error_bubbling.rst.inc
+
+These options are inherited from the parent ``fieldType`` class:
+
 .. include:: /reference/forms/types/options/required.rst.inc
 
 .. include:: /reference/forms/types/options/label.rst.inc
 
 .. include:: /reference/forms/types/options/read_only.rst.inc
 
-.. include:: /reference/forms/types/options/error_bubbling.rst.inc
-
 .. _`Locale::getDefault()`: http://php.net/manual/en/locale.getdefault.php

reference/forms/types/locale.rst

@@ -21,37 +21,41 @@ Unlike the ``choice`` type, you don't need to specify a ``choices`` or
 of locales. 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`) |
-+-------------+----------------------------------------------------------------------+
-| Options | - ``multiple`` |
-| | - ``expanded`` |
-| | - ``preferred_choices`` |
-| | - ``required`` |
-| | - ``label`` |
-| | - ``read_only`` |
-| | - ``error_bubbling`` |
-+-------------+----------------------------------------------------------------------+
-| Parent type | :doc:`choice</reference/forms/types/choice>` |
-+-------------+----------------------------------------------------------------------+
-| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\LocaleType` |
-+-------------+----------------------------------------------------------------------+
-
-Options
--------
++-------------+------------------------------------------------------------------------+
+| Rendered as | can be various tags (see :ref:`forms-reference-choice-tags`) |
++-------------+------------------------------------------------------------------------+
+| Inherited | - ``multiple`` |
+| options | - ``expanded`` |
+| | - ``preferred_choices`` |
+| | - ``required`` |
+| | - ``label`` |
+| | - ``read_only`` |
+| | - ``error_bubbling`` |
++-------------+------------------------------------------------------------------------+
+| Parent type | :doc:`choice</reference/forms/types/choice>`, field |
++-------------+------------------------------------------------------------------------+
+| Class | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\LanguageType` |
++-------------+------------------------------------------------------------------------+
+
+Inherited options
+-----------------
+
+These options are inherited from the parent ``choiceType`` class:
 
 .. include:: /reference/forms/types/options/multiple.rst.inc
 
 .. include:: /reference/forms/types/options/expanded.rst.inc
 
 .. include:: /reference/forms/types/options/preferred_choices.rst.inc
 
+.. include:: /reference/forms/types/options/error_bubbling.rst.inc
+
+These options are inherited from the parent ``fieldType`` class:
+
 .. include:: /reference/forms/types/options/required.rst.inc
 
 .. include:: /reference/forms/types/options/label.rst.inc
 
 .. include:: /reference/forms/types/options/read_only.rst.inc
 
-.. include:: /reference/forms/types/options/error_bubbling.rst.inc
-
 .. _`Locale::getDefault()`: http://php.net/manual/en/locale.getdefault.php