symfony
diff --git a/‎book/security.rst
Copy file name to clipboardExpand all lines: book/security.rst
+7-21Lines changed: 7 additions & 21 deletions b/‎book/security.rst
Copy file name to clipboardExpand all lines: book/security.rst
+7-21Lines changed: 7 additions & 21 deletions
diff --git a/‎cookbook/expression/expressions.rst
Copy file name to clipboardExpand all lines: cookbook/expression/expressions.rst
+2-4Lines changed: 2 additions & 4 deletions b/‎cookbook/expression/expressions.rst
Copy file name to clipboardExpand all lines: cookbook/expression/expressions.rst
+2-4Lines changed: 2 additions & 4 deletions
@@ -802,33 +802,18 @@ 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`.
 
-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.
-
 .. _`book-security-securing-controller`:
 
 Securing Controllers and other Code
 ...................................
 
-You can easily deny access from inside a controller:
-
-.. versionadded:: 2.6
-    The ``denyAccessUnlessGranted()`` method was introduced in Symfony 2.6. Previously (and
-    still now), you could check access directly and throw the ``AccessDeniedException`` as shown
-    in the example below).
-
-.. code-block:: php
+You can easily deny access from inside a controller::
 
     // ...
 
     public function helloAction($name)
     {
+        // The second parameter is used to specify on what object the role is tested.
         $this->denyAccessUnlessGranted('ROLE_ADMIN', null, 'Unable to access this page!');
 
         // Old way :
@@ -839,6 +824,11 @@ You can easily deny access from inside a controller:
         // ...
     }
 
+.. versionadded:: 2.6
+    The ``denyAccessUnlessGranted()`` method was introduced in Symfony 2.6. Previously (and
+    still now), you could check access directly and throw the ``AccessDeniedException`` as shown
+    in the example above).
+
 In both cases, a special
 :class:`Symfony\\Component\\Security\\Core\\Exception\\AccessDeniedException`
 is thrown, which ultimately triggers a 403 HTTP response inside Symfony.
@@ -860,10 +850,6 @@ using annotations::
      */
     public function helloAction($name)
     {
-        $this->denyAccessUnlessGranted(new Expression(
-            '"ROLE_ADMIN" in roles or (user and user.isSuperAdmin())'
-        ));
-
         // ...
     }
 
 
@@ -33,11 +33,9 @@ accepts an :class:`Symfony\\Component\\ExpressionLanguage\\Expression` object::
 
     public function indexAction()
     {
-        if (!$this->get('security.authorization_checker')->isGranted(new Expression(
+        $this->denyAccessUnlessGranted(new Expression(
             '"ROLE_ADMIN" in roles or (user and user.isSuperAdmin())'
-        ))) {
-            throw $this->createAccessDeniedException();
-        }
+        ));
 
         // ...
     }
Original file line number	Diff line number	Diff line change
@@ -33,11 +33,9 @@ accepts an :class:`Symfony\\Component\\ExpressionLanguage\\Expression` object::
`33`	`33`
`34`	`34`	`public function indexAction()`
`35`	`35`	`{`
`36`		`- if (!$this->get('security.authorization_checker')->isGranted(new Expression(`
	`36`	`+ $this->denyAccessUnlessGranted(new Expression(`
`37`	`37`	`'"ROLE_ADMIN" in roles or (user and user.isSuperAdmin())'`
`38`		`- ))) {`
`39`		`- throw $this->createAccessDeniedException();`
`40`		`- }`
	`38`	`+ ));`
`41`	`39`
`42`	`40`	`// ...`
`43`	`41`	`}`