Merge branch '2.1'

Author: weaverryan

book/controller.rst

@@ -117,7 +117,7 @@ a controller object. Controllers are also called *actions*.
 
 This controller is pretty straightforward, but let's walk through it:
 
-* *line 3*: Symfony2 takes advantage of PHP 5.3 namespace functionality to
+* *line 4*: Symfony2 takes advantage of PHP 5.3 namespace functionality to
   namespace the entire controller class. The ``use`` keyword imports the
   ``Response`` class, which our controller must return.
 

components/config/caching.rst

@@ -37,6 +37,7 @@ the cache can tell if it is still fresh or that its contents should be regenerat
         $resources = array();
 
         foreach ($yamlUserFiles as $yamlUserFile) {
+            // see the previous article "Loading resources" to see where $delegatingLoader comes from
             $delegatingLoader->load($yamlUserFile);
             $resources[] = new FileResource($yamlUserFile);
         }

components/dependency_injection/compilation.rst

@@ -365,7 +365,8 @@ but getting an up to date configuration whilst developing your application::
 
     // ...
 
-    // set $isDebug based on something in your project
+    // based on something in your project
+    $isDebug = ...;
 
     $file = __DIR__ .'/cache/container.php';
 
@@ -398,7 +399,8 @@ and use them as metadata for the cache::
 
     // ...
 
-    // set $isDebug based on something in your project
+    // based on something in your project
+    $isDebug = ...;
 
     $file = __DIR__ .'/cache/container.php';
     $containerConfigCache = new ConfigCache($file, $isDebug);

components/map.rst.inc

@@ -1,4 +1,4 @@
-* **The Class Loader Component**
+* **Class Loader**
 
   * :doc:`/components/class_loader`
 
@@ -14,7 +14,7 @@
   * :doc:`/components/console/introduction`
   * :doc:`/components/console/usage`
 
-* **The CSS Selector Component**
+* **CSS Selector**
 
   * :doc:`/components/css_selector`
 
@@ -29,21 +29,21 @@
   * :doc:`/components/dependency_injection/parentservices`
   * :doc:`/components/dependency_injection/advanced`
 
+* **DOM Crawler**
+
+* :doc:`/components/dom_crawler`
+
 * :doc:`/components/event_dispatcher/index`
 
   * :doc:`/components/event_dispatcher/introduction`
   * :doc:`/components/event_dispatcher/container_aware_dispatcher`
   * :doc:`/components/event_dispatcher/generic_event`
 
-* **The DOM Crawler Component**
-
-  * :doc:`/components/dom_crawler`
-
-* **The Filesystem Component**
+* **Filesystem**
 
   * :doc:`/components/filesystem`
 
-* **The Finder Component**
+* **Finder**
 
   * :doc:`/components/finder`
 
@@ -54,26 +54,26 @@
   * :doc:`/components/http_foundation/session_configuration`
   * :doc:`/components/http_foundation/session_testing`
 
-* **The Locale Component**
+* **Locale**
 
   * :doc:`/components/locale`
 
-* **The Process Component**
+* **Process**
 
   * :doc:`/components/process`
 
-* **The Routing Component**
+* **Routing**
 
   * :doc:`/components/routing`
 
-* **The Serializer Component**
+* **Serializer**
 
   * :doc:`/components/serializer`
 
-* **The Templating Component**
+* **Templating**
 
   * :doc:`/components/templating`
 
-* **The YAML Component**
+* **YAML**
 
   * :doc:`/components/yaml`

reference/forms/types/file.rst

@@ -14,7 +14,7 @@ The ``file`` type represents a file input in your form.
 |             | - `read_only`_                                                      |
 |             | - `error_bubbling`_                                                 |
 +-------------+---------------------------------------------------------------------+
-| Parent type | :doc:`form</reference/forms/types/form>`                           |
+| Parent type | :doc:`form</reference/forms/types/form>`                            |
 +-------------+---------------------------------------------------------------------+
 | Class       | :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\FileType`  |
 +-------------+---------------------------------------------------------------------+