Merge branch '2.3' into 2.7

Author: wouterj

cookbook/controller/error_pages.rst

@@ -273,7 +273,56 @@ will be passed two parameters:
 Instead of creating a new exception controller from scratch you can, of course,
 also extend the default :class:`Symfony\\Bundle\\TwigBundle\\Controller\\ExceptionController`.
 In that case, you might want to override one or both of the ``showAction()`` and
-``findTemplate()`` methods. The latter one locates the template to be used.
+``findTemplate()`` methods. The latter one locates the template to be used. 
+
+.. note::
+  
+    In case of extending the
+    :class:`Symfony\\Bundle\\TwigBundle\\Controller\\ExceptionController` you
+    may configure a service to pass the Twig environment and the ``debug`` flag
+    to the constructor. 
+    
+    .. configuration-block::
+    
+        .. code-block:: yaml
+    
+            # app/config/services.yml
+            services:
+                app.exception_controller:
+                class: AppBundle\CustomExceptionController
+                arguments: ['@twig', '%kernel.debug%']
+
+        .. code-block:: xml
+
+            <!-- app/config/services.xml -->
+            <?xml version="1.0" encoding="utf-8" ?>
+            <container xmlns="http://symfony.com/schema/dic/services"
+                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+            >
+                <services>
+                    <service id="app.exception_controller"
+                        class="AppBundle\Controller\CustomExceptionController"
+                    >
+                        <argument type="service" id="twig"/>
+                        <argument>%kernel.debug%</argument>
+                    </service>
+                </services>
+            </container>
+
+        .. code-block:: php
+
+            // app/config/services.php
+            use Symfony\Component\DependencyInjection\Reference;
+            use Symfony\Component\DependencyInjection\Definition;
+
+            $definition = new Definition('AppBundle\Controller\CustomExceptionController', array(
+                new Reference('twig'),
+                '%kernel.debug%'
+            ));
+
+    And then configure ``twig.exception_controller`` using the controller as
+    services syntax (e.g. ``app.exception_controller:showAction``).
 
 .. tip::
 

cookbook/email/gmail.rst

@@ -129,7 +129,7 @@ that you `allow less secure apps to access your Gmail account`_.
 
 .. seealso::
 
-    see the :doc:`Swiftmailer configuration reference </reference/configuration/swiftmailer>`
+    See the :doc:`Swiftmailer configuration reference </reference/configuration/swiftmailer>`
     for more details.
 
 .. _`generate an App password`: https://support.google.com/accounts/answer/185833

reference/forms/types/button.rst

@@ -5,7 +5,7 @@ button Field Type
 =================
 
 .. versionadded:: 2.3
-    The ``button`` type was introduced in Symfony 2.3
+    The ``button`` type was introduced in Symfony 2.3.
 
 A simple, non-responsive button.
 

reference/forms/types/reset.rst

@@ -5,7 +5,7 @@ reset Field Type
 ================
 
 .. versionadded:: 2.3
-    The ``reset`` type was introduced in Symfony 2.3
+    The ``reset`` type was introduced in Symfony 2.3.
 
 A button that resets all fields to their original values.
 

reference/forms/types/submit.rst

@@ -5,7 +5,7 @@ submit Field Type
 =================
 
 .. versionadded:: 2.3
-    The ``submit`` type was introduced in Symfony 2.3
+    The ``submit`` type was introduced in Symfony 2.3.
 
 A submit button.