Skip to content

Commit 46213f6

Browse files
committed
Merge branch '4.4' into 5.1
* 4.4: Minor: Fix build
2 parents 14d169f + 72a2b1c commit 46213f6

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

cache.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ You can also create more customized pools:
301301
Each pool manages a set of independent cache keys: keys from different pools
302302
*never* collide, even if they share the same backend. This is achieved by prefixing
303303
keys with a namespace that's generated by hashing the name of the pool, the name
304-
of the compiled container class and a :ref:`configurable seed<reference-cache-prefix-seed>`
304+
of the compiled container class and a :ref:`configurable seed <reference-cache-prefix-seed>`
305305
that defaults to the project directory.
306306

307307
Each custom pool becomes a service whose service ID is the name of the pool

configuration/secrets.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ Referencing Secrets in Configuration Files
9898
------------------------------------------
9999

100100
Secret values can be referenced in the same way as
101-
:ref:`environment variables<config-env-vars>`. Be careful that you don't
101+
:ref:`environment variables <config-env-vars>`. Be careful that you don't
102102
accidentally define a secret *and* an environment variable with the same name:
103103
**environment variables override secrets**.
104104

contributing/code/stack_trace.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ going on:
137137
138138
139139
If that is not the case, you can obtain a stack trace by increasing the
140-
:doc:`verbosity level</console/verbosity>` with ``--verbose``:
140+
:doc:`verbosity level </console/verbosity>` with ``--verbose``:
141141

142142
.. code-block:: terminal
143143

profiler.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ the AJAX request to force the refresh of the toolbar::
201201

202202
Ideally this header should only be set during development and not for
203203
production. To do that, create an :doc:`event subscriber </event_dispatcher>`
204-
and listen to the :ref:`kernel.response<component-http-kernel-kernel-response>`
204+
and listen to the :ref:`kernel.response <component-http-kernel-kernel-response>`
205205
event::
206206

207207
use Symfony\Component\HttpKernel\Event\ResponseEvent;

reference/constraints/map.rst.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ String Constraints
2222
* :doc:`Regex </reference/constraints/Regex>`
2323
* :doc:`Hostname </reference/constraints/Hostname>`
2424
* :doc:`Ip </reference/constraints/Ip>`
25-
* :doc:`Json</reference/constraints/Json>`
25+
* :doc:`Json </reference/constraints/Json>`
2626
* :doc:`Uuid </reference/constraints/Uuid>`
2727
* :doc:`UserPassword </reference/constraints/UserPassword>`
2828
* :doc:`NotCompromisedPassword </reference/constraints/NotCompromisedPassword>`

security/ldap.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Symfony provides different means to work with an LDAP server.
88

99
The Security component offers:
1010

11-
* The ``ldap`` :doc:`user provider</security/user_provider>`, using the
11+
* The ``ldap`` :doc:`user provider </security/user_provider>`, using the
1212
:class:`Symfony\\Component\\Ldap\\Security\\LdapUserProvider`
1313
class. Like all other user providers, it can be used with any
1414
authentication provider.

0 commit comments

Comments
 (0)