Skip to content

Commit f79d951

Browse files
committed
Merge branch '5.3' into 5.4
* 5.3: Fix a minor typo Typo fixes : Remove extra "s" + througth ➤ through Typo fix : distrupting ➤ disrupting Typo fix : failes ➤ fails Typo fix : cace ➤ cache
2 parents 268c87b + 1b54818 commit f79d951

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

_build/maintainer_guide.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ Merging while the target branch changed
356356
.......................................
357357

358358
Sometimes, someone else merges a PR in ``5.x`` at the same time as you are
359-
doing it. In these cases, ``gh merge ...`` failes to push. Solve this by
359+
doing it. In these cases, ``gh merge ...`` fails to push. Solve this by
360360
resetting your local branch and restarting the merge:
361361

362362
.. code-block:: terminal

cache.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ with either :class:`Symfony\\Contracts\\Cache\\CacheInterface` or
381381
return function(ContainerConfigurator $configurator) {
382382
$services = $configurator->services();
383383
384-
$services->set('app.cace.adapter.redis')
384+
$services->set('app.cache.adapter.redis')
385385
->parent('cache.adapter.redis')
386386
->tag('cache.pool', ['namespace' => 'my_custom_namespace']);
387387
};

components/console/helpers/cursor.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Using the cursor
5353
Moving the cursor
5454
.................
5555

56-
There are fews methods to control moving the command cursor::
56+
There are few methods to control moving the command cursor::
5757

5858
// moves the cursor 1 line up from its current position
5959
$cursor->moveUp();

security.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1476,7 +1476,7 @@ By default, login attempts are limited on ``max_attempts`` (default: 5)
14761476
failed requests for ``IP address + username`` and ``5 * max_attempts``
14771477
failed requests for ``IP address``. The second limit protects against an
14781478
attacker using multiple usernames from bypassing the first limit, without
1479-
distrupting normal users on big networks (such as offices).
1479+
disrupting normal users on big networks (such as offices).
14801480

14811481
.. tip::
14821482

session.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ Check out the Symfony config reference to learn more about the other available
131131
Basic Usage
132132
-----------
133133

134-
The sessions is available through the Request and the RequestStack.
134+
The session is available through the Request and the RequestStack.
135135
Symfony provides a request_stack service that is injected in your services and
136136
controllers if you type-hint an argument with
137137
:class:`Symfony\\Component\\HttpFoundation\\RequestStack`::

0 commit comments

Comments
 (0)