Merge branch '2.3' into 2.5

wouterj · wouterj · commit ce2ed77334c3 · 2014-12-28T16:39:20.000+01:00
diff --git a/components/console/introduction.rst b/components/console/introduction.rst
@@ -332,7 +332,7 @@ declare a one-letter shortcut that you can call with a single dash like
 .. tip::
 
     It is also possible to make an option *optionally* accept a value (so that
-    ``--yell`` or ``--yell=loud`` or ``--yell loud`` work). Options can also be configured to
+    ``--yell``, ``--yell=loud`` or ``--yell loud`` work). Options can also be configured to
     accept an array of values.
 
 For example, add a new option to the command that can be used to specify
diff --git a/cookbook/form/form_customization.rst b/cookbook/form/form_customization.rst
@@ -502,7 +502,8 @@ resource to use such a layout:
         # app/config/config.yml
         twig:
             form:
-                resources: ['form_table_layout.html.twig']
+                resources:
+                    - 'form_table_layout.html.twig'
             # ...
 
     .. code-block:: xml
