Merge branch '3.4' into 4.1

* 3.4:
  Removed an unnecessary (and outdated) reference
  fix spacing

Author: javiereguiluz

configuration/external_parameters.rst

@@ -194,7 +194,7 @@ Symfony provides the following env var processors:
             parameters:
                 env(SECRET): 'some_secret'
             framework:
-               secret: '%env(string:SECRET)%'
+                secret: '%env(string:SECRET)%'
 
         .. code-block:: xml
 
@@ -234,7 +234,7 @@ Symfony provides the following env var processors:
             parameters:
                 env(HTTP_METHOD_OVERRIDE): 'true'
             framework:
-               http_method_override: '%env(bool:HTTP_METHOD_OVERRIDE)%'
+                http_method_override: '%env(bool:HTTP_METHOD_OVERRIDE)%'
 
         .. code-block:: xml
 
@@ -280,8 +280,8 @@ Symfony provides the following env var processors:
             parameters:
                 env(HEALTH_CHECK_METHOD): 'Symfony\Component\HttpFoundation\Request::METHOD_HEAD'
             security:
-               access_control:
-                 - { path: '^/health-check$', methods: '%env(const:HEALTH_CHECK_METHOD)%' }
+                access_control:
+                    - { path: '^/health-check$', methods: '%env(const:HEALTH_CHECK_METHOD)%' }
 
         .. code-block:: xml
 
@@ -330,7 +330,7 @@ Symfony provides the following env var processors:
             parameters:
                 env(TRUSTED_HOSTS): '["10.0.0.1", "10.0.0.2"]'
             framework:
-               trusted_hosts: '%env(json:TRUSTED_HOSTS)%'
+                trusted_hosts: '%env(json:TRUSTED_HOSTS)%'
 
         .. code-block:: xml
 

security/multiple_guard_authenticators.rst

@@ -78,9 +78,6 @@ This is how your security configuration can look in action:
             ),
         ));
 
-If your authenticators need separate providers, you will need to create a 
-:doc:`chain of user providers </security/multiple_user_providers>`.
-
 There is one limitation with this approach - you have to use exactly one entry point.
 
 Multiple Authenticators with Separate Entry Points