Merge branch '2.0'

weaverryan · weaverryan · commit b46e4e58cc93 · 2012-07-14T19:21:51.000-05:00
diff --git a/book/page_creation.rst b/book/page_creation.rst
@@ -981,8 +981,11 @@ in mind:
 * each feature in Symfony2 (including the Symfony2 framework core) is organized
   into a *bundle*, which is a structured set of files for that feature;
 
-* the **configuration** for each bundle lives in the ``app/config`` directory
-  and can be specified in YAML, XML or PHP;
+* the **configuration** for each bundle lives in the ``Resources/config``
+  directory of the bundle and can be specified in YAML, XML or PHP;
+
+* the global **application configuration** lives in the ``app/Resources/config``
+  directory;
 
 * each **environment** is accessible via a different front controller (e.g.
   ``app.php`` and ``app_dev.php``) and loads a different configuration file.
diff --git a/components/dependency_injection/types.rst b/components/dependency_injection/types.rst
@@ -31,7 +31,7 @@ the dependency::
         // ...
     }
 
-You can can specify what service you would like to inject into this in the
+You can specify what service you would like to inject into this in the
 service container configuration:
 
 .. configuration-block::

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ the dependency::`
`31`	`31`	`// ...`
`32`	`32`	`}`
`33`	`33`
`34`		`-You can can specify what service you would like to inject into this in the`
	`34`	`+You can specify what service you would like to inject into this in the`
`35`	`35`	`service container configuration:`
`36`	`36`
`37`	`37`	`.. configuration-block::`