Merge branch '2.5' into 2.6

Conflicts:
	cookbook/form/form_customization.rst

Author: wouterj

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

cookbook/form/form_customization.rst

@@ -505,7 +505,8 @@ resource to use such a layout:
 
         # app/config/config.yml
         twig:
-            form_themes: ['form_table_layout.html.twig']
+            form_themes:
+                - 'form_table_layout.html.twig'
             # ...
 
     .. code-block:: xml