s Fixed versionadds based on feedback

Author: Iltar van der Berg

book/security.rst

@@ -1187,7 +1187,8 @@ authorization from inside a controller::
     The ``createAccessDeniedException`` method was introduced in Symfony 2.5.
 
 .. versionadded:: 2.6
-     Service ``security.authorization_checker`` replaces ``security.context`` for ``isGranted`` as of 2.6.
+     The ``security.authorization_checker`` service was introduced in Symfony 2.6. Prior
+     to Symfony 2.6, you had to use the ``isGranted()`` method of the ``security.context`` service.
 
 The :method:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller::createAccessDeniedException`
 method creates a special :class:`Symfony\\Component\\Security\\Core\\Exception\\AccessDeniedException`
@@ -1607,7 +1608,8 @@ look like::
     }
 
 .. versionadded:: 2.6
-     Service ``security.token_storage`` replaces ``security.context`` for ``getToken`` as of 2.6.
+    The ``security.token_storage`` service was introduced in Symfony 2.6. Prior
+    to Symfony 2.6, you had to use the ``getToken()`` method of the ``security.context`` service.
 
 In a controller this can be shortcut to:
 
@@ -1884,7 +1886,8 @@ authorization from inside a controller::
     }
 
 .. versionadded:: 2.6
-     Service ``security.authorization_checker`` replaces ``security.context`` for ``isGranted`` as of 2.6.
+     The ``security.authorization_checker`` service was introduced in Symfony 2.6. Prior
+     to Symfony 2.6, you had to use the ``isGranted()`` method of the ``security.context`` service.
 
 .. caution::
 
@@ -1919,7 +1922,8 @@ accepts an :class:`Symfony\\Component\\ExpressionLanguage\\Expression` object::
     }
 
 .. versionadded:: 2.6
-     Service ``security.authorization_checker`` replaces ``security.context`` for ``isGranted`` as of 2.6.
+    The ``security.authorization_checker`` service was introduced in Symfony 2.6. Prior
+    to Symfony 2.6, you had to use the ``isGranted()`` method of the ``security.context`` service.
 
 In this example, if the current user has ``ROLE_ADMIN`` or if the current
 user object's ``isSuperAdmin()`` method returns ``true``, then access will
@@ -1966,10 +1970,10 @@ Additionally, you have access to a number of functions inside the expression:
         use Symfony\Component\ExpressionLanguage\Expression;
         // ...
 
-        $ac = $this->get('security.authorization_checker');
-        $access1 = $ac->isGranted('IS_AUTHENTICATED_REMEMBERED');
+        $authorizationChecker = $this->get('security.authorization_checker');
+        $access1 = $authorizationChecker->isGranted('IS_AUTHENTICATED_REMEMBERED');
 
-        $access2 = $ac->isGranted(new Expression(
+        $access2 = $authorizationChecker->isGranted(new Expression(
             'is_remember_me() or is_fully_authenticated()'
         ));
 

book/templating.rst

@@ -1156,7 +1156,7 @@ automatically:
         <?php endif; ?>
 
 .. versionadded:: 2.6
-     The security context is deprecated as of 2.6 as the user is already available
+     The ``app.security`` is deprecated as of 2.6. The user is already available
      as ``app.user`` and ``is_granted()`` is registered as function.
 
 .. tip::

components/security/authentication.rst

@@ -10,7 +10,7 @@ firewall map is able to extract the user's credentials from the current
 a token, containing these credentials. The next thing the listener should
 do is ask the authentication manager to validate the given token, and return
 an *authenticated* token if the supplied credentials were found to be valid.
-The listener should then store the authenticated token in the token storage::
+The listener should then store the authenticated token using the token storage::
 
     use Symfony\Component\Security\Http\Firewall\ListenerInterface;
     use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
@@ -59,7 +59,9 @@ The listener should then store the authenticated token in the token storage::
     }
 
 .. versionadded:: 2.6
-     Class ``TokenStorage`` replaces ``SecurityContext`` for ``getToken`` as of 2.6.
+    The :class:`Symfony\\Component\\Security\\Core\\Authentication\\Token\\Storage\\TokenStorageInterface` was
+    introduced in Symfony 2.6. Prior, you had to use the ``getToken()`` method of
+    :class:`Symfony\\Component\\Security\\Core\\SecurityContextInterface`.
 
 .. note::
 

components/security/firewall.rst

@@ -31,9 +31,9 @@ certain action or resource of the application::
     }
 
 .. versionadded:: 2.6
-     The ``SecurityContext`` is deprecated of 2.6 and is replaced by the ``AuthorizationChecker``
-     and ``TokenStorage``.
-
+    As of Symfony 2.6, the :class:`Symfony\\Component\\Security\\Core\\SecurityContext` class was split 
+    in the :class:`Symfony\\Component\\Security\\Core\\Authentication\\Authorization\\AuthorizationChecker` and 
+    :class:`Symfony\\Component\\Security\\Core\\Authentication\\Token\\Storage\\TokenStorage` classes.
 
 .. note::
 

cookbook/form/dynamic_form_modification.rst

@@ -337,7 +337,9 @@ and fill in the listener logic::
     }
 
 .. versionadded:: 2.6
-     ``TokenStorageInterface`` replaces ``SecurityContext`` for ``getToken`` as of 2.6.
+    The :class:`Symfony\\Component\\Security\\Core\\Authentication\\Token\\Storage\\TokenStorageInterface` was
+    introduced in Symfony 2.6. Prior, you had to use the ``getToken()`` method of
+    :class:`Symfony\\Component\\Security\\Core\\SecurityContextInterface`.
 
 .. note::
 

cookbook/profiler/matchers.rst

@@ -90,7 +90,9 @@ something like::
     }
 
 .. versionadded:: 2.6
-     Class ``AuthorizationChecker`` replaces ``SecurityContext`` for ``isGranted`` as of 2.6.
+    The :class:`Symfony\\Component\\Security\\Core\\Authentication\\Authorization\\AuthorizationCheckerInterface` was
+    introduced in Symfony 2.6. Prior, you had to use the ``isGranted`` method of
+    :class:`Symfony\\Component\\Security\\Core\\SecurityContextInterface`.
 
 Then, you need to configure the service:
 
@@ -136,7 +138,8 @@ Then, you need to configure the service:
         );
 
 .. versionadded:: 2.6
-     Service ``security.authorization_checker`` replaces ``security.context`` for ``isGranted`` as of 2.6.
+    The ``security.authorization_checker`` service was introduced in Symfony 2.6. Prior
+    to Symfony 2.6, you had to use the ``isGranted()`` method of the ``security.context`` service.
 
 Now the service is registered, the only thing left to do is configure the
 profiler to use this service as the matcher:

cookbook/security/remember_me.rst

@@ -172,7 +172,8 @@ In the following example, the action is only allowed if the user has the
     }
 
 .. versionadded:: 2.6
-     Service ``security.authorization_checker`` replaces ``security.context`` for ``isGranted`` as of 2.6.
+    The ``security.authorization_checker`` service was introduced in Symfony 2.6. Prior
+    to Symfony 2.6, you had to use the ``isGranted()`` method of the ``security.context`` service.
 
 You can also choose to install and use the optional JMSSecurityExtraBundle_,
 which can secure your controller using annotations:

cookbook/security/securing_services.rst

@@ -22,7 +22,8 @@ and checking the current user's role::
     }
 
 .. versionadded:: 2.6
-     Service ``security.authorization_checker`` replaces ``security.context`` for ``isGranted`` as of 2.6.
+    The ``security.authorization_checker`` service was introduced in Symfony 2.6. Prior
+    to Symfony 2.6, you had to use the ``isGranted()`` method of the ``security.context`` service.
 
 You can also secure *any* service in a similar way by injecting the ``security.authorization_checker``
 service into it. For a general introduction to injecting dependencies into
@@ -189,7 +190,7 @@ the :ref:`sidebar <securing-services-annotations-sidebar>` below):
 
         $definition = new Definition(
             '%newsletter_manager.class%',
-            array(new Reference('...'))
+            // ...
         ));
         $definition->addTag('security.secure_service');
         $container->setDefinition('newsletter_manager', $definition);

cookbook/security/voters_data_permission.rst

@@ -222,6 +222,7 @@ from the authorization checker is called.
     }
 
 .. versionadded:: 2.6
-     Service ``security.authorization_checker`` replaces ``security.context`` for ``isGranted`` as of 2.6.
-     
+    The ``security.authorization_checker`` service was introduced in Symfony 2.6. Prior
+    to Symfony 2.6, you had to use the ``isGranted()`` method of the ``security.context`` service.
+
 It's that easy!