diff --git a/doctrine/associations.rst b/doctrine/associations.rst index 4a2fafb6467..a3c138c008f 100644 --- a/doctrine/associations.rst +++ b/doctrine/associations.rst @@ -299,7 +299,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 diff --git a/doctrine/dbal.rst b/doctrine/dbal.rst index 80c145d3d6a..a1aa4291eb2 100644 --- a/doctrine/dbal.rst +++ b/doctrine/dbal.rst @@ -120,7 +120,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: diff --git a/doctrine/registration_form.rst b/doctrine/registration_form.rst index d999eda77e9..841e1960512 100644 --- a/doctrine/registration_form.rst +++ b/doctrine/registration_form.rst @@ -14,7 +14,7 @@ form you must: #. :doc:`Create a form ` to ask for the registration information (you can generate this with the ``make:registration-form`` command provided by the `MakerBundle`_); #. Create :doc:`a controller ` to :ref:`process the form `; -#. :ref:`Protect some parts of your application ` so - only registered users can access to them. +#. :ref:`Protect some parts of your application ` so that + only registered users can access them. .. _`MakerBundle`: https://symfony.com/doc/current/bundles/SymfonyMakerBundle/index.html diff --git a/doctrine/resolve_target_entity.rst b/doctrine/resolve_target_entity.rst index 765f5d187ce..9be8730ba4a 100644 --- a/doctrine/resolve_target_entity.rst +++ b/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. diff --git a/doctrine/reverse_engineering.rst b/doctrine/reverse_engineering.rst index bd5d1402198..74d56159ac3 100644 --- a/doctrine/reverse_engineering.rst +++ b/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