Skip to content

Commit e58e39f

Browse files
committed
minor #3832 fix the wording in versionadded directives (for the 2.3 branch) (xabbuh)
This PR was merged into the 2.3 branch. Discussion ---------- fix the wording in versionadded directives (for the 2.3 branch) | Q | A | ------------- | --- | Doc fix? | yes | New docs? | no | Applies to | all | Fixed tickets | Commits ------- a2d39a1 fix the wording in versionadded directives
2 parents 09d6ca1 + a2d39a1 commit e58e39f

Some content is hidden

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

41 files changed

+81
-72
lines changed

book/forms.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -232,10 +232,10 @@ controller::
232232
}
233233

234234
.. versionadded:: 2.3
235-
The :method:`Symfony\\Component\\Form\\FormInterface::handleRequest` method was
236-
added in Symfony 2.3. Previously, the ``$request`` was passed to the
237-
``submit`` method - a strategy which is deprecated and will be removed
238-
in Symfony 3.0. For details on that method, see :ref:`cookbook-form-submit-request`.
235+
The :method:`Symfony\\Component\\Form\\FormInterface::handleRequest` method
236+
was introduced in Symfony 2.3. Previously, the ``$request`` was passed
237+
to the ``submit`` method - a strategy which is deprecated and will be
238+
removed in Symfony 3.0. For details on that method, see :ref:`cookbook-form-submit-request`.
239239

240240
This controller follows a common pattern for handling forms, and has three
241241
possible paths:
@@ -1845,7 +1845,7 @@ but here's a short example:
18451845
.. versionadded:: 2.1
18461846
The ``constraints`` option, which accepts a single constraint or an array
18471847
of constraints (before 2.1, the option was called ``validation_constraint``,
1848-
and only accepted a single constraint) is new to Symfony 2.1.
1848+
and only accepted a single constraint) was introduced in Symfony 2.1.
18491849
18501850
.. code-block:: php
18511851

book/routing.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ The route is simple:
6969
return $collection;
7070
7171
.. versionadded:: 2.2
72-
The ``path`` option is new in Symfony 2.2, ``pattern`` is used in older
73-
versions.
72+
The ``path`` option was introduced in Symfony 2.2, ``pattern`` is used
73+
in older versions.
7474

7575
The path defined by the ``blog_show`` route acts like ``/blog/*`` where
7676
the wildcard is given the name ``slug``. For the URL ``/blog/my-blog-post``,
@@ -704,7 +704,7 @@ be accomplished with the following route configuration:
704704
return $collection;
705705
706706
.. versionadded:: 2.2
707-
The ``methods`` option is added in Symfony 2.2. Use the ``_method``
707+
The ``methods`` option was introduced in Symfony 2.2. Use the ``_method``
708708
requirement in older versions.
709709

710710
Despite the fact that these two routes have identical paths (``/contact``),

book/security.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1846,7 +1846,8 @@ Utilities
18461846
---------
18471847

18481848
.. versionadded:: 2.2
1849-
The ``StringUtils`` and ``SecureRandom`` classes were added in Symfony 2.2
1849+
The ``StringUtils`` and ``SecureRandom`` classes were introduced in Symfony
1850+
2.2
18501851

18511852
The Symfony Security component comes with a collection of nice utilities related
18521853
to security. These utilities are used by Symfony, but you should also use

book/testing.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,8 +408,9 @@ Accessing internal Objects
408408
~~~~~~~~~~~~~~~~~~~~~~~~~~
409409

410410
.. versionadded:: 2.3
411-
The ``getInternalRequest()`` and ``getInternalResponse()`` method were
412-
added in Symfony 2.3.
411+
The :method:`Symfony\\Component\\BrowserKit\\Client::getInternalRequest`
412+
and :method:`Symfony\\Component\\BrowserKit\\Client::getInternalResponse`
413+
methods were introduced in Symfony 2.3.
413414

414415
If you use the client to test your application, you might want to access the
415416
client's internal objects::

book/translation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ texts* and complex expressions:
308308
template (in order to avoid side effects).
309309

310310
.. versionadded:: 2.1
311-
The ``trans_default_domain`` tag is new in Symfony 2.1
311+
The ``trans_default_domain`` tag was introduced in Symfony 2.1.
312312

313313
PHP Templates
314314
~~~~~~~~~~~~~

components/config/definition.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Numeric Node Constraints
112112
~~~~~~~~~~~~~~~~~~~~~~~~
113113

114114
.. versionadded:: 2.2
115-
The numeric (float and integer) nodes are new in 2.2
115+
The numeric (float and integer) nodes were introduced in Symfony 2.2.
116116

117117
Numeric nodes (float and integer) provide two extra constraints -
118118
:method:`Symfony\\Component\\Config\\Definition\\Builder::min` and
@@ -137,7 +137,7 @@ Enum Nodes
137137
~~~~~~~~~~
138138

139139
.. versionadded:: 2.1
140-
The enum node is new in Symfony 2.1
140+
The enum node was introduced in Symfony 2.1.
141141

142142
Enum nodes provide a constraint to match the given input against a set of
143143
values::
@@ -291,7 +291,8 @@ Optional Sections
291291
-----------------
292292

293293
.. versionadded:: 2.2
294-
The ``canBeEnabled`` and ``canBeDisabled`` methods are new in Symfony 2.2
294+
The ``canBeEnabled`` and ``canBeDisabled`` methods were introduced in
295+
Symfony 2.2.
295296

296297
If you have entire sections which are optional and can be enabled/disabled,
297298
you can take advantage of the shortcut

components/console/events.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Using Events
55
============
66

77
.. versionadded:: 2.3
8-
Console events were added in Symfony 2.3.
8+
Console events were introduced in Symfony 2.3.
99

1010
The Application class of the Console component allows you to optionally hook
1111
into the lifecycle of a console application via events. Instead of reinventing

components/debug.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ The Debug Component
88
The Debug component provides tools to ease debugging PHP code.
99

1010
.. versionadded:: 2.3
11-
The Debug component is new to Symfony 2.3. Previously, the classes were
12-
located in the HttpKernel component.
11+
The Debug component was introduced in Symfony 2.3. Previously, the classes
12+
were located in the HttpKernel component.
1313

1414
Installation
1515
------------

components/dependency_injection/compilation.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,8 @@ Prepending Configuration Passed to the Extension
277277
------------------------------------------------
278278

279279
.. versionadded:: 2.2
280-
The ability to prepend the configuration of a bundle is new in Symfony 2.2.
280+
The ability to prepend the configuration of a bundle was introduced in
281+
Symfony 2.2.
281282

282283
An Extension can prepend the configuration of any Bundle before the ``load()``
283284
method is called by implementing :class:`Symfony\\Component\\DependencyInjection\\Extension\\PrependExtensionInterface`::

components/dependency_injection/lazy_services.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Lazy Services
55
=============
66

77
.. versionadded:: 2.3
8-
Lazy services were added in Symfony 2.3.
8+
Lazy services were introduced in Symfony 2.3.
99

1010
Why lazy Services?
1111
------------------

components/filesystem.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ The Filesystem Component
77
The Filesystem component provides basic utilities for the filesystem.
88

99
.. versionadded:: 2.1
10-
The Filesystem component is new to Symfony 2.1. Previously, the ``Filesystem``
11-
class was located in the HttpKernel component.
10+
The Filesystem component was introduced in Symfony 2.1. Previously, the
11+
``Filesystem`` class was located in the HttpKernel component.
1212

1313
Installation
1414
------------
@@ -237,7 +237,7 @@ dumpFile
237237
~~~~~~~~
238238

239239
.. versionadded:: 2.3
240-
``dumpFile`` is new in Symfony 2.3.
240+
The ``dumpFile()`` was introduced in Symfony 2.3.
241241

242242
:method:`Symfony\\Component\\Filesystem\\Filesystem::dumpFile` allows you to
243243
dump contents to a file. It does this in an atomic manner: it writes a temporary

components/finder.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ Path
207207
~~~~
208208

209209
.. versionadded:: 2.2
210-
The ``path()`` and ``notPath()`` methods were added in version 2.2.
210+
The ``path()`` and ``notPath()`` methods were introduced in Symfony 2.2.
211211

212212
Restrict files and directories by path with the
213213
:method:`Symfony\\Component\\Finder\\Finder::path` method::

components/http_foundation/introduction.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,8 @@ by using the following methods:
251251
returns the list of accepted charsets ordered by descending quality.
252252

253253
.. versionadded:: 2.2
254-
The :class:`Symfony\\Component\\HttpFoundation\\AcceptHeader` class is new in Symfony 2.2.
254+
The :class:`Symfony\\Component\\HttpFoundation\\AcceptHeader` class was
255+
introduced in Symfony 2.2.
255256

256257
If you need to get full access to parsed data from ``Accept``, ``Accept-Language``,
257258
``Accept-Charset`` or ``Accept-Encoding``, you can use

components/process.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ The component takes care of the subtle differences between the different platfor
3737
when executing the command.
3838

3939
.. versionadded:: 2.2
40-
The ``getIncrementalOutput()`` and ``getIncrementalErrorOutput()`` methods were added in Symfony 2.2.
40+
The ``getIncrementalOutput()`` and ``getIncrementalErrorOutput()`` methods
41+
were introduced in Symfony 2.2.
4142

4243
The ``getOutput()`` method always return the whole content of the standard
4344
output of the command and ``getErrorOutput()`` the content of the error

components/property_access/introduction.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ The PropertyAccess Component
99
object or array using a simple string notation.
1010

1111
.. versionadded:: 2.2
12-
The PropertyAccess component is new to Symfony 2.2. Previously, the
13-
``PropertyPath`` class was located in the Form component.
12+
The PropertyAccess component was introduced in Symfony 2.2. Previously,
13+
the ``PropertyPath`` class was located in the Form component.
1414

1515
Installation
1616
------------
@@ -34,8 +34,8 @@ default configuration::
3434
$accessor = PropertyAccess::createPropertyAccessor();
3535

3636
.. versionadded:: 2.3
37-
Before Symfony 2.3, the :method:`Symfony\\Component\\PropertyAccess\\PropertyAccess::createPropertyAccessor`
38-
was called ``getPropertyAccessor()``.
37+
The :method:`Symfony\\Component\\PropertyAccess\\PropertyAccess::createPropertyAccessor`
38+
method was introduced in Symfony 2.3. Previously, it was called ``getPropertyAccessor()``.
3939

4040
Reading from Arrays
4141
-------------------

components/stopwatch.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ The Stopwatch Component
88
Stopwatch component provides a way to profile code.
99

1010
.. versionadded:: 2.2
11-
The Stopwatch component is new to Symfony 2.2. Previously, the ``Stopwatch``
12-
class was located in the HttpKernel component (and was new in 2.1).
11+
The Stopwatch component was introduced in Symfony 2.2. Previously, the
12+
``Stopwatch`` class was located in the HttpKernel component (and was introduced
13+
in Symfony 2.1).
1314

1415
Installation
1516
------------
@@ -36,7 +37,7 @@ microtime by yourself. Instead, use the simple
3637
$event = $stopwatch->stop('eventName');
3738

3839
The :class:`Symfony\\Component\\Stopwatch\\StopwatchEvent` object can be retrieved
39-
from the :method:`Symfony\\Component\\Stopwatch\\Stopwatch::start`,
40+
from the :method:`Symfony\\Component\\Stopwatch\\Stopwatch::start`,
4041
:method:`Symfony\\Component\\Stopwatch\\Stopwatch::stop` and
4142
:method:`Symfony\\Component\\Stopwatch\\Stopwatch::lap` methods.
4243

components/translation/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ Loader too. The default loaders are:
9090

9191
.. versionadded:: 2.1
9292
The ``IcuDatFileLoader``, ``IcuResFileLoader``, ``IniFileLoader``,
93-
``MofileLoader``, ``PoFileLoader`` and ``QtFileLoader`` were added in
94-
Symfony 2.1
93+
``MofileLoader``, ``PoFileLoader`` and ``QtFileLoader`` were introduced
94+
in Symfony 2.1.
9595

9696
All file loaders require the :doc:`Config component </components/config/index>`.
9797

cookbook/console/logging.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ To get your console application to automatically log uncaught exceptions for
7373
all of your commands, you can use :doc:`console events</components/console/events>`.
7474

7575
.. versionadded:: 2.3
76-
Console events were added in Symfony 2.3.
76+
Console events were introduced in Symfony 2.3.
7777

7878
First configure a listener for console exception events in the service container:
7979

cookbook/console/sending_emails.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Configuring the Request Context globally
2121
----------------------------------------
2222

2323
.. versionadded: 2.2
24-
The ``base_url`` parameter is available since Symfony 2.2
24+
The ``base_url`` parameter was introduced in Symfony 2.2.
2525
2626
To configure the Request Context - which is used by the URL Generator - you can
2727
redefine the parameters it uses as default values to change the default host
@@ -98,14 +98,14 @@ the queue yourself. Use the following code to send emails inside your
9898
console command::
9999

100100
$message = new \Swift_Message();
101-
101+
102102
// ... prepare the message
103-
103+
104104
$container = $this->getContainer();
105105
$mailer = $container->get('mailer');
106-
106+
107107
$mailer->send($message);
108-
108+
109109
// now manually flush the queue
110110
$spool = $mailer->getTransport()->getSpool();
111111
$transport = $container->get('swiftmailer.transport.real');

cookbook/form/dynamic_form_modification.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -518,8 +518,8 @@ On a form, we can usually listen to the following events:
518518
* ``POST_SUBMIT``
519519

520520
.. versionadded:: 2.3
521-
The events ``PRE_SUBMIT``, ``SUBMIT`` and ``POST_SUBMIT`` were added in
522-
Symfony 2.3. Before, they were named ``PRE_BIND``, ``BIND`` and ``POST_BIND``.
521+
The events ``PRE_SUBMIT``, ``SUBMIT`` and ``POST_SUBMIT`` were introduced
522+
in Symfony 2.3. Before, they were named ``PRE_BIND``, ``BIND`` and ``POST_BIND``.
523523

524524
.. versionadded:: 2.2.6
525525
The behavior of the ``POST_SUBMIT`` event changed slightly in 2.2.6, which the

cookbook/form/inherit_data_option.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ How to Reduce Code Duplication with "inherit_data"
55
==================================================
66

77
.. versionadded:: 2.3
8-
This ``inherit_data`` option was known as ``virtual`` before Symfony 2.3.
8+
This ``inherit_data`` option was introduced in Symfony 2.3. Before, it
9+
was known as ``virtual``.
910

1011
The ``inherit_data`` form field option can be very useful when you have some
1112
duplicated fields in different entities. For example, imagine you have two

cookbook/service_container/scopes.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Using a synchronized Service
9999
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
100100

101101
.. versionadded:: 2.3
102-
Synchronized services are new in Symfony 2.3.
102+
Synchronized services were introduced in Symfony 2.3.
103103

104104
Injecting the container or setting your service to a narrower scope have
105105
drawbacks. For synchronized services (like the ``request``), using setter

cookbook/templating/render_without_controller.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Caching the static Template
7979

8080
.. versionadded:: 2.2
8181
The ability to cache templates rendered via ``FrameworkBundle:Template:template``
82-
is new in Symfony 2.2.
82+
was introduced in Symfony 2.2.
8383

8484
Since templates that are rendered in this way are typically static, it might
8585
make sense to cache them. Fortunately, this is easy! By configuring a few

reference/configuration/framework.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ http_method_override
6262
~~~~~~~~~~~~~~~~~~~~
6363

6464
.. versionadded:: 2.3
65-
The ``http_method_override`` option is new in Symfony 2.3.
65+
The ``http_method_override`` option was introduced in Symfony 2.3.
6666

6767
**type**: ``Boolean`` **default**: ``true``
6868

@@ -422,10 +422,10 @@ enabled
422422
The profiler can be disabled by setting this key to ``false``.
423423

424424
.. versionadded:: 2.3
425-
426-
The ``collect`` option is new in Symfony 2.3. Previously, when ``profiler.enabled``
427-
was false, the profiler *was* actually enabled, but the collectors were
428-
disabled. Now the profiler and collectors can be controller independently.
425+
The ``collect`` option was introduced in Symfony 2.3. Previously, when
426+
``profiler.enabled`` was ``false``, the profiler *was* actually enabled,
427+
but the collectors were disabled. Now, the profiler and the collectors
428+
can be controlled independently.
429429

430430
collect
431431
.......

reference/constraints/CardScheme.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ CardScheme
22
==========
33

44
.. versionadded:: 2.2
5-
The CardScheme validation is new in Symfony 2.2.
5+
The ``CardScheme`` constraint was introduced in Symfony 2.2.
66

77
This constraint ensures that a credit card number is valid for a given credit card
88
company. It can be used to validate the number before trying to initiate a payment

reference/constraints/Currency.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Currency
22
========
33

44
.. versionadded:: 2.3
5-
This constraint is new in version 2.3.
5+
The ``Currency`` constraint was introduced in Symfony 2.3.
66

77
Validates that a value is a valid `3-letter ISO 4217`_ currency name.
88

reference/constraints/EqualTo.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ EqualTo
22
=======
33

44
.. versionadded:: 2.3
5-
This constraint is new in version 2.3.
5+
The ``EqualTo`` constraint was introduced in Symfony 2.3.
66

77
Validates that a value is equal to another value, defined in the options. To
88
force that a value is *not* equal, see :doc:`/reference/constraints/NotEqualTo`.

reference/constraints/GreaterThan.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ GreaterThan
22
===========
33

44
.. versionadded:: 2.3
5-
This constraint is new in version 2.3.
5+
The ``GreaterThan`` constraint was introduced in Symfony 2.3.
66

77
Validates that a value is greater than another value, defined in the options. To
88
force that a value is greater than or equal to another value, see

reference/constraints/GreaterThanOrEqual.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ GreaterThanOrEqual
22
==================
33

44
.. versionadded:: 2.3
5-
This constraint is new in version 2.3.
5+
The ``GreaterThanOrEqual`` constraint was introduced in Symfony 2.3.
66

77
Validates that a value is greater than or equal to another value, defined in
88
the options. To force that a value is greater than another value, see

reference/constraints/IdenticalTo.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ IdenticalTo
22
===========
33

44
.. versionadded:: 2.3
5-
This constraint is new in version 2.3.
5+
The ``IdenticalTo`` constraint was introduced in Symfony 2.3.
66

77
Validates that a value is identical to another value, defined in the options.
88
To force that a value is *not* identical, see

0 commit comments

Comments
 (0)