Merge branch '2.4'

weaverryan · weaverryan · commit c703549b2317 · 2014-03-25T22:30:09.000-04:00
diff --git a/book/controller.rst b/book/controller.rst
@@ -398,7 +398,7 @@ itself.
     via the ``container`` property.
 
 .. versionadded:: 2.4
-    The ``ContainerAwareTrait`` is new in Symfony 2.4.
+    The ``ContainerAwareTrait`` was introduced in Symfony 2.4.
 
 .. note::
 
@@ -766,7 +766,7 @@ headers and content that's sent back to the client::
     $response->headers->set('Content-Type', 'application/json');
 
 .. versionadded:: 2.4
-    Support for HTTP status code constants was added in Symfony 2.4.
+    Support for HTTP status code constants was introduced in Symfony 2.4.
 
 .. tip::
 
diff --git a/book/from_flat_php_to_symfony2.rst b/book/from_flat_php_to_symfony2.rst
@@ -481,7 +481,7 @@ the HTTP response being returned. Use them to improve the blog:
     $response->send();
 
 .. versionadded:: 2.4
-    Support for HTTP status code constants was added in Symfony 2.4.
+    Support for HTTP status code constants was introduced in Symfony 2.4.
 
 The controllers are now responsible for returning a ``Response`` object.
 To make this easier, you can add a new ``render_template()`` function, which,
diff --git a/book/http_cache.rst b/book/http_cache.rst
@@ -1082,7 +1082,7 @@ Here is how you can configure the Symfony2 reverse proxy to support the
     }
 
 .. versionadded:: 2.4
-    Support for HTTP status code constants was added in Symfony 2.4.
+    Support for HTTP status code constants was introduced in Symfony 2.4.
 
 .. caution::
 
diff --git a/book/http_fundamentals.rst b/book/http_fundamentals.rst
@@ -285,7 +285,7 @@ interface to construct the response that needs to be returned to the client::
     $response->send();
 
 .. versionadded:: 2.4
-    Support for HTTP status code constants was added in Symfony 2.4.
+    Support for HTTP status code constants was introduced in Symfony 2.4.
 
 If Symfony offered nothing else, you would already have a toolkit for easily
 accessing request information and an object-oriented interface for creating
diff --git a/book/internals.rst b/book/internals.rst
@@ -427,7 +427,7 @@ and set a new ``Exception`` object, or do nothing::
         );
 
     .. versionadded:: 2.4
-        Support for HTTP status code constants was added in Symfony 2.4.
+        Support for HTTP status code constants was introduced in Symfony 2.4.
 
 .. seealso::
 
diff --git a/book/service_container.rst b/book/service_container.rst
@@ -836,7 +836,7 @@ Injecting the Request
 ~~~~~~~~~~~~~~~~~~~~~
 
 .. versionadded:: 2.4
-    The ``request_stack`` service was introduced in version 2.4.
+    The ``request_stack`` service was introduced in Symfony 2.4.
 
 As of Symfony 2.4, instead of injecting the ``request`` service, you should
 inject the ``request_stack`` service and access the ``Request`` by calling
diff --git a/book/testing.rst b/book/testing.rst
@@ -311,7 +311,7 @@ document::
         $this->assertTrue($client->getResponse()->isRedirect());
 
     .. versionadded:: 2.4
-        Support for HTTP status code constants was added with Symfony 2.4.
+        Support for HTTP status code constants was introduced in Symfony 2.4.
 
 .. index::
    single: Tests; Client
diff --git a/components/console/helpers/progresshelper.rst b/components/console/helpers/progresshelper.rst
@@ -8,7 +8,7 @@ Progress Helper
     The ``setCurrent`` method was introduced in Symfony 2.3.
 
 .. versionadded:: 2.4
-    The ``clear`` method was added in Symfony 2.4.
+    The ``clear`` method was introduced in Symfony 2.4.
 
 .. caution::
 
diff --git a/components/console/helpers/tablehelper.rst b/components/console/helpers/tablehelper.rst
@@ -40,7 +40,7 @@ Customize Table Layout using Named Layouts
 ------------------------------------------
 
 .. versionadded:: 2.4
-    The ``TableHelper::LAYOUT_COMPACT`` layout was added in Symfony 2.4.
+    The ``TableHelper::LAYOUT_COMPACT`` layout was introduced in Symfony 2.4.
 
 The Table helper ships with three preconfigured table layouts:
 
diff --git a/components/console/introduction.rst b/components/console/introduction.rst
@@ -203,7 +203,7 @@ level. For example::
    :method:`Symfony\\Component\\Console\\Output\\Output::isVerbose`,
    :method:`Symfony\\Component\\Console\\Output\\Output::isVeryVerbose` and
    :method:`Symfony\\Component\\Console\\Output\\Output::isDebug`
-   methods were introduced in version 2.4
+   methods were introduced in Symfony 2.4
 
 There are also more semantic methods you can use to test for each of the
 verbosity levels::
diff --git a/components/debug/class_loader.rst b/components/debug/class_loader.rst
@@ -6,8 +6,8 @@ Debugging a Class Loader
 ========================
 
 .. versionadded:: 2.4
-    The ``DebugClassLoader`` of the Debug component is new in Symfony 2.4.
-    Previously, it was located in the Class Loader component.
+    The ``DebugClassLoader`` of the Debug component was introduced in Symfony 2.4.
+    Previously, it was located in the ClassLoader component.
 
 The :class:`Symfony\\Component\\Debug\\DebugClassLoader` attempts to
 throw more helpful exceptions when a class isn't found by the registered
diff --git a/components/dom_crawler.rst b/components/dom_crawler.rst
@@ -449,7 +449,7 @@ Selecting Invalid Choice Values
 
 .. versionadded:: 2.4
     The :method:`Symfony\\Component\\DomCrawler\\Form::disableValidation`
-    method was added in Symfony 2.4.
+    method was introduced in Symfony 2.4.
 
 By default, choice fields (select, radio) have internal validation activated
 to prevent you from setting invalid values. If you want to be able to set
diff --git a/components/event_dispatcher/introduction.rst b/components/event_dispatcher/introduction.rst
@@ -442,7 +442,7 @@ EventDispatcher aware Events and Listeners
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. versionadded:: 2.4
-    Since Symfony 2.4 the current event name and the ``EventDispatcher``
+    Since Symfony 2.4, the current event name and the ``EventDispatcher``
     itself are passed to the listeners as additional arguments.
 
 The ``EventDispatcher`` always passes the dispatched event, the event's name
diff --git a/components/filesystem.rst b/components/filesystem.rst
@@ -32,8 +32,8 @@ endpoint for filesystem operations::
     }
 
 .. versionadded:: 2.4
-    The ``IOExceptionInterface`` and its ``getPath`` method are new in Symfony
-    2.4. Prior to 2.4, you would catch the ``IOException`` class.
+    The ``IOExceptionInterface`` and its ``getPath`` method were introduced in
+    Symfony 2.4. Prior to 2.4, you would catch the ``IOException`` class.
 
 .. note::
 
diff --git a/components/http_foundation/introduction.rst b/components/http_foundation/introduction.rst
@@ -254,7 +254,7 @@ by using the following methods:
   returns the list of accepted charsets ordered by descending quality;
 
   .. versionadded:: 2.4
-      The ``getEncodings()`` method was added in Symfony 2.4.
+      The ``getEncodings()`` method was introduced in Symfony 2.4.
 
 If you need to get full access to parsed data from ``Accept``, ``Accept-Language``,
 ``Accept-Charset`` or ``Accept-Encoding``, you can use
@@ -286,7 +286,7 @@ Overriding the Request
 
 .. versionadded:: 2.4
     The :method:`Symfony\\Component\\HttpFoundation\\Request::setFactory`
-    method was added in Symfony 2.4.
+    method was introduced in Symfony 2.4.
 
 The ``Request`` class should not be overridden as it is a data object that
 represents an HTTP message. But when moving from a legacy system, adding
@@ -336,7 +336,7 @@ code, and an array of HTTP headers::
     );
 
 .. versionadded:: 2.4
-    Support for HTTP status code constants was added in Symfony 2.4.
+    Support for HTTP status code constants was introduced in Symfony 2.4.
 
 These information can also be manipulated after the Response object creation::
 
diff --git a/components/process.rst b/components/process.rst
@@ -43,7 +43,7 @@ and :method:`Symfony\\Component\\Process\\Process::getIncrementalErrorOutput`
 methods returns the new outputs since the last call.
 
 .. versionadded:: 2.4
-    The ``clearOutput()`` and ``clearErrorOutput()`` methods were added in Symfony 2.4.
+    The ``clearOutput()`` and ``clearErrorOutput()`` methods were introduced in Symfony 2.4.
 
 The :method:`Symfony\\Component\\Process\\Process::clearOutput` method clears
 the contents of the output and
diff --git a/cookbook/console/commands_as_services.rst b/cookbook/console/commands_as_services.rst
@@ -6,7 +6,7 @@ How to Define Commands as Services
 
 .. versionadded:: 2.4
    Support for registering commands in the service container was introduced in
-   version 2.4.
+   Symfony 2.4.
 
 By default, Symfony will take a look in the ``Command`` directory of each
 bundle and automatically register your commands. If a command extends the
diff --git a/cookbook/console/console_command.rst b/cookbook/console/console_command.rst
@@ -128,8 +128,8 @@ instead of
 
 .. versionadded:: 2.4
     Since Symfony 2.4, the ``CommandTester`` automatically detects the name of
-    the command to execute. Thus, you don't need to pass it via the ``command``
-    key anymore.
+    the command to execute. Prior to Symfony 2.4, you need to pass it via the
+    ``command`` key.
 
 .. note::
 
diff --git a/cookbook/logging/channels_handlers.rst b/cookbook/logging/channels_handlers.rst
@@ -114,9 +114,9 @@ specified.
 Configure Additional Channels without Tagged Services
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. versionadded:: 2.3
-    This feature was introduced to the MonologBundle in version 2.4, which
-    was first packaged with Symfony at version 2.4.
+.. versionadded:: 2.4
+    This feature was introduced to the MonologBundle 2.4, which was first
+    packaged with Symfony 2.4.
 
 With MonologBundle 2.4 you can configure additional channels without the
 need to tag your services:
diff --git a/cookbook/logging/monolog_regex_based_excludes.rst b/cookbook/logging/monolog_regex_based_excludes.rst
@@ -7,8 +7,8 @@ How to Configure Monolog to Exclude 404 Errors from the Log
 ===========================================================
 
 .. versionadded:: 2.4
-    This feature was introduced to the MonologBundle in version 2.4, which
-    was first packaged with Symfony at version 2.4.
+    This feature was introduced to the MonologBundle 2.4, which was first
+    packaged with Symfony 2.4.
 
 Sometimes your logs become flooded with unwanted 404 HTTP errors, for example,
 when an attacker scans your app for some well-known application paths (e.g.
diff --git a/cookbook/security/api_key_authentication.rst b/cookbook/security/api_key_authentication.rst
@@ -12,7 +12,7 @@ The API Key Authenticator
 -------------------------
 
 .. versionadded:: 2.4
-    The ``SimplePreAuthenticatorInterface`` interface was added in Symfony 2.4.
+    The ``SimplePreAuthenticatorInterface`` interface was introduced in Symfony 2.4.
 
 Authenticating a user based on the Request information should be done via a
 pre-authentication mechanism. The :class:`Symfony\\Component\\Security\\Core\\Authentication\\SimplePreAuthenticatorInterface`
diff --git a/cookbook/security/custom_authentication_provider.rst b/cookbook/security/custom_authentication_provider.rst
@@ -175,7 +175,7 @@ set an authenticated token in the security context if successful.
     }
 
 .. versionadded:: 2.4
-    Support for HTTP status code constants was added in Symfony 2.4.
+    Support for HTTP status code constants was introduced in Symfony 2.4.
 
 This listener checks the request for the expected ``X-WSSE`` header, matches
 the value returned for the expected WSSE information, creates a token using
diff --git a/cookbook/security/custom_password_authenticator.rst b/cookbook/security/custom_password_authenticator.rst
@@ -13,7 +13,7 @@ The Password Authenticator
 --------------------------
 
 .. versionadded:: 2.4
-    The ``SimpleFormAuthenticatorInterface`` interface was added in Symfony 2.4.
+    The ``SimpleFormAuthenticatorInterface`` interface was introduced in Symfony 2.4.
 
 First, create a new class that implements
 :class:`Symfony\\Component\\Security\\Core\\Authentication\\SimpleFormAuthenticatorInterface`.
diff --git a/cookbook/service_container/event_listener.rst b/cookbook/service_container/event_listener.rst
@@ -52,7 +52,7 @@ event is just one of the core kernel events::
     }
 
 .. versionadded:: 2.4
-    Support for HTTP status code constants was added in Symfony 2.4.
+    Support for HTTP status code constants was introduced in Symfony 2.4.
 
 .. tip::
 
diff --git a/cookbook/session/limit_metadata_writes.rst b/cookbook/session/limit_metadata_writes.rst
@@ -5,7 +5,7 @@ Limit Session Metadata Writes
 =============================
 
 .. versionadded:: 2.4
-    The ability to limit session metadata writes was added in Symfony 2.4.
+    The ability to limit session metadata writes was introduced in Symfony 2.4.
 
 The default behavior of PHP session is to persist the session regardless of
 whether the session data has changed or not. In Symfony, each time the session
diff --git a/cookbook/testing/insulating_clients.rst b/cookbook/testing/insulating_clients.rst
@@ -19,7 +19,7 @@ chat for instance), create several clients::
     $this->assertRegExp('/Hello/', $sally->getResponse()->getContent());
 
 .. versionadded:: 2.4
-    Support for HTTP status code constants was added in Symfony 2.4.
+    Support for HTTP status code constants was introduced in Symfony 2.4.
 
 This works except when your code maintains a global state or if it depends on
 a third-party library that has some kind of global state. In such a case, you
diff --git a/reference/constraints/Image.rst b/reference/constraints/Image.rst
@@ -9,7 +9,7 @@ Additionally it has options so you can validate against the width and height
 of the image.
 
 .. versionadded:: 2.4
-    As of Symfony 2.4 you can also validate against the image aspect ratio
+    As of Symfony 2.4, you can also validate against the image aspect ratio
     (defined as ``width / height``) and selectively allow square, landscape
     and portrait image orientations.
 
diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst
@@ -247,8 +247,8 @@ console.command
 ---------------
 
 .. versionadded:: 2.4
-   Support for registering commands in the service container was added in
-   version 2.4.
+   Support for registering commands in the service container was introduced in
+   Symfony 2.4.
 
 **Purpose**: Add a command to the application
 
diff --git a/reference/forms/twig_reference.rst b/reference/forms/twig_reference.rst
@@ -317,7 +317,7 @@ object:
     The ``method`` and ``action`` variables were introduced in Symfony 2.3.
 
 .. versionadded:: 2.4
-    The ``submitted`` variable was added in Symfony 2.4.
+    The ``submitted`` variable was introduced in Symfony 2.4.
 
 +------------------------+-------------------------------------------------------------------------------------+
 | Variable               | Usage                                                                               |
diff --git a/reference/twig_reference.rst b/reference/twig_reference.rst
@@ -137,7 +137,7 @@ Tags
 ----
 
 .. versionadded:: 2.4
-    The stopwatch tag was added in Symfony 2.4.
+    The stopwatch tag was introduced in Symfony 2.4.
 
 +---------------------------------------------------+--------------------------------------------------------------------+
 | Tag Syntax                                        | Usage                                                              |

Original file line number	Diff line number	Diff line change
`@@ -1082,7 +1082,7 @@ Here is how you can configure the Symfony2 reverse proxy to support the`
`1082`	`1082`	`}`
`1083`	`1083`
`1084`	`1084`	`.. versionadded:: 2.4`
`1085`		`- Support for HTTP status code constants was added in Symfony 2.4.`
	`1085`	`+ Support for HTTP status code constants was introduced in Symfony 2.4.`
`1086`	`1086`
`1087`	`1087`	`.. caution::`
`1088`	`1088`