Merge branch '2.3' into 2.4

Author: weaverryan

book/routing.rst

@@ -1258,7 +1258,7 @@ route. With this information, any URL can easily be generated::
     :class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller`,
     you can use the
     :method:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller::generateUrl`
-    method, which call's the router service's
+    method, which calls the router service's
     :method:`Symfony\\Component\\Routing\\Router::generate` method.
 
 In an upcoming section, you'll learn how to generate URLs from inside templates.

book/security.rst

@@ -902,7 +902,7 @@ the trusted reverse proxy cache.
     does not restrict to a specific IP address. Instead, using the ``ip``
     key means that the ``access_control`` entry will only match this IP address,
     and users accessing it from a different IP address will continue down
-    the ``acces_control`` list.
+    the ``access_control`` list.
 
 Here is an example of how you might secure all ESI routes that start with a
 given prefix, ``/esi``, from outside access:
@@ -1653,7 +1653,7 @@ Roles
 
 The idea of a "role" is key to the authorization process. Each user is assigned
 a set of roles and then each resource requires one or more roles. If the user
-has the required roles, access is granted. Otherwise access is denied.
+has any one of the required roles, access is granted. Otherwise access is denied.
 
 Roles are pretty simple, and are basically strings that you can invent and
 use as needed (though roles are objects internally). For example, if you

reference/constraints/Valid.rst

@@ -34,7 +34,7 @@ an ``Address`` instance in the ``$address`` property.
 .. code-block:: php
 
     // src/Acme/HelloBundle/Entity/Author.php
-    namespace Amce\HelloBundle\Entity;
+    namespace Acme\HelloBundle\Entity;
 
     class Author
     {