Skip to content

Commit 775afce

Browse files
committed
minor #11854 Fix many typos and improve grammar (Calinou)
This PR was merged into the 3.4 branch. Discussion ---------- Fix many typos and improve grammar Follow-up to #11645. Commits ------- 97f4eeb Fix many typos and improve grammar
2 parents c84deae + 97f4eeb commit 775afce

File tree

66 files changed

+95
-96
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+95
-96
lines changed

_build/maintainer_guide.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ interface. Then:
9393
Merging Process
9494
~~~~~~~~~~~~~~~
9595

96-
At first it's common to make mistakes and merge things badly. Don't worry. This
96+
At first, it's common to make mistakes and merge things badly. Don't worry. This
9797
has happened to all of us and we've always been able to recover from any mistake.
9898

9999
Step 1: Select the right branch to merge

best_practices/controllers.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ means that controllers should hold just the thin layer of *glue-code*
66
needed to coordinate the different parts of the application.
77

88
As a rule of thumb, you should follow the 5-10-20 rule, where controllers should
9-
only define 5 variables or less, contain 10 actions or less and include 20 lines
10-
of code or less in each action. This isn't an exact science, but it should
9+
only define 5 variables or fewer, contain 10 actions or fewer and include 20 lines
10+
of code or fewer in each action. This isn't an exact science, but it should
1111
help you realize when code should be refactored out of the controller and
1212
into a service.
1313

best_practices/i18n.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Traditionally, Symfony developers have created these files in the
5454
``app/Resources/`` directory is considered the global location for the
5555
application's resources, storing translations in ``app/Resources/translations/``
5656
centralizes them *and* gives them priority over any other translation file.
57-
This let's you override translations defined in third-party bundles.
57+
This lets you override translations defined in third-party bundles.
5858

5959
Translation Keys
6060
----------------

best_practices/introduction.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ that fit the philosophy of the framework as envisioned by its original creator
2525

2626
.. note::
2727

28-
**Best practice** is a noun that means *"a well defined procedure that is
28+
**Best practice** is a noun that means *"a well-defined procedure that is
2929
known to produce near-optimum results"*. And that's exactly what this
3030
guide aims to provide. Even if you don't agree with every recommendation,
3131
we believe these will help you build great applications with less complexity.

bundles/configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ Providing an XML Schema
390390

391391
XML has a very useful feature called `XML schema`_. This allows you to
392392
describe all possible elements and attributes and their values in an XML Schema
393-
Definition (an xsd file). This XSD file is used by IDEs for auto completion and
393+
Definition (an XSD file). This XSD file is used by IDEs for auto completion and
394394
it is used by the Config component to validate the elements.
395395

396396
In order to use the schema, the XML configuration file must provide an

components/asset.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ simple. Hardcoding URLs can be a disadvantage because:
3030
is essential for some applications because it allows you to control how
3131
the assets are cached. The Asset component allows you to define different
3232
versioning strategies for each package;
33-
* **Moving assets location** is cumbersome and error-prone: it requires you to
33+
* **Moving assets' location** is cumbersome and error-prone: it requires you to
3434
carefully update the URLs of all assets included in all templates. The Asset
3535
component allows to move assets effortlessly just by changing the base path
3636
value associated with the package of assets;
@@ -302,7 +302,7 @@ constructor::
302302
// result: http://static2.example.com/images/icon.png?v1
303303

304304
For each asset, one of the URLs will be randomly used. But, the selection
305-
is deterministic, meaning that each asset will be always served by the same
305+
is deterministic, meaning that each asset will always be served by the same
306306
domain. This behavior simplifies the management of HTTP cache.
307307

308308
Request Context Aware Assets

components/cache.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Now you can create, retrieve, update and delete items using this object::
7070

7171
// retrieve the cache item
7272
if (!$cache->has('stats.products_count')) {
73-
// ... item does not exists in the cache
73+
// ... item does not exist in the cache
7474
}
7575

7676
// retrieve the value stored by the item
@@ -171,7 +171,7 @@ Now you can create, retrieve, update and delete items using this cache pool::
171171
// retrieve the cache item
172172
$productsCount = $cache->getItem('stats.products_count');
173173
if (!$productsCount->isHit()) {
174-
// ... item does not exists in the cache
174+
// ... item does not exist in the cache
175175
}
176176
// retrieve the value stored by the item
177177
$total = $productsCount->get();

components/cache/adapters/memcached_adapter.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ Available Options
240240

241241
``server_failure_limit`` (type: ``int``, default: ``0``)
242242
Specifies the failure limit for server connection attempts before marking
243-
the server as "dead". The server will remaining in the server pool unless
243+
the server as "dead". The server will remain in the server pool unless
244244
``auto_eject_hosts`` is enabled.
245245

246246
Valid option values include *any positive integer*.

components/cache/cache_invalidation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ change in the state of your model. The most basic kind of invalidation is direct
1010
items deletion. But when the state of a primary resource has spread across
1111
several cached items, keeping them in sync can be difficult.
1212

13-
The Symfony Cache component provides two mechanisms to help solving this problem:
13+
The Symfony Cache component provides two mechanisms to help solve this problem:
1414

1515
* :ref:`Tags-based invalidation <cache-component-tags>` for managing data dependencies;
1616
* :ref:`Expiration based invalidation <cache-component-expiration>` for time related dependencies.

components/cache/cache_items.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ corresponding *getter* methods::
5858
Cache Item Expiration
5959
~~~~~~~~~~~~~~~~~~~~~
6060

61-
By default cache items are stored permanently. In practice, this "permanent
61+
By default, cache items are stored permanently. In practice, this "permanent
6262
storage" can vary greatly depending on the type of cache being used, as
6363
explained in the :doc:`/components/cache/cache_pools` article.
6464

0 commit comments

Comments
 (0)