Merge branch '2.5' into 2.6

* 2.5:
  [#4625] Removing link added for BC, because this is the top of the page anyways
  Added '-ing' title ending to unify titles look
  [OptionsResolver] Fix Namespace link
  filesystem headlines match method names
  Change refering block name from content to body
  When explaining how to install dependencies for running unit tests, there are references to "--dev" composer parameter that is the current default value.
  Fixing missing services key
  readd mistakenly removed label
  fix feature freeze dates

Conflicts:
	components/options_resolver.rst

Author: weaverryan

components/console/console_arguments.rst

@@ -1,8 +1,8 @@
 .. index::
     single: Console; Console arguments
 
-Understand how Console Arguments are Handled
-============================================
+Understanding how Console Arguments Are Handled
+===============================================
 
 It can be difficult to understand the way arguments are handled by the console application.
 The Symfony Console application, like many other CLI utility tools, follows the behavior

components/filesystem/introduction.rst

@@ -52,7 +52,7 @@ endpoint for filesystem operations::
     string, an array or any object implementing :phpclass:`Traversable` as
     the target argument.
 
-Mkdir
+mkdir
 ~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::mkdir` creates a directory.
@@ -66,7 +66,7 @@ On posix filesystems, directories are created with a default mode value
     You can pass an array or any :phpclass:`Traversable` object as the first
     argument.
 
-Exists
+exists
 ~~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::exists` checks for the
@@ -83,7 +83,7 @@ presence of all files or directories and returns ``false`` if a file is missing:
     You can pass an array or any :phpclass:`Traversable` object as the first
     argument.
 
-Copy
+copy
 ~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::copy` is used to copy
@@ -97,7 +97,7 @@ the third boolean argument::
     // image.jpg will be overridden
     $fs->copy('image-ICC.jpg', 'image.jpg', true);
 
-Touch
+touch
 ~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::touch` sets access and
@@ -116,7 +116,7 @@ your own with the second argument. The third argument is the access time::
     You can pass an array or any :phpclass:`Traversable` object as the first
     argument.
 
-Chown
+chown
 ~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::chown` is used to change
@@ -132,7 +132,7 @@ the owner of a file. The third argument is a boolean recursive option::
     You can pass an array or any :phpclass:`Traversable` object as the first
     argument.
 
-Chgrp
+chgrp
 ~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::chgrp` is used to change
@@ -148,7 +148,7 @@ the group of a file. The third argument is a boolean recursive option::
     You can pass an array or any :phpclass:`Traversable` object as the first
     argument.
 
-Chmod
+chmod
 ~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::chmod` is used to change
@@ -164,7 +164,7 @@ the mode of a file. The fourth argument is a boolean recursive option::
     You can pass an array or any :phpclass:`Traversable` object as the first
     argument.
 
-Remove
+remove
 ~~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::remove` is used to remove
@@ -177,7 +177,7 @@ files, symlinks, directories easily::
     You can pass an array or any :phpclass:`Traversable` object as the first
     argument.
 
-Rename
+rename
 ~~~~~~
 
 :method:`Symfony\\Component\\Filesystem\\Filesystem::rename` is used to rename

contributing/code/tests.rst

@@ -41,7 +41,7 @@ Step 2: Install vendors
 
 .. code-block:: bash
 
-    $ php composer.phar --dev install
+    $ php composer.phar install
 
 .. note::
 
@@ -56,14 +56,14 @@ Step 2: Install vendors
     .. code-block:: bash
 
         $ php installer
-        $ php composer.phar --dev install
+        $ php composer.phar install
 
 After installation, you can update the vendors to their latest version with
 the follow command:
 
 .. code-block:: bash
 
-    $ php composer.phar --dev update
+    $ php composer.phar update
 
 Running
 -------

contributing/community/releases.rst

@@ -94,13 +94,13 @@ Version  Feature Freeze  Release  End of Maintenance        End of Life
 2.2      01/2013         03/2013  11/2013 (8 months)        05/2014
 **2.3**  03/2013         05/2013  05/2016 (36 months)       05/2017
 2.4      09/2013         11/2013  09/2014 (10 months [1]_)  01/2015
-2.5      02/2014         05/2014  01/2015 (8 months)        07/2015
+2.5      03/2014         05/2014  01/2015 (8 months)        07/2015
 2.6      09/2014         11/2014  07/2015 (8 months)        01/2016
-**2.7**  02/2015         05/2015  05/2018 (36 months [2]_)  05/2019
+**2.7**  03/2015         05/2015  05/2018 (36 months [2]_)  05/2019
 3.0      09/2015         11/2015  07/2016 (8 months)        01/2017
-3.1      02/2016         05/2016  01/2017 (8 months)        07/2017
+3.1      03/2016         05/2016  01/2017 (8 months)        07/2017
 3.2      09/2016         11/2016  07/2017 (8 months)        01/2018
-**3.3**  02/2017         05/2017  05/2020 (36 months)       05/2021
+**3.3**  03/2017         05/2017  05/2020 (36 months)       05/2021
 ...      ...             ...      ...                       ...
 =======  ==============  =======  ========================  ===========
 

cookbook/configuration/pdo_session_storage.rst

@@ -137,12 +137,13 @@ of your project's data, you can use the connection settings from the
 
     .. code-block:: yaml
 
-        pdo:
-            class: PDO
-            arguments:
-                - "mysql:host=%database_host%;port=%database_port%;dbname=%database_name%"
-                - "%database_user%"
-                - "%database_password%"
+        services:
+            pdo:
+                class: PDO
+                arguments:
+                    - "mysql:host=%database_host%;port=%database_port%;dbname=%database_name%"
+                    - "%database_user%"
+                    - "%database_password%"
 
     .. code-block:: xml
 

quick_tour/the_view.rst

@@ -126,7 +126,7 @@ Open the ``app/Resources/views/base.html.twig`` file that corresponds to the
 
 The ``{% block %}`` tags tell the template engine that a child template may
 override those portions of the template. In this example, the ``index.html.twig``
-template overrides the ``content`` block, but not the ``title`` block, which will
+template overrides the ``body`` block, but not the ``title`` block, which will
 display the default content defined in the ``base.html.twig`` template.
 
 Using Tags, Filters, and Functions