symfony
diff --git a/‎book/controller.rst
Copy file name to clipboardExpand all lines: book/controller.rst
+2-2Lines changed: 2 additions & 2 deletions b/‎book/controller.rst
Copy file name to clipboardExpand all lines: book/controller.rst
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎book/security.rst
Copy file name to clipboardExpand all lines: book/security.rst
+11-4Lines changed: 11 additions & 4 deletions b/‎book/security.rst
Copy file name to clipboardExpand all lines: book/security.rst
+11-4Lines changed: 11 additions & 4 deletions
@@ -461,7 +461,7 @@ perform a 301 (permanent) redirect, modify the second argument::
 
 .. versionadded:: 2.6
     You can also directly use 
-    :method:`Symfony\\Bundle\\FrameworkBundle\\Controller::redirectToRoute``
+    :method:`Symfony\\Bundle\\FrameworkBundle\\Controller::redirectToRoute`
     and give it directly the route name like :
 
         return $this->redirectToRoute('homepage');
@@ -646,7 +646,7 @@ in the session and then redirects. The name (``notice``) isn't significant -
 it's just something you invent and reference next.
 
 .. versionadded:: 2.6
-    You can use the :method:`Symfony\\Bundle\\FrameworkBundle\\Controller::addFlash``
+    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
 
@@ -802,9 +802,6 @@ the ``^``) would match ``/admin/foo`` but would also match URLs like ``/foo/admi
 
     To learn about all of this, see :doc:`/cookbook/security/access_control`.
 
-.. _`book-security-securing-controller`:
-
-
 Securing other Services
 ~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -813,11 +810,15 @@ 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
+
+.. _`book-security-securing-controller`:
 
 Securing Controllers and other Code
 ...................................
 
+Securing a Controller
+~~~~~~~~~~~~~~~~~~~~~
+
 You can easily deny access from inside a controller::
 
     // ...
@@ -835,6 +836,12 @@ You can easily deny access from inside a controller::
      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.
 
+.. versionadded:: 2.6
+    You can use directly :method:`Symfony\\Bundle\\FrameworkBundle\\Controller::isGranted`
+    instead of  `$this->get('security.context')->isGranted($role)` to check if 
+    a role is granted and :method:`Symfony\\Bundle\\FrameworkBundle\\Controller::denyAccessUnlessGranted`
+    to throw an exception if the access is not granted (like in the example above).
+
 .. versionadded:: 2.5
     The ``createAccessDeniedException`` method was introduced in Symfony 2.5.