Merge branch '2.4' into 2.5

Author: weaverryan

components/using_components.rst

@@ -48,42 +48,42 @@ the ``vendor/autoload.php`` file that was generated by Composer. This file
 takes care of autoloading all of the libraries so that you can use them
 immediately::
 
-        // File: src/script.php
+    // File: src/script.php
 
-        // update this to the path to the "vendor/" directory, relative to this file
-        require_once '../vendor/autoload.php';
+    // update this to the path to the "vendor/" directory, relative to this file
+    require_once '../vendor/autoload.php';
 
-        use Symfony\Component\Finder\Finder;
+    use Symfony\Component\Finder\Finder;
 
-        $finder = new Finder();
-        $finder->in('../data/');
+    $finder = new Finder();
+    $finder->in('../data/');
 
-        // ...
+    // ...
 
 .. tip::
 
     If you want to use all of the Symfony2 Components, then instead of adding
     them one by one:
 
-        .. code-block:: json
+    .. code-block:: json
 
-            {
-                "require": {
-                    "symfony/finder": "2.3.*",
-                    "symfony/dom-crawler": "2.3.*",
-                    "symfony/css-selector": "2.3.*"
-                }
+        {
+            "require": {
+                "symfony/finder": "2.3.*",
+                "symfony/dom-crawler": "2.3.*",
+                "symfony/css-selector": "2.3.*"
             }
+        }
 
     you can use:
 
-        .. code-block:: json
+    .. code-block:: json
 
-            {
-                "require": {
-                    "symfony/symfony": "2.3.*"
-                }
+        {
+            "require": {
+                "symfony/symfony": "2.3.*"
             }
+        }
 
     This will include the Bundle and Bridge libraries, which you may not
     actually need.