Merge branch '3.4' into 4.3

* 3.4:
  [#12538] Changed AND to OR

Author: wouterj

security.rst

@@ -438,7 +438,7 @@ start with ``/admin``, you can:
                 # require ROLE_ADMIN for /admin*
                 - { path: '^/admin', roles: ROLE_ADMIN }
 
-                # or require ROLE_ADMIN and IS_AUTHENTICATED_FULLY for /admin*
+                # or require ROLE_ADMIN or IS_AUTHENTICATED_FULLY for /admin*
                 - { path: '^/admin', roles: [IS_AUTHENTICATED_FULLY, ROLE_ADMIN] }
 
                 # the 'path' value can be any valid regular expression
@@ -465,7 +465,7 @@ start with ``/admin``, you can:
                 <!-- require ROLE_ADMIN for /admin* -->
                 <rule path="^/admin" role="ROLE_ADMIN"/>
 
-                <!-- require ROLE_ADMIN and IS_AUTHENTICATED_FULLY for /admin* -->
+                <!-- require ROLE_ADMIN or IS_AUTHENTICATED_FULLY for /admin* -->
                 <rule path="^/admin">
                     <role>ROLE_ADMIN</role>
                     <role>IS_AUTHENTICATED_FULLY</role>
@@ -493,7 +493,7 @@ start with ``/admin``, you can:
                 // require ROLE_ADMIN for /admin*
                 ['path' => '^/admin', 'roles' => 'ROLE_ADMIN'],
 
-                // require ROLE_ADMIN and IS_AUTHENTICATED_FULLY for /admin*
+                // require ROLE_ADMIN or IS_AUTHENTICATED_FULLY for /admin*
                 ['path' => '^/admin', 'roles' => ['ROLE_ADMIN', 'IS_AUTHENTICATED_FULLY']],
 
                 // the 'path' value can be any valid regular expression