Merge branch '3.4' into 4.3

* 3.4:
  Update simple-example.rst
  fix some issues

Author: OskarStark

contributing/code/conventions.rst

@@ -96,7 +96,7 @@ contain deprecated methods.
 
 A new method cannot be introduced as deprecated.
 
-A feature is marked as deprecated by adding a ``@deprecated`` PHPdoc to
+A feature is marked as deprecated by adding a ``@deprecated`` PHPDoc to
 relevant classes, methods, properties, ...::
 
     /**

contributing/code/maintenance.rst

@@ -13,7 +13,7 @@ acceptable changes.
 
 .. note::
 
-    When documentation (or phpdoc) is not in sync with the code, code behavior
+    When documentation (or PHPDoc) is not in sync with the code, code behavior
     should always be considered as being the correct one.
 
 Besides bug fixes, other minor changes can be accepted in a patch version:

form/type_guesser.rst

@@ -146,7 +146,7 @@ With this knowledge, you can implement the ``guessType()`` method of the
     }
 
 This type guesser can now guess the field type for a property if it has
-PHPdoc!
+PHPDoc!
 
 Guessing Field Options
 ~~~~~~~~~~~~~~~~~~~~~~

frontend/encore/simple-example.rst

@@ -269,7 +269,8 @@ you need them:
     + {% endblock %}
 
 Now, the checkout page will contain all the JavaScript and CSS for the ``app`` entry
-(because this is included in ``base.html.twig``) *and* your ``checkout`` entry.
+(because this is included in ``base.html.twig`` and there is the ``{{ parent() }}`` call)
+*and* your ``checkout`` entry.
 
 See :doc:`/frontend/encore/page-specific-assets` for more details. To avoid duplicating
 the same code in different entry files, see :doc:`/frontend/encore/split-chunks`.

reference/dic_tags.rst

@@ -946,9 +946,9 @@ required option: ``alias``, which defines the name of the extractor::
         protected $prefix;
 
         /**
-         * Extracts translation messages from a template directory to the catalogue.
+         * Extracts translation messages from a template directory to the catalog.
          */
-        public function extract($directory, MessageCatalogue $catalogue)
+        public function extract($directory, MessageCatalogue $catalog)
         {
             // ...
         }

translation/debug.rst

@@ -7,7 +7,7 @@ How to Find Missing or Unused Translation Messages
 ==================================================
 
 When maintaining an application or bundle, you may add or remove translation
-messages and forget to update the message catalogues. The ``debug:translation``
+messages and forget to update the message catalogs. The ``debug:translation``
 command helps you to find these missing or unused translation messages templates:
 
 .. code-block:: twig