Merge branch '2.3' into 2.7

* 2.3:
  [#6191] fix build
  Document the invalidate_session option
  Docs do not match functionality
  fix MongoDB shell syntax highlighting
  Added the missing namespace in example of a subscriber class
  Typofix for "Defining and Processing Configuration Values"

Author: xabbuh

components/config/definition.rst

@@ -231,7 +231,7 @@ Or the following XML configuration:
 
 .. code-block:: xml
 
-    <driver>msyql</driver>
+    <driver>mysql</driver>
     <driver>sqlite</driver>
 
 The processed configuration is::
@@ -334,7 +334,7 @@ In order to maintain the array keys use the ``useAttributeAsKey()`` method::
 
 The argument of this method (``name`` in the example above) defines the name of
 the attribute added to each XML node to differentiate them. Now you can use the
-same YAML configuration showed before or the following XML configuration:
+same YAML configuration shown before or the following XML configuration:
 
 .. code-block:: xml
 

components/event_dispatcher/introduction.rst

@@ -393,6 +393,7 @@ subscribes to the ``kernel.response`` and ``store.order`` events::
 
     use Symfony\Component\EventDispatcher\EventSubscriberInterface;
     use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+    use Acme\StoreBundle\Event\FilterOrderEvent;
 
     class StoreSubscriber implements EventSubscriberInterface
     {

cookbook/bundles/configuration.rst

@@ -294,8 +294,8 @@ The ``config:dump-reference`` command dumps the default configuration of a
 bundle in the console using the Yaml format.
 
 As long as your bundle's configuration is located in the standard location
-(``YourBundle\DependencyInjection\Configuration``) and does not require
-arguments to be passed to the constructor it will work automatically. If you
+(``YourBundle\DependencyInjection\Configuration``) and does not have
+a constructor it will work automatically. If you
 have something different, your ``Extension`` class must override the
 :method:`Extension::getConfiguration() <Symfony\\Component\\HttpKernel\\DependencyInjection\\Extension::getConfiguration>`
 method and return an instance of your ``Configuration``.

cookbook/doctrine/mongodb_session_storage.rst

@@ -162,7 +162,7 @@ Because MongoDB uses dynamic collection schemas, you do not need to do anything
 session collection. However, you may want to add an index to improve garbage collection performance.
 From the `MongoDB shell`_:
 
-.. code-block:: text
+.. code-block:: javascript
 
     use session_db
     db.session.ensureIndex( { "expires_at": 1 }, { expireAfterSeconds: 0 } )

reference/configuration/security.rst

@@ -325,6 +325,22 @@ Redirecting after Login
 
 .. _reference-security-pbkdf2:
 
+Logout Configuration
+--------------------
+
+invalidate_session
+~~~~~~~~~~~~~~~~~~
+
+**type**: ``boolean`` **default**: ``true``
+
+By default, when users log out from any firewall, their sessions are invalidated.
+This means that logging out from one firewall automatically logs them out from
+all the other firewalls.
+
+The ``invalidate_session`` option allows to redefine this behavior. Set this
+option to ``false`` in every firewall and the user will only be logged out from
+the current firewall and not the other ones.
+
 Using the PBKDF2 Encoder: Security and Speed
 --------------------------------------------