Merge branch '5.2' into 5.x

* 5.2:
  [#14589] Reworded form error messages paragraph
  [Form] Fixed the layout in the forms page by moving the configuration tabs outside the versionadded block.

Author: wouterj

forms.rst

@@ -560,46 +560,51 @@ To see the second approach - adding constraints to the form - and to
 learn more about the validation constraints, please refer to the
 :doc:`Symfony validation documentation </validation>`.
 
+Form Validation Messages
+~~~~~~~~~~~~~~~~~~~~~~~~
+
 .. versionadded:: 5.2
 
-    In Symfony 5.2, the form validation messages have been rewritten to be more
-    user-friendly. Set the ``legacy_error_messages`` option to ``false`` to
-    enable these new messages:
+    The ``legacy_error_messages`` option was introduced in Symfony 5.2
 
-    .. configuration-block::
+The form types have default error messages that are more clear and
+user-friendly than the ones provided by the validation constraints. To enable
+these new messages set the ``legacy_error_messages`` option to ``false``:
+
+.. configuration-block::
 
-        .. code-block:: yaml
+    .. code-block:: yaml
 
-            # config/packages/framework.yaml
-            framework:
-                form:
-                    legacy_error_messages: false
+        # config/packages/framework.yaml
+        framework:
+            form:
+                legacy_error_messages: false
 
-        .. code-block:: xml
+    .. code-block:: xml
 
-            <!-- config/packages/framework.xml -->
-            <?xml version="1.0" encoding="UTF-8" ?>
-            <container xmlns="http://symfony.com/schema/dic/services"
-                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                xmlns:framework="http://symfony.com/schema/dic/symfony"
-                xsi:schemaLocation="http://symfony.com/schema/dic/services
-                    https://symfony.com/schema/dic/services/services-1.0.xsd
-                    http://symfony.com/schema/dic/symfony
-                    https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+        <!-- config/packages/framework.xml -->
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:framework="http://symfony.com/schema/dic/symfony"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                https://symfony.com/schema/dic/services/services-1.0.xsd
+                http://symfony.com/schema/dic/symfony
+                https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
-                <framework:config>
-                    <framework:form legacy-error-messages="false"/>
-                </framework:config>
-            </container>
+            <framework:config>
+                <framework:form legacy-error-messages="false"/>
+            </framework:config>
+        </container>
 
-        .. code-block:: php
+    .. code-block:: php
 
-            // config/packages/framework.php
-            $container->loadFromExtension('framework', [
-                'form' => [
-                    'legacy-error-messages' => false,
-                ],
-            ]);
+        // config/packages/framework.php
+        $container->loadFromExtension('framework', [
+            'form' => [
+                'legacy_error_messages' => false,
+            ],
+        ]);
 
 Other Common Form Features
 --------------------------