Merge branch '6.3' into 6.4

* 6.3:
  [Routing] Update ignoreAttributes description
  Add hint about variables_order ini setting required
  Fix xml example for defaut-index-name for tagged service provider
  Removing 2 distracting scenarios

Author: javiereguiluz

configuration.rst

@@ -816,7 +816,9 @@ the right situation:
   but the overrides only apply to one environment.
 
 *Real* environment variables always win over env vars created by any of the
-``.env`` files.
+``.env`` files. This behavior depends on
+`variables_order <http://php.net/manual/en/ini.core.php#ini.variables-order>`_ to
+contain an ``E`` to expose the ``$_ENV`` superglobal.
 
 The ``.env`` and ``.env.<environment>`` files should be committed to the
 repository because they are the same for all developers and machines. However,

rate_limiter.rst

@@ -44,11 +44,11 @@ squares).
     <object data="_images/rate_limiter/fixed_window.svg" type="image/svg+xml"></object>
 
 Its main drawback is that resource usage is not evenly distributed in time and
-it can overload the server at the window edges. In the previous example,
+it can overload the server at the window edges. In this example,
 there were 6 accepted requests between 11:00 and 12:00.
 
 This is more significant with bigger limits. For instance, with 5,000 requests
-per hour, a user could make the 4,999 requests in the last minute of some
+per hour, a user could make 4,999 requests in the last minute of some
 hour and another 5,000 requests during the first minute of the next hour,
 making 9,999 requests in total in two minutes and possibly overloading the
 server. These periods of excessive usage are called "bursts".

routing.rst

@@ -1655,8 +1655,10 @@ Use the ``RedirectController`` to redirect to other routes and URLs:
                 # * for temporary redirects, it uses the 307 status code instead of 302
                 # * for permanent redirects, it uses the 308 status code instead of 301
                 keepRequestMethod: true
-                # add this to remove the original route attributes when redirecting
+                # add this to remove all original route attributes when redirecting
                 ignoreAttributes: true
+                # or specify which attributes to ignore:
+                # ignoreAttributes: ['offset', 'limit']
 
         legacy_doc:
             path: /legacy/doc

service_container/tags.rst

@@ -1088,7 +1088,7 @@ with the ``default_index_method`` attribute on the tagged argument:
                     <!-- use getIndex() instead of getDefaultIndexName() -->
                     <argument type="tagged_iterator"
                         tag="app.handler"
-                        default-index-method="someFunctionName"
+                        default-index-method="getIndex"
                     />
                 </service>
             </services>