tweaks

Author: weaverryan

console/command_in_controller.rst

@@ -21,7 +21,7 @@ their code. Instead, you can execute the command directly.
     overhead.
 
 Imagine you want to send spooled Swift Mailer messages by
-:doc:`using the swiftmailer:spool:send command </email/spool>`.
+:doc:`using the swiftmailer:spool:send command </email>`.
 Run this command from inside your controller via::
 
     // src/Controller/SpoolController.php

email.rst

@@ -4,9 +4,9 @@
 Swift Mailer
 ============
 
-.. deprecated:: 4.3
-    Using Swift Mailer is no longer the recommended way to send emails in
-    Symfony. Instead, check out :doc:`Mailer </mailer>`.
+.. note::
+    In Symfony 4.3, the :doc:`Mailer </mailer>` component was introduced and can
+    be used instead of Swiftmailer.
 
 Symfony provides a mailer feature based on the popular `Swift Mailer`_ library
 via the `SwiftMailerBundle`_. This mailer supports sending messages with your

mailer.rst

@@ -2,19 +2,24 @@ Sending Emails with Mailer
 ==========================
 
 .. versionadded:: 4.3
-    The Mailer component was added in Symfony 4.3. Previously, Swift Mailer
-    was recommended. You can still :doc:`read its documentation</email/swiftmailer>`.
+    The Mailer component was added in Symfony 4.3. The previous solution - Swiftmailer -
+    is still valid: :doc:`Swiftmailer</email>`.
 
 Installation
 ------------
 
+.. caution::
+
+    The Mailer component is experimental in Symfony 4.3: some backwards compatibility
+    breaks could occur before 4.4.
+
 Symfony's Mailer component is a *powerful* way to send email - complete with
 support for multipart messages, Twig integration, CSS inlining, file attachments
 and a lot more. Install it with:
 
 .. code-block:: terminal
 
-    $ composer require mailer
+    $ composer require symfony/mailer
 
 Transport Setup
 ---------------
@@ -44,7 +49,7 @@ SendGrid            ``composer require symfony/sendgrid-mailer``
 Gmail               ``composer require symfony/google-mailer``
 ==================  =============================================
 
-Each library includes a :ref:`Flex recipe` that will add example configuration
+Each library includes a :ref:`Flex recipe <flex-recipe>` that will add example configuration
 to your ``.env`` file. For example, suppose you want to use SendGrid. First,
 install it:
 

reference/configuration/swiftmailer.rst

@@ -4,10 +4,6 @@
 Mailer Configuration Reference (SwiftmailerBundle)
 ==================================================
 
-.. deprecated:: 4.3
-    Using Swift Mailer is no longer the recommended way to send emails in
-    Symfony. Instead, check out :doc:`Mailer </mailer>`.
-
 The SwiftmailerBundle integrates the Swiftmailer library in Symfony applications
 to :doc:`send emails </email>`. All these options are configured under the
 ``swiftmailer`` key in your application configuration.
@@ -161,7 +157,7 @@ values are ``plain``, ``login``, ``cram-md5``, or ``null``.
 spool
 ~~~~~
 
-For details on email spooling, see :doc:`/email/spool`.
+For details on email spooling, see :doc:`/mailer`.
 
 type
 ....

setup/flex.rst

@@ -51,6 +51,8 @@ SwiftmailerBundle and returns the "recipe" for it.
 Flex keeps tracks of the recipes it installed in a ``symfony.lock`` file, which
 must be committed to your code repository.
 
+.. _flex-recipe:
+
 Symfony Flex Recipes
 ~~~~~~~~~~~~~~~~~~~~