Merge branch '6.0' into 6.1

* 6.0:
  fix a small grammar issue
  Upgrade Bootstrap 4 theme references to Bootstrap 5 theme

Author: javiereguiluz

contributing/code/core_team.rst

@@ -109,7 +109,7 @@ Symfony contributions:
 Core Membership Application
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-About once a year, the core team discuss the opportunity to invite new members.
+About once a year, the core team discusses the opportunity to invite new members.
 
 Core Membership Revocation
 ~~~~~~~~~~~~~~~~~~~~~~~~~~

form/form_customization.rst

@@ -258,7 +258,7 @@ Renders any errors for the given field.
 
 .. caution::
 
-    In the :ref:`error messages of Bootstrap 4 Form Theme <reference-forms-bootstrap4-error-messages>`,
+    In the :ref:`error messages of Bootstrap 5 Form Theme <reference-forms-bootstrap5-error-messages>`,
     ``form_errors()`` is already included in ``form_label()``.
 
 .. _reference-forms-twig-widget:

form/form_themes.rst

@@ -68,7 +68,7 @@ want to use another theme for all the forms of your app, configure it in the
 
         # config/packages/twig.yaml
         twig:
-            form_themes: ['bootstrap_4_horizontal_layout.html.twig']
+            form_themes: ['bootstrap_5_horizontal_layout.html.twig']
             # ...
 
     .. code-block:: xml
@@ -83,7 +83,7 @@ want to use another theme for all the forms of your app, configure it in the
                 http://symfony.com/schema/dic/twig https://symfony.com/schema/dic/twig/twig-1.0.xsd">
 
             <twig:config>
-                <twig:form-theme>bootstrap_4_horizontal_layout.html.twig</twig:form-theme>
+                <twig:form-theme>bootstrap_5_horizontal_layout.html.twig</twig:form-theme>
                 <!-- ... -->
             </twig:config>
         </container>
@@ -95,7 +95,7 @@ want to use another theme for all the forms of your app, configure it in the
 
         return static function (TwigConfig $twig) {
             $twig->formThemes([
-                'bootstrap_4_horizontal_layout.html.twig',
+                'bootstrap_5_horizontal_layout.html.twig',
             ]);
 
             // ...

forms.rst

@@ -316,16 +316,16 @@ suitable for being rendered in an HTML form.
 
 As short as this rendering is, it's not very flexible. Usually, you'll need more
 control about how the entire form or some of its fields look. For example, thanks
-to the :doc:`Bootstrap 4 integration with Symfony forms </form/bootstrap4>` you
-can set this option to generate forms compatible with the Bootstrap 4 CSS framework:
+to the :doc:`Bootstrap 5 integration with Symfony forms </form/bootstrap5>` you
+can set this option to generate forms compatible with the Bootstrap 5 CSS framework:
 
 .. configuration-block::
 
     .. code-block:: yaml
 
         # config/packages/twig.yaml
         twig:
-            form_themes: ['bootstrap_4_layout.html.twig']
+            form_themes: ['bootstrap_5_layout.html.twig']
 
     .. code-block:: xml
 
@@ -340,7 +340,7 @@ can set this option to generate forms compatible with the Bootstrap 4 CSS framew
                 https://symfony.com/schema/dic/twig/twig-1.0.xsd">
 
             <twig:config>
-                <twig:form-theme>bootstrap_4_layout.html.twig</twig:form-theme>
+                <twig:form-theme>bootstrap_5_layout.html.twig</twig:form-theme>
                 <!-- ... -->
             </twig:config>
         </container>
@@ -351,13 +351,13 @@ can set this option to generate forms compatible with the Bootstrap 4 CSS framew
         use Symfony\Config\TwigConfig;
 
         return static function (TwigConfig $twig) {
-            $twig->formThemes(['bootstrap_4_layout.html.twig']);
+            $twig->formThemes(['bootstrap_5_layout.html.twig']);
 
             // ...
         };
 
 The :ref:`built-in Symfony form themes <symfony-builtin-forms>` include
-Bootstrap 3 and 4 as well as Foundation 5 and 6. You can also
+Bootstrap 3, 4 and 5, Foundation 5 and 6, as well as Tailwind 2. You can also
 :ref:`create your own Symfony form theme <create-your-own-form-theme>`.
 
 In addition to form themes, Symfony allows you to

reference/configuration/twig.rst

@@ -182,7 +182,7 @@ all the forms of the application:
 
         # config/packages/twig.yaml
         twig:
-            form_themes: ['bootstrap_4_layout.html.twig', 'form/my_theme.html.twig']
+            form_themes: ['bootstrap_5_layout.html.twig', 'form/my_theme.html.twig']
             # ...
 
     .. code-block:: xml
@@ -197,7 +197,7 @@ all the forms of the application:
                 http://symfony.com/schema/dic/twig https://symfony.com/schema/dic/twig/twig-1.0.xsd">
 
             <twig:config>
-                <twig:form-theme>bootstrap_4_layout.html.twig</twig:form-theme>
+                <twig:form-theme>bootstrap_5_layout.html.twig</twig:form-theme>
                 <twig:form-theme>form/my_theme.html.twig</twig:form-theme>
                 <!-- ... -->
             </twig:config>
@@ -210,7 +210,7 @@ all the forms of the application:
 
         return static function (TwigConfig $twig) {
             $twig->formThemes([
-                'bootstrap_4_layout.html.twig',
+                'bootstrap_5_layout.html.twig',
                 'form/my_theme.html.twig',
             ]);