Merge branch '4.4' into 5.1

* 4.4:
  [#13980] add route name
  ADD Annotations for The Locale and the URL section
  Fix HttpClientInterface path in HttpClient documentation
  Removed Mailer component docs

Author: wouterj

_build/conf.py

@@ -127,7 +127,8 @@
     'rst': 'reStructuredText',
     'varnish2': 'Varnish 2',
     'varnish3': 'Varnish 3',
-    'varnish4': 'Varnish 4'
+    'varnish4': 'Varnish 4',
+    'env': '.env'
 }
 
 # don't enable Sphinx Domains

_build/redirection_map

@@ -507,3 +507,4 @@
 /components/class_loader https://github.com/symfony/class-loader
 /frontend/encore/versus-assetic /frontend
 /components/http_client /http_client
+/components/mailer /mailer

components/mailer.rst

@@ -212,7 +212,7 @@ Your own Sender
 Imagine that you already have an ``ImportantAction`` message going through the
 message bus and being handled by a handler. Now, you also want to send this
 message as an email (using the :doc:`Mime </components/mime>` and
-:doc:`Mailer </components/mailer>` components).
+:doc:`Mailer </mailer>` components).
 
 Using the :class:`Symfony\\Component\\Messenger\\Transport\\Sender\\SenderInterface`,
 you can create your own message sender::

components/messenger.rst

@@ -57,11 +57,7 @@ methods to compose the entire email message::
     ;
 
 This only purpose of this component is to create the email messages. Use the
-:doc:`Mailer component </components/mailer>` to actually send them. In Symfony
-applications, it's easier to use the :doc:`Mailer integration </mailer>`.
-
-Most of the details about how to create Email objects, including Twig integration,
-can be found in the :doc:`Mailer documentation </mailer>`.
+:doc:`Mailer component </mailer>` to actually send them.
 
 Twig Integration
 ----------------

components/mime.rst

@@ -22,13 +22,13 @@ Basic Usage
 Use the :class:`Symfony\\Component\\HttpClient\\HttpClient` class to make
 requests. In the Symfony framework, this class is available as the
 ``http_client`` service. This service will be :doc:`autowired </service_container/autowiring>`
-automatically when type-hinting for :class:`Symfony\\Component\\HttpClient\\HttpClientInterface`:
+automatically when type-hinting for :class:`Symfony\\Contracts\\HttpClient\\HttpClientInterface`:
 
 .. configuration-block::
 
     .. code-block:: php-symfony
 
-        use Symfony\Component\HttpClient\HttpClientInterface;
+        use Symfony\Contracts\HttpClient\HttpClientInterface;
 
         class SymfonyDocs
         {