Merge branch '5.4' into 6.0

* 5.4:
  Correct spelling & grammar in 4.4 form/
  Correct spelling & grammar in 4.4 doctrine/
  Correct spelling & grammar in 4.4 create_framework/
  Correct spelling & grammar in 4.4 components/expression_language/
  Correct spelling & grammar in 4.4 components/dependency_injection/
  Correct spelling & grammar in 4.4 components/console/
  Correct spelling & grammar in 4.4 components/config/
  Correct spelling & grammar in 4.4 bundles/
  Correct spelling & grammar in 4.4 workflow.rst
  Correct spelling & grammar in 4.4 performance.rst
  Correct spelling & grammar in 4.4 migration.rst
  Correct spelling & grammar in 4.4 mercure.rst

Author: javiereguiluz

bundles/best_practices.rst

@@ -485,7 +485,7 @@ The ``composer.json`` file should include at least the following metadata:
     Consists of the vendor and the short bundle name. If you are releasing the
     bundle on your own instead of on behalf of a company, use your personal name
     (e.g. ``johnsmith/blog-bundle``). Exclude the vendor name from the bundle
-    short name and separate each word with an hyphen. For example: AcmeBlogBundle
+    short name and separate each word with a hyphen. For example: AcmeBlogBundle
     is transformed into ``blog-bundle`` and AcmeSocialConnectBundle is
     transformed into ``social-connect-bundle``.
 

bundles/configuration.rst

@@ -331,7 +331,7 @@ bundle in the console using the Yaml format.
 
 As long as your bundle's configuration is located in the standard location
 (``YourBundle\DependencyInjection\Configuration``) and does not have
-a constructor it will work automatically. If you
+a constructor, it will work automatically. If you
 have something different, your ``Extension`` class must override the
 :method:`Extension::getConfiguration() <Symfony\\Component\\DependencyInjection\\Extension\\Extension::getConfiguration>`
 method and return an instance of your ``Configuration``.

bundles/prepend_extension.rst

@@ -8,7 +8,7 @@ How to Simplify Configuration of Multiple Bundles
 When building reusable and extensible applications, developers are often
 faced with a choice: either create a single large bundle or multiple smaller
 bundles. Creating a single bundle has the drawback that it's impossible for
-users to choose to remove functionality they are not using. Creating multiple
+users to remove unused functionality. Creating multiple
 bundles has the drawback that configuration becomes more tedious and settings
 often need to be repeated for various bundles.
 

components/config/definition.rst

@@ -155,7 +155,7 @@ Array Nodes
 ~~~~~~~~~~~
 
 It is possible to add a deeper level to the hierarchy, by adding an array
-node. The array node itself, may have a pre-defined set of variable nodes::
+node. The array node itself, may have a predefined set of variable nodes::
 
     $rootNode
         ->children()
@@ -193,7 +193,7 @@ above, it is possible to have multiple connection arrays (containing a ``driver`
 ``host``, etc.).
 
 Sometimes, to improve the user experience of your application or bundle, you may
-allow to use a simple string or numeric value where an array value is required.
+allow the use of a simple string or numeric value where an array value is required.
 Use the ``castToArray()`` helper to turn those variables into arrays::
 
     ->arrayNode('hosts')

components/console/helpers/progressbar.rst

@@ -292,7 +292,7 @@ to display it can be customized::
 
 .. caution::
 
-    For performance reasons, Symfony redraws screen every 100ms. If this is too
+    For performance reasons, Symfony redraws the screen once every 100ms. If this is too
     fast or to slow for your application, use the methods
     :method:`Symfony\\Component\\Console\\Helper\\ProgressBar::minSecondsBetweenRedraws` and
     :method:`Symfony\\Component\\Console\\Helper\\ProgressBar::maxSecondsBetweenRedraws`::

components/console/helpers/questionhelper.rst

@@ -124,7 +124,7 @@ option is the default one.
 If the user enters an invalid string, an error message is shown and the user
 is asked to provide the answer another time, until they enter a valid string
 or reach the maximum number of attempts. The default value for the maximum number
-of attempts is ``null``, which means infinite number of attempts. You can define
+of attempts is ``null``, which means an infinite number of attempts. You can define
 your own error message using
 :method:`Symfony\\Component\\Console\\Question\\ChoiceQuestion::setErrorMessage`.
 
@@ -387,7 +387,7 @@ was successful.
 You can set the max number of times to ask with the
 :method:`Symfony\\Component\\Console\\Question\\Question::setMaxAttempts` method.
 If you reach this max number it will use the default value. Using ``null`` means
-the amount of attempts is infinite. The user will be asked as long as they provide an
+the number of attempts is infinite. The user will be asked as long as they provide an
 invalid answer and will only be able to proceed if their input is valid.
 
 .. tip::

components/console/helpers/table.rst

@@ -147,7 +147,7 @@ The output of this command will be:
     | 99921 | Divine Com | Dante Alighieri                |
     | -58-1 | edy        |                                |
     | 0-7   |            |                                |
-    |                (the rest of rows...)                |
+    |                (the rest of the rows...)            |
     +-------+------------+--------------------------------+
 
 The table style can be changed to any built-in styles via
@@ -379,7 +379,7 @@ This outputs:
     | 978-0804169127 | Divine Comedy | spans multiple rows |
     +----------------+---------------+---------------------+
 
-You can use the ``colspan`` and ``rowspan`` options at the same time which allows
+You can use the ``colspan`` and ``rowspan`` options at the same time, which allows
 you to create any table layout you may wish.
 
 .. _console-modify-rendered-tables:

components/console/single_command_tool.rst

@@ -5,10 +5,8 @@ Building a single Command Application
 =====================================
 
 When building a command line tool, you may not need to provide several commands.
-In such case, having to pass the command name each time is tedious.
-
-Fortunately, it is possible to remove this need by declaring a single command
-application::
+In such a case, having to pass the command name each time is tedious. Fortunately,
+it is possible to remove this need by declaring a single command application::
 
     #!/usr/bin/env php
     <?php

components/dependency_injection/compilation.rst

@@ -358,8 +358,8 @@ methods described in :doc:`/service_container/definitions`.
     method call if some required service is not available.
 
 A common use-case of compiler passes is to search for all service definitions
-that have a certain tag in order to process dynamically plug each into some
-other service. See the section on :ref:`service tags <service-container-compiler-pass-tags>`
+that have a certain tag, in order to dynamically plug each one into other services.
+See the section on :ref:`service tags <service-container-compiler-pass-tags>`
 for an example.
 
 .. _components-di-separate-compiler-passes:

components/dependency_injection/workflow.rst

@@ -25,7 +25,7 @@ container exists. The kernel has a debug setting and if this is false,
 the cached version is used if it exists. If debug is true then the kernel
 :doc:`checks to see if configuration is fresh </components/config/caching>`
 and if it is, the cached version of the container is used. If not then the
-container is built from the application-level configuration and the bundles's
+container is built from the application-level configuration and the bundles'
 extension configuration.
 
 Read :ref:`Dumping the Configuration for Performance <components-dependency-injection-dumping>`

components/expression_language/ast.rst

@@ -5,8 +5,8 @@
 Dumping and Manipulating the AST of Expressions
 ===============================================
 
-Manipulating or inspecting the expressions created with the ExpressionLanguage
-component is difficult because they are plain strings. A better approach is to
+It’s difficult to manipulate or inspect the expressions created with the ExpressionLanguage
+component, because the expressions are plain strings. A better approach is to
 turn those expressions into an AST. In computer science, `AST`_ (*Abstract
 Syntax Tree*) is *"a tree representation of the structure of source code written
 in a programming language"*. In Symfony, a ExpressionLanguage AST is a set of

components/expression_language/caching.rst

@@ -25,7 +25,7 @@ The ``evaluate()`` method needs to loop through the "nodes" (pieces of an
 expression saved in the ``ParsedExpression``) and evaluate them on the fly.
 
 To save time, the ``ExpressionLanguage`` caches the ``ParsedExpression`` so
-it can skip the tokenize and parse steps with duplicate expressions. The
+it can skip the tokenization and parsing steps with duplicate expressions. The
 caching is done by a PSR-6 `CacheItemPoolInterface`_ instance (by default, it
 uses an :class:`Symfony\\Component\\Cache\\Adapter\\ArrayAdapter`). You can
 customize this by creating a custom cache pool or using one of the available

components/expression_language/syntax.rst

@@ -191,7 +191,7 @@ Comparison Operators
 
         $expressionLanguage->evaluate('not ("foo" matches "/bar/")'); // returns true
 
-    You must use parenthesis because the unary operator ``not`` has precedence
+    You must use parentheses because the unary operator ``not`` has precedence
     over the binary operator ``matches``.
 
 Examples::

create_framework/front_controller.rst

@@ -127,7 +127,7 @@ its sub-directories (only if needed -- see above tip).
 
 .. tip::
 
-    You don't even need to setup a web server to test the code. Instead,
+    You don't even need to set up a web server to test the code. Instead,
     replace the ``$request = Request::createFromGlobals();`` call to something
     like ``$request = Request::create('/hello?name=Fabien');`` where the
     argument is the URL path you want to simulate.

doctrine/associations.rst

@@ -357,7 +357,7 @@ config.
     *exactly* like an array, but has some added flexibility. Just imagine that
     it is an ``array`` and you'll be in good shape.
 
-Your database is setup! Now, run the migrations like normal:
+Your database is set up! Now, run the migrations like normal:
 
 .. code-block:: terminal
 

doctrine/dbal.rst

@@ -118,7 +118,7 @@ Registering custom Mapping Types in the SchemaTool
 
 The SchemaTool is used to inspect the database to compare the schema. To
 achieve this task, it needs to know which mapping type needs to be used
-for each database types. Registering new ones can be done through the configuration.
+for each database type. Registering new ones can be done through the configuration.
 
 Now, map the ENUM type (not supported by DBAL by default) to the ``string``
 mapping type:

doctrine/registration_form.rst

@@ -14,7 +14,7 @@ form you must:
 #. :doc:`Create a form </forms>` to ask for the registration information (you can
    generate this with the ``make:registration-form`` command provided by the `MakerBundle`_);
 #. Create :doc:`a controller </controller>` to :ref:`process the form <processing-forms>`;
-#. :ref:`Protect some parts of your application <security-access-control>` so
+#. :ref:`Protect some parts of your application <security-access-control>` so that
    only registered users can access to them.
 
 .. _`MakerBundle`: https://symfony.com/doc/current/bundles/SymfonyMakerBundle/index.html

doctrine/resolve_target_entity.rst

@@ -5,7 +5,7 @@
 How to Define Relationships with Abstract Classes and Interfaces
 ================================================================
 
-One of the goals of bundles is to create discreet bundles of functionality
+One of the goals of bundles is to create discrete bundles of functionality
 that do not have many (if any) dependencies, allowing you to use that
 functionality in other applications without including unnecessary items.
 

doctrine/reverse_engineering.rst

@@ -5,7 +5,7 @@ How to Generate Entities from an Existing Database
 ==================================================
 
 When starting work on a brand new project that uses a database, two different
-situations comes naturally. In most cases, the database model is designed
+situations can occur. In most cases, the database model is designed
 and built from scratch. Sometimes, however, you'll start with an existing and
 probably unchangeable database model. Fortunately, Doctrine comes with a bunch
 of tools to help generate model classes from your existing database.
@@ -47,7 +47,7 @@ to a post record thanks to a foreign key constraint.
     ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 Before diving into the recipe, be sure your database connection parameters are
-correctly setup in the ``.env`` file (or ``.env.local`` override file).
+correctly set up in the ``.env`` file (or ``.env.local`` override file).
 
 The first step towards building entity classes from an existing database
 is to ask Doctrine to introspect the database and generate the corresponding

form/dynamic_form_modification.rst

@@ -4,7 +4,7 @@
 How to Dynamically Modify Forms Using Form Events
 =================================================
 
-Often times, a form can't be created statically. In this article, you'll learn
+Oftentimes, a form can't be created statically. In this article, you'll learn
 how to customize your form based on three common use-cases:
 
 1) :ref:`Customizing your Form Based on the Underlying Data <form-events-underlying-data>`
@@ -506,8 +506,8 @@ exactly the same things on a given form.
 
 .. tip::
 
-    The ``FormEvents::POST_SUBMIT`` event does not allow to modify the form
-    the listener is bound to, but it allows to modify its parent.
+    The ``FormEvents::POST_SUBMIT`` event does not allow modifications to the 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

form/form_themes.rst

@@ -156,7 +156,7 @@ You can also apply a form theme to a specific child of your form:
     {% form_theme form.a_child_form 'form/my_custom_theme.html.twig' %}
 
 This is useful when you want to have a custom theme for a nested form that's
-different than the one of your main form. Specify both your themes:
+different from the one of your main form. Specify both your themes:
 
 .. code-block:: twig
 

mercure.rst

@@ -27,7 +27,7 @@ out of the box in most modern browsers (old versions of Edge and IE require
 languages.
 
 Mercure comes with an authorization mechanism,
-automatic re-connection in case of network issues
+automatic reconnection in case of network issues
 with retrieving of lost updates, a presence API,
 "connection-less" push for smartphones and auto-discoverability (a supported
 client can automatically discover and subscribe to updates of a given resource
@@ -89,7 +89,7 @@ definition that provides a Mercure service. Run ``docker-compose up`` to start i
 Configuration
 -------------
 
-The preferred way to configure the MercureBundle is using
+The preferred way to configure MercureBundle is using
 :doc:`environment variables </configuration>`.
 
 When MercureBundle has been installed, the ``.env`` file of your project
@@ -435,7 +435,7 @@ is the way to go.
 .. tip::
 
     The native implementation of EventSource doesn't allow specifying headers.
-    For example, authorization using Bearer token. In order to achieve that, use `a polyfill`_
+    For example, authorization using a Bearer token. In order to achieve that, use `a polyfill`_
 
     .. code-block:: twig
 
@@ -595,7 +595,7 @@ its Mercure support.
 Testing
 --------
 
-During unit testing there is not need to send updates to Mercure.
+During unit testing there is no need to send updates to Mercure.
 
 You can instead make use of the `MockHub`::
 

migration.rst

@@ -223,7 +223,7 @@ unique approach for migration. This guide shows two examples of commonly used
 approaches, which you can use as a base for your own approach:
 
 * `Front Controller with Legacy Bridge`_, which leaves the legacy application
-  untouched and allows to migrate it in phases to the Symfony application.
+  untouched and allows migrating it in phases to the Symfony application.
 * `Legacy Route Loader`_, where the legacy application is integrated in phases
   into Symfony, with a fully integrated final result.
 

performance.rst

@@ -158,7 +158,7 @@ overhead that can be avoided as follows:
     ; php.ini
     opcache.validate_timestamps=0
 
-After each deploy, you must empty and regenerate the cache of OPcache. Otherwise
+After each deployment, you must empty and regenerate the cache of OPcache. Otherwise
 you won't see the updates made in the application. Given that in PHP, the CLI
 and the web processes don't share the same OPcache, you cannot clear the web
 server OPcache by executing some command in your terminal. These are some of the

workflow.rst

@@ -394,7 +394,7 @@ order:
 .. note::
 
     The leaving and entering events are triggered even for transitions that stay
-    in same place.
+    in the same place.
 
 .. note::
 
@@ -453,7 +453,7 @@ it via the marking::
 Guard Events
 ~~~~~~~~~~~~
 
-There are a special kind of events called "Guard events". Their event listeners
+There are special types of events called "Guard events". Their event listeners
 are invoked every time a call to ``Workflow::can()``, ``Workflow::apply()`` or
 ``Workflow::getEnabledTransitions()`` is executed. With the guard events you may
 add custom logic to decide which transitions should be blocked or not. Here is a