Merge branch '2.3' into 2.7

Author: wouterj

Diff for: cookbook/bundles/configuration.rst

@@ -75,7 +75,7 @@ bundle configuration would look like:
         acme_social:
             twitter:
                 client_id: 123
-                client_secret: $ecret
+                client_secret: your_secret
 
     .. code-block:: xml
 
@@ -88,7 +88,7 @@ bundle configuration would look like:
                 http://symfony.com/schema/dic/services/services-1.0.xsd">
 
            <acme-social:config>
-               <twitter client-id="123" client-secret="$ecret" />
+               <twitter client-id="123" client-secret="your_secret" />
            </acme-social:config>
 
            <!-- ... -->
@@ -99,7 +99,7 @@ bundle configuration would look like:
         // app/config/config.php
         $container->loadFromExtension('acme_social', array(
             'client_id'     => 123,
-            'client_secret' => '$ecret',
+            'client_secret' => 'your_secret',
         ));
 
 .. seealso::
@@ -139,7 +139,7 @@ For the configuration example in the previous section, the array passed to your
         array(
             'twitter' => array(
                 'client_id' => 123,
-                'client_secret' => '$ecret',
+                'client_secret' => '$secret',
             ),
         ),
     )

Diff for: cookbook/controller/error_pages.rst

@@ -289,8 +289,8 @@ In that case, you might want to override one or both of the ``showAction()`` and
             # app/config/services.yml
             services:
                 app.exception_controller:
-                class: AppBundle\Controller\CustomExceptionController
-                arguments: ['@twig', '%kernel.debug%']
+                    class: AppBundle\Controller\CustomExceptionController
+                    arguments: ['@twig', '%kernel.debug%']
 
         .. code-block:: xml