Merge branch '2.2' into 2.3

Author: weaverryan

components/form/introduction.rst

@@ -17,10 +17,10 @@ be from a normal form post or from an API.
 Installation
 ------------
 
-You can install the component in many different ways:
+You can install the component in 2 different ways:
 
 * Use the official Git repository (https://github.com/symfony/Form);
-* Install it via Composer (``symfony/form`` on `Packagist`_).
+* :doc:`Install it via Composer </components/using_components>` (``symfony/form`` on `Packagist`_).
 
 Configuration
 -------------
@@ -51,7 +51,8 @@ support for very important features:
   messages for submitted data.
 
 The Symfony2 Form component relies on other libraries to solve these problems.
-Most of the time you will use Twig and the Symfony :doc:`HttpFoundation </components/http_foundation/introduction>`,
+Most of the time you will use Twig and the Symfony
+:doc:`HttpFoundation </components/http_foundation/introduction>`,
 Translation and Validator components, but you can replace any of these with
 a different library of your choice.
 
@@ -66,8 +67,9 @@ Request Handling
 ~~~~~~~~~~~~~~~~
 
 To process form data, you'll need to grab information off of the request (typically
-``$_POST`` data) and pass the array of submitted data to :method:`Symfony\\Component\\Form\\Form::bind`.
-The Form component optionally integrates with Symfony's :doc:`HttpFoundation </components/http_foundation/introduction>`
+``$_POST`` data) and pass the array of submitted data to
+:method:`Symfony\\Component\\Form\\Form::bind`. The Form component optionally
+integrates with Symfony's :doc:`HttpFoundation </components/http_foundation/introduction>`
 component to make this even easier.
 
 To integrate the HttpFoundation component, add the

cookbook/form/form_customization.rst

@@ -298,6 +298,24 @@ When the ``form.age`` widget is rendered, Symfony will use the ``integer_widget`
 block from the new template and the ``input`` tag will be wrapped in the
 ``div`` element specified in the customized block.
 
+Child Forms
+...........
+
+You can also apply a form theme to a specific child of your form:
+
+.. code-block:: html+jinja
+
+    {% form_theme form.child 'AcmeDemoBundle:Form:fields.html.twig' %}
+
+This is useful when you want to have a custom theme for a nested form that's
+different than the one of your main form. Just specify both your themes:
+
+.. code-block:: html+jinja
+
+    {% form_theme form 'AcmeDemoBundle:Form:fields.html.twig' %}
+
+    {% form_theme form.child 'AcmeDemoBundle:Form:fields_child.html.twig' %}
+
 .. _cookbook-form-php-theming:
 
 Form Theming in PHP
@@ -333,6 +351,13 @@ When the ``form.age`` widget is rendered, Symfony will use the customized
 ``integer_widget.html.php`` template and the ``input`` tag will be wrapped in
 the ``div`` element.
 
+If you want to apply a theme to a specific child form, pass it to the ``setTheme``
+method:
+
+.. code-block:: php
+
+    <?php $view['form']->setTheme($form['child'], 'AcmeDemoBundle:Form/Child'); ?>
+
 .. _cookbook-form-twig-import-base-blocks:
 
 Referencing Base Form Blocks (Twig specific)