Merge branch '6.3' into 6.4

* 6.3:
  [DotEnv] Update configuration.rst

configuration.rst

@@ -1083,7 +1083,7 @@ already existing ``.env`` files).
         # .env (or .env.local)
         APP_ENV=prod
 
-        # .env.prod (or .env.local.prod) - this will fallback on the loaders you defined
+        # .env.prod (or .env.prod.local) - this will fallback on the loaders you defined
         APP_ENV=
 
 .. _configuration-accessing-parameters:

mailer.rst

@@ -1494,6 +1494,13 @@ render the email before calling ``$mailer->send($email)``::
 
         $mailer->send($email);
     }
+<<<<<<< HEAD
+=======
+=======
+Thanks to this, instead of being delivered immediately, messages will be sent to
+the transport to be handled later (see :ref:`messenger-worker`).
+>>>>>>> 5.4
+>>>>>>> 6.3
 
 You can configure which bus is used to dispatch the message using the ``message_bus`` option.
 You can also set this to ``false`` to call the Mailer transport directly and

reference/configuration/framework.rst

@@ -2933,30 +2933,6 @@ annotation changes). For performance reasons, it is recommended to disable
 debug mode in production, which will happen automatically if you use the
 default value.
 
-secrets
-~~~~~~~
-
-decryption_env_var
-..................
-
-**type**: ``string`` **default**: ``base64:default::SYMFONY_DECRYPTION_SECRET``
-
-The environment variable that contains the decryption key.
-
-local_dotenv_file
-.................
-
-**type**: ``string`` **default**: ``%kernel.project_dir%/.env.%kernel.environment%.local``
-
-Path to an dotenv file that holds secrets. This is primarily used for testing.
-
-vault_directory
-...............
-
-**type**: ``string`` **default**: ``%kernel.project_dir%/config/secrets/%kernel.environment%``
-
-The directory where the vault of secrets is stored.
-
 .. _configuration-framework-serializer:
 
 serializer

serializer/custom_encoders.rst

@@ -46,6 +46,13 @@ create your own encoder that uses the
         }
     }
 
+.. tip::
+
+    If you need access to ``$context`` in your ``supportsDecoding`` or
+    ``supportsEncoding`` method, make sure to implement
+    ``Symfony\Component\Serializer\Encoder\ContextAwareDecoderInterface``
+    or ``Symfony\Component\Serializer\Encoder\ContextAwareEncoderInterface`` accordingly.
+
 Registering it in your app
 --------------------------