Skip to content

Commit b380e09

Browse files
committed
minor symfony#9932 Fixed typos (pborreli)
This PR was merged into the 3.4 branch. Discussion ---------- Fixed typos Commits ------- fbc9066 Fixed typos
2 parents 2904797 + fbc9066 commit b380e09

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

components/cache/adapters/chain_adapter.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ slowest storage engines, :class:`Symfony\\Component\\Cache\\Adapter\\ApcuAdapter
4646
));
4747

4848
When calling this adapter's :method:`Symfony\\Component\\Cache\\ChainAdapter::prune` method,
49-
the call is deligated to all its compatibe cache adapters. It is safe to mix both adapters
49+
the call is delegated to all its compatible cache adapters. It is safe to mix both adapters
5050
that *do* and do *not* implement :class:`Symfony\\Component\\Cache\\PruneableInterface`, as
5151
incompatible adapters are silently ignored::
5252

components/cache/cache_pools.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,18 +155,18 @@ Pruning Cache Items
155155
Cache adapter pruning functionality was introduced in Symfony 3.4.
156156

157157
Some cache pools do not include an automated mechanism for pruning expired cache items.
158-
For example, the :ref:`FilesystemAdaper <component-cache-filesystem-adapter>` cache
158+
For example, the :ref:`FilesystemAdapter <component-cache-filesystem-adapter>` cache
159159
does not remove expired cache items *until an item is explicitly requested and determined to
160160
be expired*, for example, via a call to ``Psr\\Cache\\CacheItemPoolInterface::getItem``.
161161
Under certain workloads, this can cause stale cache entries to persist well past their
162162
expiration, resulting in a sizable consumption of wasted disk or memory space from excess,
163163
expired cache items.
164164

165-
This shortcomming has been solved through the introduction of
165+
This shortcoming has been solved through the introduction of
166166
:class:`Symfony\\Component\\Cache\\PruneableInterface`, which defines the abstract method
167167
:method:`Symfony\\Component\\Cache\\PruneableInterface::prune`. The
168168
:ref:`ChainAdapter <component-cache-chain-adapter>`,
169-
:ref:`FilesystemAdaper <component-cache-filesystem-adapter>`,
169+
:ref:`FilesystemAdapter <component-cache-filesystem-adapter>`,
170170
:ref:`PdoAdapter <pdo-doctrine-adapter>`, and
171171
:ref:`PhpFilesAdapter <component-cache-files-adapter>` all implement this new interface,
172172
allowing manual removal of stale cache items::
@@ -180,7 +180,7 @@ allowing manual removal of stale cache items::
180180
The :ref:`ChainAdapter <component-cache-chain-adapter>` implementation does not directly
181181
contain any pruning logic itself. Instead, when calling the chain adapter's
182182
:method:`Symfony\\Component\\Cache\\ChainAdapter::prune` method, the call is delegated to all
183-
its compatibe cache adapters (and those that do not implement ``PruneableInterface`` are
183+
its compatible cache adapters (and those that do not implement ``PruneableInterface`` are
184184
silently ignored)::
185185

186186
use Symfony\Component\Cache\Adapter\ApcuAdapter;

frontend/encore/legacy-apps.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Using Libraries that Expect jQuery to be Global
1919
Some legacy JavaScript applications use programming practices that don't play
2020
well with the new practices promoted by Webpack. The most common of these
2121
problems is using code (e.g. jQuery plugins) that assume that jQuery is already
22-
available via the the ``$`` or ``jQuery`` global variables. If those variables
22+
available via the ``$`` or ``jQuery`` global variables. If those variables
2323
are not defined, you'll get these errors:
2424

2525
.. code-block:: text

security/ldap.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,13 @@ use the ``ldap`` user provider.
190190
provider is used. However, the LDAP component itself does not provide
191191
any escaping yet. Thus, it's your responsibility to prevent LDAP injection
192192
attacks when using the component directly.
193-
193+
194194
.. caution::
195195

196-
The user configured above in the the user provider is only used to retrieve
196+
The user configured above in the user provider is only used to retrieve
197197
data. It's a static user defined by its username and password (for improved
198198
security, define the password as an environment variable).
199-
199+
200200
If your LDAP server allows to retrieve information anonymously, you can
201201
set the ``search_dn`` and ``search_password`` options to ``null``.
202202

@@ -207,7 +207,7 @@ service
207207

208208
**type**: ``string`` **default**: ``ldap``
209209

210-
This is the name of your configured LDAP client. You can freely chose the
210+
This is the name of your configured LDAP client. You can freely choose the
211211
name, but it must be unique in your application and it cannot start with a
212212
number or contain white spaces.
213213

@@ -286,7 +286,7 @@ service
286286

287287
**type**: ``string`` **default**: ``ldap``
288288

289-
This is the name of your configured LDAP client. You can freely chose the
289+
This is the name of your configured LDAP client. You can freely choose the
290290
name, but it must be unique in your application and it cannot start with a
291291
number or contain white spaces.
292292

0 commit comments

Comments
 (0)