Merge branch '2.3' into 2.6

weaverryan · weaverryan · commit 92eecd3f68b2 · 2015-07-15T20:51:27.000-04:00
* 2.3: [#5453] Minor tweaks - mostly thanks to Javier
diff --git a/book/security.rst b/book/security.rst
@@ -994,7 +994,7 @@ other users. Also, as the admin user, you yourself want to be able to edit
 
 To accomplish this you have 2 options:
 
-* :doc:`Voters </cookbook/security/voters>` allow you to use business logic
+* :doc:`Voters </cookbook/security/voters>` allow you to write own business logic
   (e.g. the user can edit this post because they were the creator) to determine
   access. You'll probably want this option - it's flexible enough to solve the
   above situation.
diff --git a/cookbook/security/voters.rst b/cookbook/security/voters.rst
@@ -28,8 +28,9 @@ All voters are called each time you use the ``isGranted()`` method on Symfony's
 authorization checker (i.e. the ``security.authorization_checker`` service). Each
 one decides if the current user should have access to some resource.
 
-Ultimately, Symfony uses one of three different approaches on what to do
-with the feedback from all voters: affirmative, consensus and unanimous.
+Ultimately, Symfony takes the responses from all voters and makes the final
+decission (to allow or deny access to the resource) according to the strategy defined
+in the application, which can be: affirmative, consensus or unanimous.
 
 For more information take a look at
 :ref:`the section about access decision managers <components-security-access-decision-manager>`.
