Merge branch '6.3' into 6.4

javiereguiluz · javiereguiluz · commit d61240b9c699 · 2023-07-09T10:19:00.000+02:00
* 6.3:
  [Doctrine] Fix line numbers in example
diff --git a/contributing/documentation/format.rst b/contributing/documentation/format.rst
@@ -21,7 +21,7 @@ tutorial and the `reStructuredText Reference`_.
     If you are familiar with Markdown, be careful as things are sometimes very
     similar but different:
 
-    * Lists starts at the beginning of a line (no indentation is allowed);
+    * Lists start at the beginning of a line (no indentation is allowed);
     * Inline code blocks use double-ticks (````like this````).
 
 Sphinx
diff --git a/doctrine.rst b/doctrine.rst
@@ -395,13 +395,13 @@ Take a look at the previous example in more detail:
   the controller method. This object is responsible for saving objects to, and
   fetching objects from, the database.
 
-* **lines 17-20** In this section, you instantiate and work with the ``$product``
+* **lines 15-18** In this section, you instantiate and work with the ``$product``
   object like any other normal PHP object.
 
-* **line 23** The ``persist($product)`` call tells Doctrine to "manage" the
+* **line 21** The ``persist($product)`` call tells Doctrine to "manage" the
   ``$product`` object. This does **not** cause a query to be made to the database.
 
-* **line 26** When the ``flush()`` method is called, Doctrine looks through
+* **line 24** When the ``flush()`` method is called, Doctrine looks through
   all of the objects that it's managing to see if they need to be persisted
   to the database. In this example, the ``$product`` object's data doesn't
   exist in the database, so the entity manager executes an ``INSERT`` query,
diff --git a/frontend/asset_mapper.rst b/frontend/asset_mapper.rst
@@ -693,7 +693,7 @@ Does the AssetMapper Component work in All Browsers?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Yup! Features like importmaps and the ``import`` statement are supported
-in all modern browsers, but the AssetMapper component ships with an `es module shim`_
+in all modern browsers, but the AssetMapper component ships with an `ES module shim`_
 to support ``importmap`` in old browsers. So, it works everywhere (see note
 below).
 
