Merge branch '3.4' into 4.1

* 3.4:
  fix RoleVoter behaviour description
  Add missing container argument for ServiceLocatorTagPass::register() call

Author: javiereguiluz

reference/twig_reference.rst

@@ -305,9 +305,8 @@ is_granted
     **type**: ``string``
 
 Returns ``true`` if the current user has the given role. If several roles are
-passed in an array, returns ``true`` if the user has all of them or at least one
-of them, depending on the value of this option:
-:ref:`security.access_decision_manager.strategy <security-voters-change-strategy>`.
+passed in an array, ``true`` is returned if the user has at least one of
+them.
 
 Optionally, an object can be passed to be used by the voter. More information
 can be found in :ref:`security-template`.

service_container/service_subscribers_locators.rst

@@ -375,7 +375,7 @@ will share identical locators amongst all the services referencing them::
             'logger' => new Reference('logger'),
         );
 
-        $myService->addArgument(ServiceLocatorTagPass::register($locateableServices));
+        $myService->addArgument(ServiceLocatorTagPass::register($container, $locateableServices));
     }
 
 .. _`Command pattern`: https://en.wikipedia.org/wiki/Command_pattern