Merge branch '6.1' into 6.2

* 6.1:
  [Cache] Update an argument name to make it consistent with other docs

Author: javiereguiluz

cache.rst

@@ -361,8 +361,8 @@ with either :class:`Symfony\\Contracts\\Cache\\CacheInterface` or
             // config/services.php
             namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
-            return function(ContainerConfigurator $container) {
-                $container->services()
+            return function(ContainerConfigurator $configurator) {
+                $configurator->services()
                     // ...
 
                     ->set('app.cache.adapter.redis')