Merge branch '4.2'

* 4.2:
  Improved the explanation about the forward method
  Update email.rst

Author: javiereguiluz

controller/forwarding.rst

@@ -5,10 +5,14 @@ How to Forward Requests to another Controller
 =============================================
 
 Though not very common, you can also forward to another controller internally
-with the :method:`Symfony\\Bundle\\FrameworkBundle\\Controller\\AbstractController::forward`
-method. Instead of redirecting the user's browser, this makes an "internal"
-sub-request and calls the defined controller. The ``forward()`` method returns
-the :class:`Symfony\\Component\\HttpFoundation\\Response` object that is returned
+with the ``forward()`` method provided by the
+:class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\AbstractController` class
+(or :class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerTrait` if
+your controller doesn't extend from ``AbstractController``).
+
+Instead of redirecting the user's browser, this makes an "internal" sub-request
+and calls the defined controller. The ``forward()`` method returns the
+:class:`Symfony\\Component\\HttpFoundation\\Response` object that is returned
 from *that* controller::
 
     public function index($name)

doctrine.rst

@@ -50,10 +50,10 @@ The database connection information is stored as an environment variable called
 .. caution::
 
     If the username, password, host or database name contain any character considered
-    special in a URI (such as ``!``, ``@``, ``$``, ``#``, ``/``), you must encode them.
-    See `RFC 3986`_ for the full list of reserved characters or use the
-    :phpfunction:`urlencode` function to encode them. In this case you need to remove
-    the ``resolve:`` prefix in ``config/packages/doctrine.yaml`` to avoid errors:
+    special in a URI (such as ``+``, ``@``, ``$``, ``#``, ``/``, ``:``, ``*``, ``!``),
+    you must encode them. See `RFC 3986`_ for the full list of reserved characters or
+    use the :phpfunction:`urlencode` function to encode them. In this case you need to
+    remove the ``resolve:`` prefix in ``config/packages/doctrine.yaml`` to avoid errors:
     ``url: '%env(resolve:DATABASE_URL)%'``
 
 Now that your connection parameters are setup, Doctrine can create the ``db_name``
@@ -341,7 +341,7 @@ and save it!
 
     // ...
     use Symfony\Component\HttpFoundation\Response;
-    
+
     use App\Entity\Product;
 
     class ProductController extends AbstractController

email.rst

@@ -39,11 +39,16 @@ environment variable in the ``.env`` file:
     # use this to disable email delivery
     MAILER_URL=null://localhost
 
-    # use this to configure a traditional SMTP server (make sure to URL-encode the
-    # values of the username and password if they contain non-alphanumeric characters
-    # such as '+', '@', ':' and '*', which are reserved in URLs)
+    # use this to configure a traditional SMTP server
     MAILER_URL=smtp://localhost:25?encryption=ssl&auth_mode=login&username=&password=
 
+.. caution::
+
+    If the username, password or host contain any character considered special in a
+    URI (such as ``+``, ``@``, ``$``, ``#``, ``/``, ``:``, ``*``, ``!``), you must
+    encode them. See `RFC 3986`_ for the full list of reserved characters or use the
+    :phpfunction:`urlencode` function to encode them.
+
 Refer to the :doc:`SwiftMailer configuration reference </reference/configuration/swiftmailer>`
 for the detailed explanation of all the available config options.
 
@@ -171,3 +176,4 @@ Learn more
 .. _`Amazon SES`: http://aws.amazon.com/ses/
 .. _`generate an App password`: https://support.google.com/accounts/answer/185833
 .. _`allow less secure apps to access your Gmail account`: https://support.google.com/accounts/answer/6010255
+.. _`RFC 3986`: https://www.ietf.org/rfc/rfc3986.txt