Merge branch '5.0'

* 5.0:
  Update email.rst
  minor to fix syntax. #13018
  Fix dead anchor links

Author: OskarStark

email.rst

@@ -408,8 +408,8 @@ the report with details of the sent emails.
 .. tip::
 
     In addition to the features provided by Symfony, there are applications that
-    can help you test emails during application development, like `MailCatcher`_
-    and `MailHog`_.
+    can help you test emails during application development, like `MailCatcher`_,
+    `Mailtrap`_ and `MailHog`_.
 
 How to Spool Emails
 -------------------
@@ -656,6 +656,7 @@ redirected page and the email won't be accessible.
 
 .. _`MailCatcher`: https://github.com/sj26/mailcatcher
 .. _`MailHog`: https://github.com/mailhog/MailHog
+.. _`Mailtrap`: https://mailtrap.io/
 .. _`Swift Mailer`: http://swiftmailer.org/
 .. _`SwiftMailerBundle`: https://github.com/symfony/swiftmailer-bundle
 .. _`Creating Messages`: https://swiftmailer.symfony.com/docs/messages.html

security/password_migration.rst

@@ -123,16 +123,18 @@ Upgrade the Password
 Upon successful login, the Security system checks whether a better algorithm
 is available to hash the user's password. If it is, it'll hash the correct
 password using the new hash. If you use a Guard authenticator, you first need to
-`provide the original password to the Security system <Provide the Password when using Guard>`_.
+:ref:`provide the original password to the Security system <provide-the-password-guard>`.
 
 You can enable the upgrade behavior by implementing how this newly hashed
 password should be stored:
 
-* `When using Doctrine's entity user provider <Upgrade the Password when using Doctrine>`_
-* `When using a custom user provider <Upgrade the Password when using a custom User Provider>`_
+* :ref:`When using Doctrine's entity user provider <upgrade-the-password-doctrine>`
+* :ref:`When using a custom user provider <upgrade-the-password-custom-provider>`
 
 After this, you're done and passwords are always hashed as secure as possible!
 
+.. _provide-the-password-guard:
+
 Provide the Password when using Guard
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -157,6 +159,8 @@ for this login request. This password is used in the migration process::
         }
     }
 
+.. _upgrade-the-password-doctrine:
+
 Upgrade the Password when using Doctrine
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -186,6 +190,8 @@ storing the newly created password hash::
         }
     }
 
+.. _upgrade-the-password-custom-provider:
+
 Upgrade the Password when using a Custom User Provider
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~