Skip to content

Commit cf9b393

Browse files
committed
Merge branch '3.4' into 4.2
* 3.4: Fix several typos
2 parents 2119d98 + eed3acc commit cf9b393

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

cache.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ Clearing the Cache
594594
------------------
595595

596596
To clear the cache you can use the ``bin/console cache:pool:clear [pool]`` command.
597-
That will remove all the entries from your storage and you wil have to recalculate
597+
That will remove all the entries from your storage and you will have to recalculate
598598
all values. You can also group your pools into "cache clearers". There are 3 cache
599599
clearers by default:
600600

components/var_dumper/advanced.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ method to use a light theme::
188188

189189
The :class:`Symfony\\Component\\VarDumper\\Dumper\\HtmlDumper` limits string
190190
length and nesting depth of the output to make it more readable. These options
191-
can be overriden by the third optional parameter of the
191+
can be overridden by the third optional parameter of the
192192
:method:`dump(Data $data) <Symfony\\Component\\VarDumper\\Dumper\\DataDumperInterface::dump>`
193193
method::
194194

reference/forms/types/hidden.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The hidden type represents a hidden input field.
99
+-------------+----------------------------------------------------------------------+
1010
| Rendered as | ``input`` ``hidden`` field |
1111
+-------------+----------------------------------------------------------------------+
12-
| Overriden | - `compound`_ |
12+
| Overridden | - `compound`_ |
1313
| options | - `error_bubbling`_ |
1414
| | - `required`_ |
1515
+-------------+----------------------------------------------------------------------+

reference/forms/types/integer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ scale
9595

9696
This specifies how many decimals will be allowed until the field rounds the
9797
submitted value (via ``rounding_mode``). This option inherits from
98-
:doc:`number </reference/forms/types/number>` type and is overriden to ``0`` for
98+
:doc:`number </reference/forms/types/number>` type and is overridden to ``0`` for
9999
``IntegerType``.
100100

101101
Inherited Options

testing/profiling.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ provided by the collectors obtained through the ``$client->getProfile()`` call::
105105

106106
If a test fails because of profiling data (too many DB queries for instance),
107107
you might want to use the Web Profiler to analyze the request after the tests
108-
finish. It can be achived by embedding the token in the error message::
108+
finish. It can be achieved by embedding the token in the error message::
109109

110110
$this->assertLessThan(
111111
30,

0 commit comments

Comments
 (0)