diff --git a/cache.rst b/cache.rst index b981fb148d4..3d4cbf96a3e 100644 --- a/cache.rst +++ b/cache.rst @@ -594,7 +594,7 @@ Clearing the Cache ------------------ To clear the cache you can use the ``bin/console cache:pool:clear [pool]`` command. -That will remove all the entries from your storage and you wil have to recalculate +That will remove all the entries from your storage and you will have to recalculate all values. You can also group your pools into "cache clearers". There are 3 cache clearers by default: diff --git a/components/var_dumper/advanced.rst b/components/var_dumper/advanced.rst index bdc388cd6fe..dd31f8fed95 100644 --- a/components/var_dumper/advanced.rst +++ b/components/var_dumper/advanced.rst @@ -188,7 +188,7 @@ method to use a light theme:: The :class:`Symfony\\Component\\VarDumper\\Dumper\\HtmlDumper` limits string length and nesting depth of the output to make it more readable. These options -can be overriden by the third optional parameter of the +can be overridden by the third optional parameter of the :method:`dump(Data $data) ` method:: diff --git a/components/workflow.rst b/components/workflow.rst index 3d3ac24cc2c..54db794696a 100644 --- a/components/workflow.rst +++ b/components/workflow.rst @@ -77,7 +77,7 @@ Usage ----- When you have configured a ``Registry`` with your workflows, -you can retreive a workflow from it and use it as follows:: +you can retrieve a workflow from it and use it as follows:: // ... // Consider that $post is in state "draft" by default diff --git a/configuration.rst b/configuration.rst index a875db604c1..9d968a5e8da 100644 --- a/configuration.rst +++ b/configuration.rst @@ -253,7 +253,7 @@ The ``.env`` file is special, because it defines the values that usually change on each server. For example, the database credentials on your local development machine might be different from your workmates. The ``.env`` file should contain sensible, non-secret *default* values for all of your environment variables and -*should* be commited to your repository. +*should* be committed to your repository. To override these variables with machine-specific or sensitive values, create a ``.env.local`` file. This file is **not committed to the shared repository** and diff --git a/configuration/dot-env-changes.rst b/configuration/dot-env-changes.rst index 1dff2d140d2..34377cf4b11 100644 --- a/configuration/dot-env-changes.rst +++ b/configuration/dot-env-changes.rst @@ -18,7 +18,7 @@ important changes: * A) The ``.env.dist`` file no longer exists. Its contents should be moved to your ``.env`` file (see the next point). -* B) The ``.env`` file **is** now commited to your repository. It was previously ignored +* B) The ``.env`` file **is** now committed to your repository. It was previously ignored via the ``.gitignore`` file (the updated recipe does not ignore this file). Because this file is committed, it should contain non-sensitive, default values. Basically, the ``.env.dist`` file was moved to ``.env``. diff --git a/mailer.rst b/mailer.rst index f802628db23..09de4e78ede 100644 --- a/mailer.rst +++ b/mailer.rst @@ -281,7 +281,7 @@ Twig: HTML & CSS The Mime component integrates with the :doc:`Twig template engine ` to provide advanced features such as CSS style inlining and support for HTML/CSS -frameworks to create complex HTML email messages. First, make sure Twig is instaled: +frameworks to create complex HTML email messages. First, make sure Twig is installed: .. code-block:: terminal diff --git a/reference/forms/types/hidden.rst b/reference/forms/types/hidden.rst index a5d5b6315ef..df3a370b7db 100644 --- a/reference/forms/types/hidden.rst +++ b/reference/forms/types/hidden.rst @@ -9,7 +9,7 @@ The hidden type represents a hidden input field. +-------------+----------------------------------------------------------------------+ | Rendered as | ``input`` ``hidden`` field | +-------------+----------------------------------------------------------------------+ -| Overriden | - `compound`_ | +| Overridden | - `compound`_ | | options | - `error_bubbling`_ | | | - `required`_ | +-------------+----------------------------------------------------------------------+ diff --git a/testing/profiling.rst b/testing/profiling.rst index 659a07c7573..bfe336442ec 100644 --- a/testing/profiling.rst +++ b/testing/profiling.rst @@ -105,7 +105,7 @@ provided by the collectors obtained through the ``$client->getProfile()`` call:: If a test fails because of profiling data (too many DB queries for instance), you might want to use the Web Profiler to analyze the request after the tests -finish. It can be achived by embedding the token in the error message:: +finish. It can be achieved by embedding the token in the error message:: $this->assertLessThan( 30,