Merge branch '6.0' into 6.1

* 6.0:
  Fix build errors

Author: fabpot

form/form_collections.rst

@@ -657,7 +657,7 @@ the relationship between the removed ``Tag`` and ``Task`` object.
     The Symfony community has created some JavaScript packages that provide the
     functionality needed to add, edit and delete elements of the collection.
     Check out the `@a2lix/symfony-collection`_ package for modern browsers and
-    the `symfony-collection`_ package based on `jQuery`_ for the rest of browsers.
+    the `symfony-collection`_ package based on jQuery for the rest of browsers.
 
 .. _`Owning Side and Inverse Side`: https://www.doctrine-project.org/projects/doctrine-orm/en/current/reference/unitofwork-associations.html
 .. _`JSFiddle`: https://jsfiddle.net/ey8ozh6n/

form/form_customization.rst

@@ -270,7 +270,7 @@ Renders any errors for the given field.
 
     In the Bootstrap 4 form theme, ``form_errors()`` is already included in
     ``form_label()``. Read more about this in the
-    :ref:`Bootstrap 4 theme documentation <reference-forms-bootstrap5-error-messages>`.
+    :ref:`Bootstrap 4 theme documentation <reference-forms-bootstrap4-error-messages>`.
 
 .. _reference-forms-twig-widget: