symfony
diff --git a/‎cookbook/form/form_customization.rst
Copy file name to clipboardExpand all lines: cookbook/form/form_customization.rst
+9-19Lines changed: 9 additions & 19 deletions b/‎cookbook/form/form_customization.rst
Copy file name to clipboardExpand all lines: cookbook/form/form_customization.rst
+9-19Lines changed: 9 additions & 19 deletions
diff --git a/‎reference/configuration/twig.rst
Copy file name to clipboardExpand all lines: reference/configuration/twig.rst
+14-13Lines changed: 14 additions & 13 deletions b/‎reference/configuration/twig.rst
Copy file name to clipboardExpand all lines: reference/configuration/twig.rst
+14-13Lines changed: 14 additions & 13 deletions
@@ -439,29 +439,24 @@ form is rendered.
 
         # app/config/config.yml
         twig:
-            form:
-                resources:
-                    - 'AcmeDemoBundle:Form:fields.html.twig'
+            form_themes:
+                - 'AcmeDemoBundle:Form:fields.html.twig'
             # ...
 
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
         <twig:config>
-            <twig:form>
-                <resource>AcmeDemoBundle:Form:fields.html.twig</resource>
-            </twig:form>
+            <twig:form-theme>AcmeDemoBundle:Form:fields.html.twig</twig:form-theme>
             <!-- ... -->
         </twig:config>
 
     .. code-block:: php
 
         // app/config/config.php
         $container->loadFromExtension('twig', array(
-            'form' => array(
-                'resources' => array(
-                    'AcmeDemoBundle:Form:fields.html.twig',
-                ),
+            'form_themes' => array(
+                'AcmeDemoBundle:Form:fields.html.twig',
             ),
 
             // ...
@@ -477,28 +472,23 @@ resource to use such a layout:
 
         # app/config/config.yml
         twig:
-            form:
-                resources: ['form_table_layout.html.twig']
+            form_themes: ['form_table_layout.html.twig']
             # ...
 
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
         <twig:config>
-            <twig:form>
-                <resource>form_table_layout.html.twig</resource>
-            </twig:form>
+            <twig:form-theme>form_table_layout.html.twig</twig:form-theme>
             <!-- ... -->
         </twig:config>
 
     .. code-block:: php
 
         // app/config/config.php
         $container->loadFromExtension('twig', array(
-            'form' => array(
-                'resources' => array(
-                    'form_table_layout.html.twig',
-                ),
+            'form_themes' => array(
+                'form_table_layout.html.twig',
             ),
 
             // ...
 
@@ -10,14 +10,13 @@ TwigBundle Configuration ("twig")
 
         twig:
             exception_controller:  twig.controller.exception:showAction
-            form:
-                resources:
+            form_themes:
 
-                    # Default:
-                    - form_div_layout.html.twig
+                # Default:
+                - form_div_layout.html.twig
 
-                    # Example:
-                    - MyBundle::form.html.twig
+                # Example:
+                - MyBundle::form.html.twig
             globals:
 
                 # Examples:
@@ -54,9 +53,7 @@ TwigBundle Configuration ("twig")
                                 http://symfony.com/schema/dic/twig http://symfony.com/schema/dic/doctrine/twig-1.0.xsd">
 
             <twig:config auto-reload="%kernel.debug%" autoescape="true" base-template-class="Twig_Template" cache="%kernel.cache_dir%/twig" charset="%kernel.charset%" debug="%kernel.debug%" strict-variables="false">
-                <twig:form>
-                    <twig:resource>MyBundle::form.html.twig</twig:resource>
-                </twig:form>
+                <twig:form-theme>MyBundle::form.html.twig</twig:form-theme>
                 <twig:global key="foo" id="bar" type="service" />
                 <twig:global key="pi">3.14</twig:global>
             </twig:config>
@@ -65,10 +62,8 @@ TwigBundle Configuration ("twig")
     .. code-block:: php
 
         $container->loadFromExtension('twig', array(
-            'form' => array(
-                'resources' => array(
-                    'MyBundle::form.html.twig',
-                )
+            'form_themes' => array(
+                'MyBundle::form.html.twig',
              ),
              'globals' => array(
                  'foo' => '@bar',
@@ -83,6 +78,12 @@ TwigBundle Configuration ("twig")
              'strict_variables'    => false,
         ));
 
+.. caution::
+
+    The ``twig.form`` (``<twig:form />`` tag for xml) configuration key
+    has been deprecated and will be removed in 3.0.
+    Instead, use the ``twig.form_themes`` option.
+
 Configuration
 -------------