Merge branch '5.4' into 6.0

* 5.4:
  [Mailer] Remove some duplicated contents

Author: javiereguiluz

reference/configuration/framework.rst

@@ -2620,22 +2620,15 @@ metadata of the class. You can define an array of strings with the names of
 several methods. In that case, all of them will be called in that order to load
 the metadata.
 
+.. _reference-validation-email_validation_mode:
+
 email_validation_mode
 .....................
 
 **type**: ``string`` **default**: ``loose``
 
-Sets the default value for
-:doc:`/reference/constraints/Email` validator. The possible values are:
-
-* ``loose``, it uses a simple regular expression to validate the address (it
-  checks that at least one ``@`` character is present, etc.). This validation is
-  too simple and it's recommended to use the ``html5`` validation instead;
-* ``html5``, it validates email addresses using the same regular expression
-  defined in the HTML5 standard, making the backend validation consistent with
-  the one provided by browsers;
-* ``strict``, it uses the `egulias/email-validator`_ library (which you must
-  install separately) to validate the addresses according to the `RFC 5322`_.
+Sets the default value for the
+:ref:`mode option of the Email validator <reference-constraint-email-mode>`.
 
 .. _reference-validation-mapping:
 
@@ -3506,8 +3499,6 @@ to know their differences.
 
 .. _`HTTP Host header attacks`: https://www.skeletonscribe.net/2013/05/practical-http-host-header-attacks.html
 .. _`Security Advisory Blog post`: https://symfony.com/blog/security-releases-symfony-2-0-24-2-1-12-2-2-5-and-2-3-3-released#cve-2013-4752-request-gethost-poisoning
-.. _`egulias/email-validator`: https://github.com/egulias/EmailValidator
-.. _`RFC 5322`: https://tools.ietf.org/html/rfc5322
 .. _`PhpStormProtocol`: https://github.com/aik099/PhpStormProtocol
 .. _`phpstorm-url-handler`: https://github.com/sanduhrs/phpstorm-url-handler
 .. _`blue/green deployment`: https://martinfowler.com/bliki/BlueGreenDeployment.html

reference/constraints/Email.rst

@@ -119,34 +119,28 @@ Parameter        Description
 ``{{ label }}``  Corresponding form field label
 ===============  ==============================================================
 
+.. _reference-constraint-email-mode:
+
 ``mode``
 ~~~~~~~~
 
-**type**: ``string`` **default**: ``loose``
-
-This option is optional and defines the pattern the email address is validated against.
-Valid values are:
-
-* ``loose``
-* ``strict``
-* ``html5``
-
-``loose``
-.........
-
-A simple regular expression. Allows all values with an "@" symbol in, and a "."
-in the second host part of the email address.
-
-``strict``
-..........
+**type**: ``string`` **default**: (see below)
 
-Uses the `egulias/email-validator`_ library to perform an RFC compliant
-validation. You will need to install that library to use this mode.
+This option is optional and defines the pattern used to validate the email
+address. Valid values are:
 
-``html5``
-.........
+* ``loose``, it uses a simple regular expression to validate the address (it
+  checks that at least one ``@`` character is present, etc.). This validation is
+  too simple and it's recommended to use the ``html5`` validation instead;
+* ``html5``, it validates email addresses using the same regular expression
+  as the `HTML5 email input element`_, making the backend validation consistent
+  with the one provided by browsers;
+* ``strict``, it uses the `egulias/email-validator`_ library (which you must
+  install separately) to validate the addresses according to the `RFC 5322`_.
 
-This matches the pattern used for the `HTML5 email input element`_.
+The default value used by this option is set in the
+:ref:`framework.validation.email_validation_mode <reference-validation-email_validation_mode>`
+configuration option.
 
 .. include:: /reference/constraints/_normalizer-option.rst.inc