Merge branch '6.2' into 6.3

* 6.2:
  [Config] Introducing the new `param()` function as early as possible
  [Lock] Add Redis Secure DSN example

Author: javiereguiluz

configuration.rst

@@ -309,8 +309,6 @@ configuration file using a special syntax: wrap the parameter name in two ``%``
             # any string surrounded by two % is replaced by that parameter value
             email_address: '%app.admin_email%'
 
-            # ...
-
     .. code-block:: xml
 
         <!-- config/packages/some_package.xml -->
@@ -333,13 +331,17 @@ configuration file using a special syntax: wrap the parameter name in two ``%``
 
         // config/packages/some_package.php
         namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+        use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
 
         return static function (ContainerConfigurator $container): void {
             $container->extension('some_package', [
-                // any string surrounded by two % is replaced by that parameter value
-                'email_address' => '%app.admin_email%',
+                // when using the param() function, you only have to pass the parameter name...
+                'email_address' => param('app.admin_email'),
 
-                // ...
+                // ... but if you prefer it, you can also pass the name as a string
+                // surrounded by two % (same as in YAML and XML formats) and Symfony will
+                // replace it by that parameter value
+                'email_address' => '%app.admin_email%',
             ]);
         };
 

lock.rst

@@ -50,6 +50,7 @@ this behavior by using the ``lock`` key like:
             lock: ['memcached://m1.docker', 'memcached://m2.docker']
             lock: 'redis://r1.docker'
             lock: ['redis://r1.docker', 'redis://r2.docker']
+            lock: 'rediss://r1.docker?ssl[verify_peer]=1&ssl[cafile]=...'
             lock: 'zookeeper://z1.docker'
             lock: 'zookeeper://z1.docker,z2.docker'
             lock: 'zookeeper://localhost01,localhost02:2181'