Merge branch '2.3' into 2.4

Conflicts:
	book/forms.rst
	book/translation.rst
	changelog.rst
	components/config/definition.rst
	components/filesystem.rst
	components/stopwatch.rst
	components/translation/introduction.rst
	reference/dic_tags.rst
	reference/forms/types/options/disabled.rst.inc
	reference/forms/types/options/error_mapping.rst.inc
	reference/forms/types/options/property_path.rst.inc

Author: weaverryan

book/forms.rst

@@ -232,10 +232,10 @@ controller::
     }
 
 .. versionadded:: 2.3
-    The :method:`Symfony\\Component\\Form\\FormInterface::handleRequest` method was
-    added in Symfony 2.3. Previously, the ``$request`` was passed to the
-    ``submit`` method - a strategy which is deprecated and will be removed
-    in Symfony 3.0. For details on that method, see :ref:`cookbook-form-submit-request`.
+    The :method:`Symfony\\Component\\Form\\FormInterface::handleRequest` method
+    was introduced in Symfony 2.3. Previously, the ``$request`` was passed
+    to the ``submit`` method - a strategy which is deprecated and will be
+    removed in Symfony 3.0. For details on that method, see :ref:`cookbook-form-submit-request`.
 
 This controller follows a common pattern for handling forms, and has three
 possible paths:

book/page_creation.rst

@@ -1061,5 +1061,5 @@ to rapidly develop applications.
 .. _`Twig`: http://twig.sensiolabs.org
 .. _`third-party bundles`: http://knpbundles.com
 .. _`Symfony Standard Edition`: http://symfony.com/download
-.. _`Apache's DirectoryIndex documentation`: http://httpd.apache.org/docs/2.0/mod/mod_dir.html
+.. _`Apache's DirectoryIndex documentation`: http://httpd.apache.org/docs/current/mod/mod_dir.html
 .. _`Nginx HttpCoreModule location documentation`: http://wiki.nginx.org/HttpCoreModule#location

book/routing.rst

@@ -69,8 +69,8 @@ The route is simple:
         return $collection;
 
 .. versionadded:: 2.2
-    The ``path`` option is new in Symfony 2.2, ``pattern`` is used in older
-    versions.
+    The ``path`` option was introduced in Symfony 2.2, ``pattern`` is used
+    in older versions.
 
 The path defined by the ``blog_show`` route acts like ``/blog/*`` where
 the wildcard is given the name ``slug``. For the URL ``/blog/my-blog-post``,
@@ -705,7 +705,7 @@ be accomplished with the following route configuration:
         return $collection;
 
 .. versionadded:: 2.2
-    The ``methods`` option is added in Symfony 2.2. Use the ``_method``
+    The ``methods`` option was introduced in Symfony 2.2. Use the ``_method``
     requirement in older versions.
 
 Despite the fact that these two routes have identical paths (``/contact``),

book/security.rst

@@ -2061,7 +2061,8 @@ Utilities
 ---------
 
 .. versionadded:: 2.2
-    The ``StringUtils`` and ``SecureRandom`` classes were added in Symfony 2.2
+    The ``StringUtils`` and ``SecureRandom`` classes were introduced in Symfony
+    2.2
 
 The Symfony Security component comes with a collection of nice utilities related
 to security. These utilities are used by Symfony, but you should also use

book/testing.rst

@@ -415,8 +415,9 @@ Accessing internal Objects
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. versionadded:: 2.3
-    The ``getInternalRequest()`` and ``getInternalResponse()`` method were
-    added in Symfony 2.3.
+    The :method:`Symfony\\Component\\BrowserKit\\Client::getInternalRequest`
+    and :method:`Symfony\\Component\\BrowserKit\\Client::getInternalResponse`
+    methods were introduced in Symfony 2.3.
 
 If you use the client to test your application, you might want to access the
 client's internal objects::

changelog.rst

@@ -177,8 +177,9 @@ New Documentation
 Fixed Documentation
 ~~~~~~~~~~~~~~~~~~~
 
-- `adcbb5d <https://github.com/symfony/symfony-docs/commit/adcbb5de6c3b8d6ba59e619315ef13fe45318494>`_ #3615 Fixes to cookbook/doctrine/registration_form.rst (Crushnaut)
 - `5c4336a <https://github.com/symfony/symfony-docs/commit/5c4336a325ec98bc0eb7ef35baf86bcb9628e490>`_ #3570 Callback: [Validator, validate] expects validate to be static (nixilla)
+- `5c367b4 <https://github.com/symfony/symfony-docs/commit/5c367b4dfa5c3adc8993702b1ae8f686c74419c8>`_ #3517 Fixed OptionsResolver component docs (WouterJ)
+- `adcbb5d <https://github.com/symfony/symfony-docs/commit/adcbb5de6c3b8d6ba59e619315ef13fe45318494>`_ #3615 Fixes to cookbook/doctrine/registration_form.rst (Crushnaut)
 - `a21fb26 <https://github.com/symfony/symfony-docs/commit/a21fb260978eaa27b1cb94fccb0bd0af71b6df7f>`_ #3559 Remove reference to copying parameters.yml from Git cookbook (pwaring)
 - `de71a51 <https://github.com/symfony/symfony-docs/commit/de71a5143f6d30fff7e890cea250d047a63916d2>`_ #3551 [Cookbook][Dynamic Form Modification] Fix sample code (rybakit)
 - `143db2f <https://github.com/symfony/symfony-docs/commit/143db2f75caa9ef6d7e1c230d0ac9d59c17fde5f>`_ #3550 Update introduction.rst (taavit)
@@ -239,6 +240,7 @@ New Documentation
 
 - `d52f3f8 <https://github.com/symfony/symfony-docs/commit/d52f3f8a146356e9e114474e820f8ec6ac5f2374>`_ #3454 [Security] Add host option (ghostika)
 - `6b3c424 <https://github.com/symfony/symfony-docs/commit/6b3c424034fec441a32d8305600c1c26936b8f1e>`_ #3428 Translation - Added info about JsonFileLoader added in 2.4 (singles)
+No changes
 
 Fixed Documentation
 ~~~~~~~~~~~~~~~~~~~
@@ -264,8 +266,8 @@ Fixed Documentation
 Minor Documentation Changes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-- `f285d93 <https://github.com/symfony/symfony-docs/commit/f285d930377d8cbaedccc3ad46853fa72ee6439d>`_ #3451 some language tweaks (AE, third-person perspective) (xabbuh)
 - `b9bbe5d <https://github.com/symfony/symfony-docs/commit/b9bbe5d5f8cb427f1a52e839f23a0f286da1a010>`_ #3499 Fix YAML syntax highlight + remove trailing whitespace (ifdattic)
+- `f285d93 <https://github.com/symfony/symfony-docs/commit/f285d930377d8cbaedccc3ad46853fa72ee6439d>`_ #3451 some language tweaks (AE, third-person perspective) (xabbuh)
 - `2b7e0f6 <https://github.com/symfony/symfony-docs/commit/2b7e0f6f2f9982e600918f447852a6f4c60966a1>`_ #3497 Fix highlighting (WouterJ)
 - `a535ae0 <https://github.com/symfony/symfony-docs/commit/a535ae0383a2a6715021681980877b0205dc3281>`_ #3471 Fixed `````versionadded````` inconsistencies in Symfony 2.3 (danielcsgomes)
 - `f077a8e <https://github.com/symfony/symfony-docs/commit/f077a8e71c4973e7775db8c9fb548a0866d21131>`_ #3465 change wording in versionadded example to be consistent with what we use... (xabbuh)

components/config/caching.rst

@@ -1,7 +1,7 @@
 .. index::
    single: Config; Caching based on resources
 
-Caching based on resources
+Caching Based on Resources
 ==========================
 
 When all configuration resources are loaded, you may want to process the configuration

components/config/definition.rst

@@ -1,10 +1,10 @@
 .. index::
    single: Config; Defining and processing configuration values
 
-Defining and processing configuration values
+Defining and Processing Configuration Values
 ============================================
 
-Validating configuration values
+Validating Configuration Values
 -------------------------------
 
 After loading configuration values from all kinds of resources, the values
@@ -38,7 +38,7 @@ they are when first encountered. Also, some keys are only available when
 another key has a specific value (in the sample configuration above: the
 ``memory`` key only makes sense when the ``driver`` is ``sqlite``).
 
-Defining a hierarchy of configuration values using the TreeBuilder
+Defining a Hierarchy of Configuration Values Using the TreeBuilder
 ------------------------------------------------------------------
 
 All the rules concerning configuration values can be defined using the
@@ -66,10 +66,10 @@ should be returned from a custom ``Configuration`` class which implements the
         }
     }
 
-Adding node definitions to the tree
+Adding Node Definitions to the Tree
 -----------------------------------
 
-Variable nodes
+Variable Nodes
 ~~~~~~~~~~~~~~
 
 A tree contains node definitions which can be laid out in a semantic way.
@@ -91,7 +91,7 @@ The root node itself is an array node, and has children, like the boolean
 node ``auto_connect`` and the scalar node ``default_connection``. In general:
 after defining a node, a call to ``end()`` takes you one step up in the hierarchy.
 
-Node type
+Node Type
 ~~~~~~~~~
 
 It is possible to validate the type of a provided value by using the appropriate
@@ -108,11 +108,11 @@ node definition. Node type are available for:
 and are created with ``node($name, $type)`` or their associated shortcut
 ``xxxxNode($name)`` method.
 
-Numeric node constraints
+Numeric Node Constraints
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. versionadded:: 2.2
-    The numeric (float and integer) nodes are new in 2.2
+    The numeric (float and integer) nodes were introduced in Symfony 2.2.
 
 Numeric nodes (float and integer) provide two extra constraints -
 :method:`Symfony\\Component\\Config\\Definition\\Builder::min` and
@@ -133,7 +133,7 @@ allowing to validate the value::
         ->end()
     ;
 
-Enum nodes
+Enum Nodes
 ~~~~~~~~~~
 
 Enum nodes provide a constraint to match the given input against a set of
@@ -149,7 +149,7 @@ values::
 
 This will restrict the ``gender`` option to be either ``male`` or ``female``.
 
-Array nodes
+Array Nodes
 ~~~~~~~~~~~
 
 It is possible to add a deeper level to the hierarchy, by adding an array
@@ -190,7 +190,7 @@ inside the current node. According to the prototype definition in the example
 above, it is possible to have multiple connection arrays (containing a ``driver``,
 ``host``, etc.).
 
-Array node options
+Array Node Options
 ~~~~~~~~~~~~~~~~~~
 
 Before defining the children of an array node, you can provide options like:
@@ -233,7 +233,7 @@ In XML, each ``parameters`` node would have a ``name`` attribute (along with
 the final array. The ``useAttributeAsKey`` is useful for normalizing how
 arrays are specified between different formats like XML and YAML.
 
-Default and required values
+Default and required Values
 ---------------------------
 
 For all node types, it is possible to define default values and replacement
@@ -288,7 +288,8 @@ Optional Sections
 -----------------
 
 .. versionadded:: 2.2
-    The ``canBeEnabled`` and ``canBeDisabled`` methods are new in Symfony 2.2
+    The ``canBeEnabled`` and ``canBeDisabled`` methods were introduced in
+    Symfony 2.2.
 
 If you have entire sections which are optional and can be enabled/disabled,
 you can take advantage of the shortcut
@@ -313,7 +314,7 @@ you can take advantage of the shortcut
 The ``canBeDisabled`` method looks about the same except that the section
 would be enabled by default.
 
-Merging options
+Merging Options
 ---------------
 
 Extra options concerning the merge process may be provided. For arrays:
@@ -327,7 +328,7 @@ For all nodes:
 ``cannotBeOverwritten()``
     don’t let other configuration arrays overwrite an existing value for this node
 
-Appending sections
+Appending Sections
 ------------------
 
 If you have a complex configuration to validate then the tree can grow to
@@ -499,7 +500,7 @@ By changing a string value into an associative array with ``name`` as the key::
         ->end()
     ;
 
-Validation rules
+Validation Rules
 ----------------
 
 More advanced validation rules can be provided using the
@@ -545,7 +546,7 @@ Usually, "then" is a closure. Its return value will be used as a new value
 for the node, instead
 of the node's original value.
 
-Processing configuration values
+Processing Configuration Values
 -------------------------------
 
 The :class:`Symfony\\Component\\Config\\Definition\\Processor` uses the tree

components/config/resources.rst

@@ -1,10 +1,10 @@
 .. index::
    single: Config; Loading resources
 
-Loading resources
+Loading Resources
 =================
 
-Locating resources
+Locating Resources
 ------------------
 
 Loading the configuration normally starts with a search for resources – in
@@ -24,7 +24,7 @@ look in this directory first. The third argument indicates whether or not the
 locator should return the first file it has found, or an array containing
 all matches.
 
-Resource loaders
+Resource Loaders
 ----------------
 
 For each type of resource (YAML, XML, annotation, etc.) a loader must be defined.
@@ -57,7 +57,7 @@ class, which allows for recursively importing other resources::
         }
     }
 
-Finding the right loader
+Finding the right Loader
 ------------------------
 
 The :class:`Symfony\\Component\\Config\\Loader\\LoaderResolver` receives as

components/console/events.rst

@@ -5,7 +5,7 @@ Using Events
 ============
 
 .. versionadded:: 2.3
-    Console events were added in Symfony 2.3.
+    Console events were introduced in Symfony 2.3.
 
 The Application class of the Console component allows you to optionally hook
 into the lifecycle of a console application via events. Instead of reinventing
@@ -51,7 +51,7 @@ dispatched. Listeners receive a
         $application = $command->getApplication();
     });
 
-The ``ConsoleEvents::TERMINATE`` event
+The ``ConsoleEvents::TERMINATE`` Event
 --------------------------------------
 
 **Typical Purposes**: To perform some cleanup actions after the command has
@@ -89,7 +89,7 @@ Listeners receive a
     It is then dispatched just before the ``ConsoleEvents::EXCEPTION`` event.
     The exit code received in this case is the exception code.
 
-The ``ConsoleEvents::EXCEPTION`` event
+The ``ConsoleEvents::EXCEPTION`` Event
 --------------------------------------
 
 **Typical Purposes**: Handle exceptions thrown during the execution of a

components/console/helpers/dialoghelper.rst

@@ -16,7 +16,7 @@ All the methods inside the Dialog Helper have an
 argument, the question as the second argument and the default value as the last
 argument.
 
-Asking the User for confirmation
+Asking the User for Confirmation
 --------------------------------
 
 Suppose you want to confirm an action before actually executing it. Add
@@ -172,7 +172,7 @@ You can also ask and validate a hidden response::
 If you want to allow the response to be visible if it cannot be hidden for
 some reason, pass true as the fifth argument.
 
-Let the user choose from a list of Answers
+Let the User Choose from a List of Answers
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. versionadded:: 2.2
@@ -244,7 +244,7 @@ this set the seventh argument to ``true``::
 Now, when the user enters ``1,2``, the result will be:
 ``You have just selected: blue, yellow``.
 
-Testing a Command which expects input
+Testing a Command which Expects Input
 -------------------------------------
 
 If you want to write a unit test for a command which expects some kind of input

components/console/introduction.rst

@@ -472,7 +472,7 @@ method::
     You can also test a whole console application by using
     :class:`Symfony\\Component\\Console\\Tester\\ApplicationTester`.
 
-Calling an existing Command
+Calling an Existing Command
 ---------------------------
 
 If a command depends on another one being run before it, instead of asking the

components/console/single_command_tool.rst

@@ -1,7 +1,7 @@
 .. index::
    single: Console; Single command application
 
-Building a Single Command Application
+Building a single Command Application
 =====================================
 
 When building a command line tool, you may not need to provide several commands.

components/css_selector.rst

@@ -18,8 +18,8 @@ You can install the component in 2 different ways:
 Usage
 -----
 
-Why use CSS selectors?
-~~~~~~~~~~~~~~~~~~~~~~
+Why to Use CSS selectors?
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
 When you're parsing an HTML or an XML document, by far the most powerful
 method is XPath.
@@ -41,7 +41,7 @@ be converted to an XPath equivalent. This XPath expression can then be used
 with other functions and classes that use XPath to find elements in a
 document.
 
-The CssSelector component
+The CssSelector Component
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The component's only goal is to convert CSS selectors to their XPath
@@ -66,7 +66,7 @@ You can use this expression with, for instance, :phpclass:`DOMXPath` or
     uses the CssSelector component to find elements based on a CSS selector
     string. See the :doc:`/components/dom_crawler` for more details.
 
-Limitations of the CssSelector component
+Limitations of the CssSelector Component
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Not all CSS selectors can be converted to XPath equivalents.

components/dependency_injection/advanced.rst

@@ -156,7 +156,7 @@ service by asking for the ``bar`` service like this::
            bar: "@foo"
 
 
-Requiring files
+Requiring Files
 ---------------
 
 There might be use cases when you need to include another file just before

components/dependency_injection/compilation.rst

@@ -273,11 +273,12 @@ but also load a secondary one only if a certain parameter is set::
 
 .. _components-dependency-injection-compiler-passes:
 
-Prepending Configuration passed to the Extension
+Prepending Configuration Passed to the Extension
 ------------------------------------------------
 
 .. versionadded:: 2.2
-    The ability to prepend the configuration of a bundle is new in Symfony 2.2.
+    The ability to prepend the configuration of a bundle was introduced in
+    Symfony 2.2.
 
 An Extension can prepend the configuration of any Bundle before the ``load()``
 method is called by implementing :class:`Symfony\\Component\\DependencyInjection\\Extension\\PrependExtensionInterface`::