Merge branch '4.3' into 4.4

* 4.3:
  Fixed minor issues

Author: javiereguiluz

security/access_control.rst

@@ -64,7 +64,7 @@ Take the following ``access_control`` entries as an example:
                 <rule path="^/admin" role="ROLE_USER_HOST" host="symfony\.com$"/>
                 <rule path="^/admin" role="ROLE_USER_METHOD" methods="POST, PUT"/>
                 <!-- when defining multiple roles, users must have at least one of them (it's like an OR condition) -->
-                <rule path="^/admin" roles="ROLE_ADMIN, ROLE_MANAGER" />
+                <rule path="^/admin" roles="ROLE_ADMIN, ROLE_MANAGER"/>
             </config>
         </srv:container>
 
@@ -309,7 +309,7 @@ key:
                      access is granted if the expression is TRUE or the user has ROLE_ADMIN -->
                 <rule path="^/_internal/secure"
                     role="ROLE_ADMIN"
-                    allow-if="'127.0.0.1' == request.getClientIp() or request.header.has('X-Secure-Access')" />
+                    allow-if="'127.0.0.1' == request.getClientIp() or request.header.has('X-Secure-Access')"/>
             </config>
         </srv:container>
 

security/form_login_setup.rst

@@ -457,6 +457,3 @@ As routing is done *before* security, 404 error pages are not covered by
 any firewall. This means you can't check for security or even access the
 user object on these pages. See :doc:`/controller/error_pages`
 for more details.
-
-.. _`FOSUserBundle`: https://github.com/FriendsOfSymfony/FOSUserBundle
->>>>>>> 3.4