Minor format improvements

Author: Cydonia7

book/controller.rst

@@ -459,7 +459,10 @@ perform a 301 (permanent) redirect, modify the second argument::
 
         return new RedirectResponse($this->generateUrl('homepage'));
 
-    You can also directly use ``redirectToRoute()`` and give it directly the route name like :
+.. versionadded:: 2.6
+    You can also directly use 
+    :method:`Symfony\\Bundle\\FrameworkBundle\\Controller::redirectToRoute``
+    and give it directly the route name like :
 
         return $this->redirectToRoute('homepage');
 
@@ -642,10 +645,9 @@ After processing the request, the controller sets a ``notice`` flash message
 in the session and then redirects. The name (``notice``) isn't significant -
 it's just something you invent and reference next.
 
-.. tip::
-
-    You can use the ``addFlash()`` method as a shortcut to
-    ``$this->get('session')->getFlashBag()->add()``.
+.. versionadded:: 2.6
+    You can use the :method:`Symfony\\Bundle\\FrameworkBundle\\Controller::addFlash``
+    method as a shortcut to ``$this->get('session')->getFlashBag()->add(...)``.
 
 In the template of the next action, the following code could be used to render
 the ``notice`` message:

book/security.rst

@@ -804,6 +804,17 @@ the ``^``) would match ``/admin/foo`` but would also match URLs like ``/foo/admi
 
 .. _`book-security-securing-controller`:
 
+
+Securing other Services
+~~~~~~~~~~~~~~~~~~~~~~~
+
+In fact, anything in Symfony can be protected using a strategy similar to
+the one seen in the previous section. For example, suppose you have a service
+(i.e. a PHP class) whose job is to send emails from one user to another.
+You can restrict use of this class - no matter where it's being used from -
+to users that have a specific role.
+>>>>>>> Minor format improvements
+
 Securing Controllers and other Code
 ...................................
 
@@ -813,8 +824,8 @@ You can easily deny access from inside a controller::
 
     public function helloAction($name)
     {
-        if (false === $this->get('security.authorization_checker')->isGranted('ROLE_ADMIN')) {
-            throw $this->createAccessDeniedException();
+        if (false === $this->get('security.context')->isGranted('ROLE_ADMIN')) {
+            throw $this->createAccessDeniedException('Unable to access this page!');
         }
 
         // ...
@@ -831,6 +842,12 @@ The :method:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller::createAcc
 method creates a special :class:`Symfony\\Component\\Security\\Core\\Exception\\AccessDeniedException`
 object, which ultimately triggers a 403 HTTP response inside Symfony.
 
+.. versionadded:: 2.6
+    You can use directly `$this->isGranted($role)` instead of 
+    `$this->get('security.context')->isGranted($role)` to check if 
+    a role is granted and `denyAccessUnlessGranted` to throw an exception
+    if the access is not granted (like in the example above).
+
 That's it! If the user isn't logged in yet, they will be asked to login (e.g.
 redirected to the login page). If they *are* logged in, they'll be shown
 the 403 access denied page (which you can :ref:`customize <cookbook-error-pages-by-status-code>`).