Merge branch '4.4'

* 4.4:
  [Doctrine] Reword the intro of the main article
  rename SmtpEnvelope to Envelope
  Fix typo in configuration.rst

Author: javiereguiluz

components/mailer.rst

@@ -125,10 +125,10 @@ If you want to send emails asynchronously, install the :doc:`Messenger component
 
 Then, instantiate and pass a ``MessageBus`` as a second argument to ``Mailer``::
 
+    use Symfony\Component\Mailer\Envelope;
     use Symfony\Component\Mailer\Mailer;
     use Symfony\Component\Mailer\Messenger\MessageHandler;
     use Symfony\Component\Mailer\Messenger\SendEmailMessage;
-    use Symfony\Component\Mailer\SmtpEnvelope;
     use Symfony\Component\Mailer\Transport;
     use Symfony\Component\Messenger\Handler\HandlersLocator;
     use Symfony\Component\Messenger\MessageBus;
@@ -150,7 +150,7 @@ Then, instantiate and pass a ``MessageBus`` as a second argument to ``Mailer``::
     $mailer->send($email);
 
     // you can pass an optional Envelope
-    $mailer->send($email, new SmtpEnvelope(
+    $mailer->send($email, new Envelope(
         new Address('sender@example.com'),
         [
             new Address('recipient@example.com'),

configuration.rst

@@ -505,7 +505,7 @@ In order to define the actual values of env vars, Symfony proposes different
 solutions depending if the application is running in production or in your local
 development machine.
 
-Independent from the way you set environmnet variables, you may need to run the
+Independent from the way you set environment variables, you may need to run the
 ``debug:container`` command with the ``--env-vars`` option to verify that they
 are defined and have the expected values:
 

doctrine.rst

@@ -9,16 +9,18 @@ Databases and the Doctrine ORM
 
     Do you prefer video tutorials? Check out the `Doctrine screencast series`_.
 
-Symfony doesn't provide a component to work with the database, but it *does* provide
-tight integration with a third-party library called `Doctrine`_.
+Symfony provides all the tools you need to use databases in your applications
+thanks to `Doctrine`_, the best set of PHP libraries to work with databases.
+These tools support relational databases like MySQL and PostgreSQL and also
+NoSQL databases like MongoDB.
 
-.. note::
-
-    This article is all about using the Doctrine ORM. If you prefer to use raw
-    database queries, see the ":doc:`/doctrine/dbal`" article instead.
+Databases are a broad topic, so the documentation is divided in three articles:
 
-    You can also persist data to `MongoDB`_ using Doctrine ODM library. See the
-    "`DoctrineMongoDBBundle`_" documentation.
+* This article explains the recommended way to work with **relational databases**
+  in Symfony applications;
+* Read :doc:`this other article </doctrine/dbal>` if you need **low-level access**
+  to perform raw SQL queries to relational databases (similar to PHP's `PDO`_);
+* Read `DoctrineMongoDBBundle docs`_ if you are working with **MongoDB databases**.
 
 Installing Doctrine
 -------------------
@@ -869,12 +871,11 @@ Learn more
 
 .. _`Doctrine`: http://www.doctrine-project.org/
 .. _`RFC 3986`: https://www.ietf.org/rfc/rfc3986.txt
-.. _`MongoDB`: https://www.mongodb.org/
 .. _`Doctrine's Mapping Types documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html
 .. _`Query Builder`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/query-builder.html
 .. _`Doctrine Query Language`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/dql-doctrine-query-language.html
 .. _`Reserved SQL keywords documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html#quoting-reserved-words
-.. _`DoctrineMongoDBBundle`: https://symfony.com/doc/current/bundles/DoctrineMongoDBBundle/index.html
+.. _`DoctrineMongoDBBundle docs`: https://symfony.com/doc/current/bundles/DoctrineMongoDBBundle/index.html
 .. _`DoctrineFixturesBundle`: https://symfony.com/doc/current/bundles/DoctrineFixturesBundle/index.html
 .. _`Transactions and Concurrency`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/transactions-and-concurrency.html
 .. _`DoctrineMigrationsBundle`: https://github.com/doctrine/DoctrineMigrationsBundle
@@ -884,3 +885,4 @@ Learn more
 .. _`limit of 767 bytes for the index key prefix`: https://dev.mysql.com/doc/refman/5.6/en/innodb-restrictions.html
 .. _`Doctrine screencast series`: https://symfonycasts.com/screencast/symfony-doctrine
 .. _`API Platform`: https://api-platform.com/docs/core/validation/
+.. _`PDO`: https://php.net/pdo