Merge branch '6.4' into 7.0

* 6.4:
  [DotEnv] Update configuration.rst
  Revert "[AssetMapper] Fixing path"

Author: OskarStark

configuration.rst

@@ -1063,7 +1063,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:

frontend/asset_mapper.rst

@@ -850,7 +850,7 @@ file:
         asset_mapper:
             paths:
                 - assets/
-                - vendor/babdev/pagerfanta-bundle/Resources/public/css/
+                - vendor/some/package/assets
 
 Then try the command again.
 

mailer.rst

@@ -1437,6 +1437,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

@@ -2847,6 +2847,8 @@ annotation changes). For performance reasons, it is recommended to disable
 debug mode in production, which will happen automatically if you use the
 default value.
 
+.. _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
 --------------------------