Merge branch '2.8' into 3.0

symfony · Jan 11, 2016 · 2db6e18 · 2db6e18
2 parents 66b2469 + 84ded6c
commit 2db6e18
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/book/controller.rst b/book/controller.rst
@@ -806,7 +806,7 @@ Just like when creating a controller for a route, the order of the arguments of
 order of the arguments, Symfony will still pass the correct value to each
 variable.
 
-.. _checking-the-validity-of-a-csrf-token::
+.. _checking-the-validity-of-a-csrf-token:
 
 Validating a CSRF Token
 -----------------------

diff --git a/components/security/authentication.rst b/components/security/authentication.rst
@@ -274,14 +274,14 @@ Authentication Events
 
 The security component provides 4 related authentication events:
 
-===============================  ================================================  =========================================================================
+===============================  ================================================  ==============================================================================
 Name                             Event Constant                                    Argument Passed to the Listener
-===============================  ================================================  =========================================================================
-security.authentication.success  ``AuthenticationEvents::AUTHENTICATION_SUCCESS``  :class:`Symfony\Component\Security\Core\Event\AuthenticationEvent`
-security.authentication.failure  ``AuthenticationEvents::AUTHENTICATION_FAILURE``  :class:`Symfony\Component\Security\Core\Event\AuthenticationFailureEvent`
-security.interactive_login       ``SecurityEvents::INTERACTIVE_LOGIN``             :class:`Symfony\Component\Security\Http\Event\InteractiveLoginEvent`
-security.switch_user             ``SecurityEvents::SWITCH_USER``                   :class:`Symfony\Component\Security\Http\Event\SwitchUserEvent`
-===============================  ================================================  =========================================================================
+===============================  ================================================  ==============================================================================
+security.authentication.success  ``AuthenticationEvents::AUTHENTICATION_SUCCESS``  :class:`Symfony\\Component\\Security\\Core\\Event\\AuthenticationEvent`
+security.authentication.failure  ``AuthenticationEvents::AUTHENTICATION_FAILURE``  :class:`Symfony\\Component\\Security\\Core\\Event\\AuthenticationFailureEvent`
+security.interactive_login       ``SecurityEvents::INTERACTIVE_LOGIN``             :class:`Symfony\\Component\\Security\\Http\\Event\\InteractiveLoginEvent`
+security.switch_user             ``SecurityEvents::SWITCH_USER``                   :class:`Symfony\\Component\\Security\\Http\\Event\\SwitchUserEvent`
+===============================  ================================================  ==============================================================================
 
 Authentication Success and Failure Events
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/cookbook/assetic/_standard_edition_warning.inc b/cookbook/assetic/_standard_edition_warning.inc
@@ -1,5 +1,5 @@
 .. caution::
- 
+
     Starting from Symfony 2.8, Assetic is no longer included by default in the
     Symfony Standard Edition. Refer to :doc:`this article </cookbook/assetic/asset_management>`
     to learn how to install and enable Assetic in your Symfony application.