Merge branch '6.1' into 6.2

* 6.1:
  Fix path to bundle translations
  [Mailer] Update mailer.rst

Author: javiereguiluz

mailer.rst

@@ -330,7 +330,9 @@ and create an :class:`Symfony\\Component\\Mime\\Email` object::
         }
     }
 
-That's it! The message will be sent via the transport you configured.
+That's it! The message will be sent via the transport you configured. If the
+transport is configured to :ref:`send emails asynchronously <mailer-sending-messages-async>`,
+the message won't be actually sent until :doc:`a worker consumes it <messenger-worker>`.
 
 Email Addresses
 ~~~~~~~~~~~~~~~

translation.rst

@@ -485,7 +485,8 @@ Translation Resource/File Names and Locations
 Symfony looks for message files (i.e. translations) in the following default locations:
 
 * the ``translations/`` directory (at the root of the project);
-* the ``Resources/translations/`` directory inside of any bundle.
+* the ``translations/`` directory inside of any bundle (and also their
+  ``Resources/translations/`` directory, which is no longer recommended for bundles).
 
 The locations are listed here with the highest priority first. That is, you can
 override the translation messages of a bundle in the first directory.