Merge branch '2.3' into 2.4

weaverryan · weaverryan · commit a849123c7cd8 · 2014-03-25T22:25:30.000-04:00
Conflicts:
	book/templating.rst
	components/class_loader/cache_class_loader.rst
	components/class_loader/class_loader.rst
	components/class_loader/debug_class_loader.rst
	components/event_dispatcher/immutable_dispatcher.rst
	components/process.rst
	reference/constraints/Regex.rst
	reference/constraints/UniqueEntity.rst
	reference/twig_reference.rst
diff --git a/book/forms.rst b/book/forms.rst
@@ -130,7 +130,7 @@ other things, determines which HTML form tag(s) is rendered for that field.
 Finally, you added a submit button for submitting the form to the server.
 
 .. versionadded:: 2.3
-    Support for submit buttons was added in Symfony 2.3. Before that, you had
+    Support for submit buttons was introduced in Symfony 2.3. Before that, you had
     to add buttons to the form's HTML manually.
 
 Symfony2 comes with many built-in types that will be discussed shortly
@@ -278,7 +278,7 @@ Submitting Forms with Multiple Buttons
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. versionadded:: 2.3
-    Support for buttons in forms was added in Symfony 2.3.
+    Support for buttons in forms was introduced in Symfony 2.3.
 
 When your form contains more than one submit button, you will want to check
 which of the buttons was clicked to adapt the program flow in your controller.
@@ -478,7 +478,7 @@ Disabling Validation
 ~~~~~~~~~~~~~~~~~~~~
 
 .. versionadded:: 2.3
-    The ability to set ``validation_groups`` to false was added in Symfony 2.3.
+    The ability to set ``validation_groups`` to false was introduced in Symfony 2.3.
 
 Sometimes it is useful to suppress the validation of a form altogether. For
 these cases you can set the ``validation_groups`` option to ``false``::
@@ -548,7 +548,7 @@ Groups based on the Clicked Button
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. versionadded:: 2.3
-    Support for buttons in forms was added in Symfony 2.3.
+    Support for buttons in forms was introduced in Symfony 2.3.
 
 When your form contains multiple submit buttons, you can change the validation
 group depending on which button is used to submit the form. For example,
diff --git a/book/routing.rst b/book/routing.rst
@@ -721,7 +721,7 @@ Adding a Host Requirement
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. versionadded:: 2.2
-    Host matching support was added in Symfony 2.2
+    Host matching support was introduced in Symfony 2.2
 
 You can also match on the HTTP *host* of the incoming request. For more
 information, see :doc:`/components/routing/hostname_pattern` in the Routing
@@ -1165,7 +1165,7 @@ Adding a Host requirement to Imported Routes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. versionadded:: 2.2
-    Host matching support was added in Symfony 2.2
+    Host matching support was introduced in Symfony 2.2
 
 You can set the host regex on imported routes. For more information, see
 :ref:`component-routing-host-imported`.
diff --git a/book/templating.rst b/book/templating.rst
@@ -376,7 +376,7 @@ Template Naming and Locations
 -----------------------------
 
 .. versionadded:: 2.2
-    Namespaced path support was added in 2.2, allowing for template names
+    Namespaced path support was introduced in 2.2, allowing for template names
     like ``@AcmeDemo/layout.html.twig``. See :doc:`/cookbook/templating/namespaced_paths`
     for more details.
 
@@ -783,7 +783,7 @@ in your application configuration:
         ));
 
 .. versionadded:: 2.2
-    Default templates per render function was added in Symfony 2.2
+    Default templates per render function was introduced in Symfony 2.2
 
 You can define default templates per ``render`` function (which will override
 any global default template that is defined):
diff --git a/components/console/helpers/dialoghelper.rst b/components/console/helpers/dialoghelper.rst
@@ -60,7 +60,7 @@ Autocompletion
 ~~~~~~~~~~~~~~
 
 .. versionadded:: 2.2
-    Autocompletion for questions was added in Symfony 2.2.
+    Autocompletion for questions was introduced in Symfony 2.2.
 
 You can also specify an array of potential answers for a given question. These
 will be autocompleted as the user types::
@@ -78,7 +78,7 @@ Hiding the User's Response
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. versionadded:: 2.2
-    The ``askHiddenResponse`` method was added in Symfony 2.2.
+    The ``askHiddenResponse`` method was introduced in Symfony 2.2.
 
 You can also ask a question and hide the response. This is particularly
 convenient for passwords::
@@ -148,7 +148,7 @@ Validating a Hidden Response
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. versionadded:: 2.2
-    The ``askHiddenResponseAndValidate`` method was added in Symfony 2.2.
+    The ``askHiddenResponseAndValidate`` method was introduced in Symfony 2.2.
 
 You can also ask and validate a hidden response::
 
@@ -176,7 +176,7 @@ Let the user choose from a list of Answers
 
 .. versionadded:: 2.2
     The :method:`Symfony\\Component\\Console\\Helper\\DialogHelper::select` method
-    was added in Symfony 2.2.
+    was introduced in Symfony 2.2.
 
 If you have a predefined set of answers the user can choose from, you
 could use the ``ask`` method described above or, to make sure the user
@@ -211,7 +211,7 @@ argument). The default value for the attempts is ``false``, which means infinite
 attempts. You can define your own error message in the sixth argument.
 
 .. versionadded:: 2.3
-    Multiselect support was added in Symfony 2.3.
+    Multiselect support was introduced in Symfony 2.3.
 
 Multiple Choices
 ................
diff --git a/components/console/helpers/progresshelper.rst b/components/console/helpers/progresshelper.rst
@@ -5,10 +5,10 @@ Progress Helper
 ===============
 
 .. versionadded:: 2.2
-    The ``progress`` helper was added in Symfony 2.2.
+    The ``progress`` helper was introduced in Symfony 2.2.
 
 .. versionadded:: 2.3
-    The ``setCurrent`` method was added in Symfony 2.3.
+    The ``setCurrent`` method was introduced in Symfony 2.3.
 
 .. versionadded:: 2.4
     The ``clear`` method was added in Symfony 2.4.
diff --git a/components/console/helpers/tablehelper.rst b/components/console/helpers/tablehelper.rst
@@ -5,7 +5,7 @@ Table Helper
 ============
 
 .. versionadded:: 2.3
-    The ``table`` helper was added in Symfony 2.3.
+    The ``table`` helper was introduced in Symfony 2.3.
 
 When building a console application it may be useful to display tabular data:
 
diff --git a/components/finder.rst b/components/finder.rst
@@ -83,7 +83,7 @@ Search in several locations by chaining calls to
     $finder->files()->in(__DIR__)->in('/elsewhere');
 
 .. versionadded:: 2.2
-   Wildcard support was added in version 2.2.
+   Wildcard support was introduced in version 2.2.
 
 Use wildcard characters to search in the directories matching a pattern::
 
@@ -98,7 +98,7 @@ Exclude directories from matching with the
 
 .. versionadded:: 2.3
    The :method:`Symfony\\Component\\Finder\\Finder::ignoreUnreadableDirs`
-   method was added in Symfony 2.3.
+   method was introduced in Symfony 2.3.
 
 It's also possible to ignore directories that you don't have permission to read::
 
diff --git a/components/form/introduction.rst b/components/form/introduction.rst
@@ -67,7 +67,7 @@ Request Handling
 ~~~~~~~~~~~~~~~~
 
 .. versionadded:: 2.3
-    The ``handleRequest()`` method was added in Symfony 2.3.
+    The ``handleRequest()`` method was introduced in Symfony 2.3.
 
 To process form data, you'll need to call the :method:`Symfony\\Component\\Form\\Form::handleRequest`
 method::
diff --git a/components/http_foundation/introduction.rst b/components/http_foundation/introduction.rst
@@ -495,7 +495,7 @@ abstracts the hard work behind a simple API::
 
 .. versionadded:: 2.2
     The :class:`Symfony\\Component\\HttpFoundation\\BinaryFileResponse`
-    class was added in Symfony 2.2.
+    class was introduced in Symfony 2.2.
 
 Alternatively, if you are serving a static file, you can use a
 :class:`Symfony\\Component\\HttpFoundation\\BinaryFileResponse`::
diff --git a/components/intl.rst b/components/intl.rst
@@ -9,8 +9,7 @@ The Intl Component
     access to the localization data of the `ICU library`_.
 
 .. versionadded:: 2.3
-
-    The Intl component was added in Symfony 2.3. In earlier versions of Symfony,
+    The Intl component was introduced in Symfony 2.3. In earlier versions of Symfony,
     you should use the Locale component instead.
 
 .. caution::
diff --git a/components/process.rst b/components/process.rst
@@ -117,7 +117,7 @@ Stopping a Process
 ------------------
 
 .. versionadded:: 2.3
-    The ``signal`` parameter of the ``stop`` method was added in Symfony 2.3.
+    The ``signal`` parameter of the ``stop`` method was introduced in Symfony 2.3.
 
 Any asynchronous process can be stopped at any time with the
 :method:`Symfony\\Component\\Process\\Process::stop` method. This method takes
@@ -157,7 +157,7 @@ To make your code work better on all platforms, you might want to use the
 
 .. versionadded:: 2.3
     The :method:`ProcessBuilder::setPrefix<Symfony\\Component\\Process\\ProcessBuilder::setPrefix>`
-    method was added in Symfony 2.3.
+    method was introduced in Symfony 2.3.
 
 In case you are building a binary driver, you can use the
 :method:`Symfony\\Component\\Process\\Process::setPrefix` method to prefix all
@@ -238,7 +238,7 @@ Process Signals
 ---------------
 
 .. versionadded:: 2.3
-    The ``signal`` method was added in Symfony 2.3.
+    The ``signal`` method was introduced in Symfony 2.3.
 
 When running a program asynchronously, you can send it posix signals with the
 :method:`Symfony\\Component\\Process\\Process::signal` method::
@@ -264,7 +264,7 @@ Process Pid
 -----------
 
 .. versionadded:: 2.3
-    The ``getPid`` method was added in Symfony 2.3.
+    The ``getPid`` method was introduced in Symfony 2.3.
 
 You can access the `pid`_ of a running process with the
 :method:`Symfony\\Component\\Process\\Process::getPid` method.
diff --git a/components/property_access/introduction.rst b/components/property_access/introduction.rst
@@ -216,7 +216,7 @@ enable this feature by using :class:`Symfony\\Component\\PropertyAccess\\Propert
     echo $accessor->getValue($person, 'wouter'); // array(...)
 
 .. versionadded:: 2.3
-    The use of magic ``__call()`` method was added in Symfony 2.3.
+    The use of magic ``__call()`` method was introduced in Symfony 2.3.
 
 .. caution::
 
diff --git a/components/routing/hostname_pattern.rst b/components/routing/hostname_pattern.rst
@@ -5,7 +5,7 @@ How to match a route based on the Host
 ======================================
 
 .. versionadded:: 2.2
-    Host matching support was added in Symfony 2.2
+    Host matching support was introduced in Symfony 2.2
 
 You can also match on the HTTP *host* of the incoming request.
 
diff --git a/components/routing/introduction.rst b/components/routing/introduction.rst
@@ -94,7 +94,7 @@ A full route definition can contain up to seven parts:
    ``GET``, ``POST``, ...).
 
 .. versionadded:: 2.2
-    Host matching support was added in Symfony 2.2
+    Host matching support was introduced in Symfony 2.2
 
 Take the following route, which combines several of these ideas::
 
diff --git a/components/security/authorization.rst b/components/security/authorization.rst
@@ -142,7 +142,7 @@ method::
 
     $roleVoter = new RoleVoter('ROLE_');
 
-    $roleVoter->vote($token, $object, 'ROLE_ADMIN');
+    $roleVoter->vote($token, $object, array('ROLE_ADMIN'));
 
 RoleHierarchyVoter
 ~~~~~~~~~~~~~~~~~~
diff --git a/components/serializer.rst b/components/serializer.rst
@@ -108,7 +108,7 @@ Ignoring Attributes when Serializing
 
 .. versionadded:: 2.3
     The :method:`GetSetMethodNormalizer::setIgnoredAttributes<Symfony\\Component\\Serializer\\Normalizer\\GetSetMethodNormalizer::setIgnoredAttributes>`
-    method was added in Symfony 2.3.
+    method was introduced in Symfony 2.3.
 
 As an option, there's a way to ignore attributes from the origin object when
 serializing. To remove those attributes use the
@@ -153,7 +153,7 @@ Using Camelized Method Names for Underscored Attributes
 
 .. versionadded:: 2.3
     The :method:`GetSetMethodNormalizer::setCamelizedAttributes<Symfony\\Component\\Serializer\\Normalizer\\GetSetMethodNormalizer::setCamelizedAttributes>`
-    method was added in Symfony 2.3.
+    method was introduced in Symfony 2.3.
 
 Sometimes property names from the serialized content are underscored (e.g.
 ``first_name``).  Normally, these attributes will use get/set methods like
diff --git a/cookbook/doctrine/mapping_model_classes.rst b/cookbook/doctrine/mapping_model_classes.rst
@@ -17,7 +17,7 @@ register the mappings for your model classes.
     just to get the auto mapping, use the compiler pass.
 
 .. versionadded:: 2.3
-    The base mapping compiler pass was added in Symfony 2.3. The Doctrine bundles
+    The base mapping compiler pass was introduced in Symfony 2.3. The Doctrine bundles
     support it from DoctrineBundle >= 1.2.1, MongoDBBundle >= 3.0.0,
     PHPCRBundle >= 1.0.0-alpha2 and the (unversioned) CouchDBBundle supports the
     compiler pass since the `CouchDB Mapping Compiler Pass pull request`_
diff --git a/cookbook/form/direct_submit.rst b/cookbook/form/direct_submit.rst
@@ -6,7 +6,7 @@ How to use the submit() Function to handle Form Submissions
 
 .. versionadded:: 2.3
     The :method:`Symfony\\Component\\Form\\FormInterface::handleRequest`
-    method was added in Symfony 2.3.
+    method was introduced in Symfony 2.3.
 
 With the ``handleRequest()`` method, it is really easy to handle form
 submissions::
diff --git a/cookbook/form/dynamic_form_modification.rst b/cookbook/form/dynamic_form_modification.rst
@@ -132,7 +132,7 @@ the event listener might look like the following::
 .. versionadded:: 2.2
     The ability to pass a string into
     :method:`FormInterface::add <Symfony\\Component\\Form\\FormInterface::add>`
-    was added in Symfony 2.2.
+    was introduced in Symfony 2.2.
 
 .. note::
     You can of course use any callback type instead of a closure, e.g. a method
diff --git a/cookbook/security/entity_provider.rst b/cookbook/security/entity_provider.rst
@@ -800,4 +800,4 @@ or worry about it.
 
 .. versionadded:: 2.1
     In Symfony 2.1, the ``equals`` method was removed from ``UserInterface``
-    and the ``EquatableInterface`` was added in its place.
+    and the ``EquatableInterface`` was introduced in its place.
diff --git a/cookbook/session/php_bridge.rst b/cookbook/session/php_bridge.rst
@@ -5,7 +5,7 @@ Bridge a legacy application with Symfony Sessions
 =================================================
 
 .. versionadded:: 2.3
-    The ability to integrate with a legacy PHP session was added in Symfony 2.3.
+    The ability to integrate with a legacy PHP session was introduced in Symfony 2.3.
 
 If you're integrating the Symfony full-stack Framework into a legacy application
 that starts the session with ``session_start()``, you may still be able to
diff --git a/cookbook/templating/namespaced_paths.rst b/cookbook/templating/namespaced_paths.rst
@@ -5,7 +5,7 @@ How to use and Register namespaced Twig Paths
 =============================================
 
 .. versionadded:: 2.2
-    Namespaced path support was added in 2.2.
+    Namespaced path support was introduced in 2.2.
 
 Usually, when you refer to a template, you'll use the ``MyBundle:Subdir:filename.html.twig``
 format (see :ref:`template-naming-locations`).
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -411,7 +411,7 @@ profiler
 ~~~~~~~~
 
 .. versionadded:: 2.2
-    The ``enabled`` option was added in Symfony 2.2. Previously, the profiler
+    The ``enabled`` option was introduced in Symfony 2.2. Previously, the profiler
     could only be disabled by omitting the ``framework.profiler`` configuration
     entirely.
 
diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst
@@ -291,7 +291,7 @@ Using the PBKDF2 encoder: Security and Speed
 --------------------------------------------
 
 .. versionadded:: 2.2
-    The PBKDF2 password encoder was added in Symfony 2.2.
+    The PBKDF2 password encoder was introduced in Symfony 2.2.
 
 The `PBKDF2`_ encoder provides a high level of Cryptographic security, as
 recommended by the National Institute of Standards and Technology (NIST).
@@ -316,7 +316,7 @@ Using the BCrypt Password Encoder
     the `ircmaxell/password-compat`_ library via Composer.
 
 .. versionadded:: 2.2
-    The BCrypt password encoder was added in Symfony 2.2.
+    The BCrypt password encoder was introduced in Symfony 2.2.
 
 .. configuration-block::
 
diff --git a/reference/constraints/Iban.rst b/reference/constraints/Iban.rst
@@ -2,7 +2,7 @@ Iban
 ====
 
 .. versionadded:: 2.3
-    The Iban constraint was added in Symfony 2.3.
+    The Iban constraint was introduced in Symfony 2.3.
 
 This constraint is used to ensure that a bank account number has the proper format of
 an `International Bank Account Number (IBAN)`_. IBAN is an internationally agreed means
diff --git a/reference/constraints/Isbn.rst b/reference/constraints/Isbn.rst
@@ -2,7 +2,7 @@ Isbn
 ====
 
 .. versionadded:: 2.3
-    The Isbn constraint was added in Symfony 2.3.
+    The Isbn constraint was introduced in Symfony 2.3.
 
 This constraint validates that an `International Standard Book Number (ISBN)`_
 is either a valid ISBN-10, a valid ISBN-13 or both.
diff --git a/reference/constraints/Issn.rst b/reference/constraints/Issn.rst
@@ -2,7 +2,7 @@ Issn
 ====
 
 .. versionadded:: 2.3
-    The Issn constraint was added in Symfony 2.3.
+    The Issn constraint was introduced in Symfony 2.3.
 
 Validates that a value is a valid `International Standard Serial Number (ISSN)`_.
 
diff --git a/reference/forms/types/button.rst b/reference/forms/types/button.rst
@@ -5,7 +5,7 @@ button Field Type
 =================
 
 .. versionadded:: 2.3
-    The ``button`` type was added in Symfony 2.3
+    The ``button`` type was introduced in Symfony 2.3
 
 A simple, non-responsive button.
 
diff --git a/reference/forms/types/reset.rst b/reference/forms/types/reset.rst
@@ -5,7 +5,7 @@ reset Field Type
 ================
 
 .. versionadded:: 2.3
-    The ``reset`` type was added in Symfony 2.3
+    The ``reset`` type was introduced in Symfony 2.3
 
 A button that resets all fields to their original values.
 
diff --git a/reference/forms/types/submit.rst b/reference/forms/types/submit.rst
