Skip to content

Commit 377d585

Browse files
committed
Merge branch '3.4' into 4.3
* 3.4: Fixed many spelling issues
2 parents b3c5c7d + c4fb50d commit 377d585

35 files changed

+124
-117
lines changed

bundles/best_practices.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ A namespace becomes a bundle as soon as you add a bundle class to it. The
2626
bundle class name must follow these rules:
2727

2828
* Use only alphanumeric characters and underscores;
29-
* Use a StudlyCaps name (i.e. camelCase with the first letter uppercased);
29+
* Use a StudlyCaps name (i.e. camelCase with an uppercase first letter);
3030
* Use a descriptive and short name (no more than two words);
3131
* Prefix the name with the concatenation of the vendor (and optionally the
3232
category namespaces);

components/asset.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,9 @@ suffix to any asset path::
119119
echo $package->getUrl('image.png');
120120
// result: image.png?v1
121121

122-
In case you want to modify the version format, pass a sprintf-compatible format
123-
string as the second argument of the ``StaticVersionStrategy`` constructor::
122+
In case you want to modify the version format, pass a ``sprintf``-compatible
123+
format string as the second argument of the ``StaticVersionStrategy``
124+
constructor::
124125

125126
// puts the 'version' word before the version value
126127
$package = new Package(new StaticVersionStrategy('v1', '%s?version=%s'));

components/config.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The Config Component
66
====================
77

88
The Config component provides several classes to help you find, load,
9-
combine, autofill and validate configuration values of any kind, whatever
9+
combine, fill and validate configuration values of any kind, whatever
1010
their source may be (YAML, XML, INI files, or for instance a database).
1111

1212
Installation

components/console/helpers/processhelper.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ useful information about process status.
99

1010
To display process details, use the :class:`Symfony\\Component\\Console\\Helper\\ProcessHelper`
1111
and run your command with verbosity. For example, running the following code with
12-
a very verbose verbosity (e.g. -vv)::
12+
a very verbose verbosity (e.g. ``-vv``)::
1313

1414
use Symfony\Component\Process\Process;
1515

components/console/helpers/progressbar.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ the example above.
272272
Bar Settings
273273
~~~~~~~~~~~~
274274

275-
Amongst the placeholders, ``bar`` is a bit special as all the characters used
275+
Among the placeholders, ``bar`` is a bit special as all the characters used
276276
to display it can be customized::
277277

278278
// the finished part of the bar

components/console/helpers/questionhelper.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ convenient for passwords::
242242
.. caution::
243243

244244
When you ask for a hidden response, Symfony will use either a binary, change
245-
stty mode or use another trick to hide the response. If none is available,
245+
``stty`` mode or use another trick to hide the response. If none is available,
246246
it will fallback and allow the response to be visible unless you set this
247247
behavior to ``false`` using
248248
:method:`Symfony\\Component\\Console\\Question\\Question::setHiddenFallback`

components/console/usage.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ built-in options as well as a couple of built-in commands for the Console compon
1010
.. note::
1111

1212
These examples assume you have added a file ``application.php`` to run at
13-
the cli::
13+
the CLI::
1414

1515
#!/usr/bin/env php
1616
<?php

components/debug.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Enabling the Exception Handler
5858

5959
The :class:`Symfony\\Component\\Debug\\ExceptionHandler` class catches
6060
uncaught PHP exceptions and converts them to a nice PHP response. It is useful
61-
in debug mode to replace the default PHP/XDebug output with something prettier
61+
in debug mode to replace the default PHP/Xdebug output with something prettier
6262
and more useful::
6363

6464
use Symfony\Component\Debug\ExceptionHandler;

components/dependency_injection/compilation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ A very simple extension may just load configuration files into the container::
7878

7979
This does not gain very much compared to loading the file directly into
8080
the overall container being built. It just allows the files to be split
81-
up amongst the modules/bundles. Being able to affect the configuration
81+
up among the modules/bundles. Being able to affect the configuration
8282
of a module from configuration files outside of the module/bundle is needed
8383
to make a complex application configurable. This can be done by specifying
8484
sections of config files loaded directly into the container as being for

components/dom_crawler.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ and :method:`Symfony\\Component\\DomCrawler\\Crawler::filter`::
157157
method.
158158

159159
The default namespace is removed when loading the content if it's the only
160-
namespace in the document. It's done to simplify the xpath queries.
160+
namespace in the document. It's done to simplify the XPath queries.
161161

162162
Namespaces can be explicitly registered with the
163163
:method:`Symfony\\Component\\DomCrawler\\Crawler::registerNamespace` method::
@@ -203,7 +203,7 @@ Get all the direct child nodes matching a CSS selector::
203203
Accessing Node Values
204204
~~~~~~~~~~~~~~~~~~~~~
205205

206-
Access the node name (HTML tag name) of the first node of the current selection (eg. "p" or "div")::
206+
Access the node name (HTML tag name) of the first node of the current selection (e.g. "p" or "div")::
207207

208208
// returns the node name (HTML tag name) of the first child element under <body>
209209
$tag = $crawler->filterXPath('//body/*')->nodeName();

0 commit comments

Comments
 (0)