Merge branch '6.0' into 6.1

* 6.0:
  Fix typos of the Dynamic Form Modification document
  [Form] Fix Bootstrap 5 section indentation
  Proper line numbers for a Basic Controller example
  remove form types from TOC that have been introduced in later versions

Author: xabbuh

controller.rst

@@ -59,10 +59,10 @@ This controller is pretty straightforward:
 * *line 7*: The class can technically be called anything, but it's suffixed
   with ``Controller`` by convention.
 
-* *line 12*: The action method is allowed to have a ``$max`` argument thanks to the
+* *line 10*: The action method is allowed to have a ``$max`` argument thanks to the
   ``{max}`` :doc:`wildcard in the route </routing>`.
 
-* *line 16*: The controller creates and returns a ``Response`` object.
+* *line 14*: The controller creates and returns a ``Response`` object.
 
 .. index::
    single: Controller; Routes and controllers

form/bootstrap5.rst

@@ -99,7 +99,7 @@ For a checkbox/radio field, calling ``form_label()`` doesn't render anything.
 Due to Bootstrap internals, the label is already rendered by ``form_widget()``.
 
 Inline Checkboxes and Radios
-----------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 If you want to render your checkbox or radio fields `inline`_, you can add
 the ``checkbox-inline`` or ``radio-inline`` class (depending on your Symfony
@@ -136,7 +136,7 @@ Form type or ``ChoiceType`` configuration) to the label class.
         }) }}
 
 Switches
-________
+~~~~~~~~
 
 Bootstrap 5 allows to render checkboxes as `switches`_. You can enable this
 feature on your Symfony Form ``CheckboxType`` by adding the ``checkbox-switch``
@@ -176,7 +176,7 @@ class to the label:
     Switches only work with **checkbox**.
 
 Input group
-___________
+-----------
 
 To create `input group`_ in your Symfony Form, simply add the ``input-group``
 class to the ``row_attr`` option.

form/dynamic_form_modification.rst

@@ -230,7 +230,7 @@ Using an event listener, your form might look like this::
     }
 
 The problem is now to get the current user and create a choice field that
-contains only this user's friends. This can be done injecting the ``Security``
+contains only this user's friends. This can be done by injecting the ``Security``
 service into the form type so you can get the current user object::
 
     use Symfony\Component\Security\Core\Security;
@@ -490,7 +490,7 @@ The type would now look like::
                     $sport = $event->getForm()->getData();
 
                     // since we've added the listener to the child, we'll have to pass on
-                    // the parent to the callback functions!
+                    // the parent to the callback function!
                     $formModifier($event->getForm()->getParent(), $sport);
                 }
             );
@@ -510,7 +510,7 @@ exactly the same things on a given form.
     the listener is bound to, but it allows modifications to its parent.
 
 One piece that is still missing is the client-side updating of your form after
-the sport is selected. This should be handled by making an AJAX call back to
+the sport is selected. This should be handled by making an AJAX callback to
 your application. Assume that you have a sport meetup creation controller::
 
     // src/Controller/MeetupController.php