From 96fb64f66203af568eeb36aed9683da30bd376e5 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@xabbuh.de>
Date: Sun, 10 Aug 2014 13:40:34 +0200
Subject: [PATCH] [Book] consistent and complete config examples

Make configuration examples in the book consistent throughout the
different configuration formats. Also fixing several syntax issues.
---
 book/controller.rst        |  12 ++
 book/doctrine.rst          |  91 +++++-----
 book/forms.rst             |  29 ++--
 book/http_cache.rst        |   8 +-
 book/http_fundamentals.rst |   3 +-
 book/internals.rst         |  23 ++-
 book/page_creation.rst     |  40 +++--
 book/propel.rst            |  58 ++++---
 book/routing.rst           |  48 ++++--
 book/security.rst          | 330 +++++++++++++++++++++++++++----------
 book/service_container.rst |  18 +-
 book/templating.rst        |  28 +++-
 book/testing.rst           |   6 +-
 book/translation.rst       |  17 +-
 book/validation.rst        |   6 +-
 15 files changed, 478 insertions(+), 239 deletions(-)

diff --git a/book/controller.rst b/book/controller.rst
index a351e3947d8..da861c49808 100644
--- a/book/controller.rst
+++ b/book/controller.rst
@@ -170,10 +170,16 @@ to the controller:
     .. code-block:: php
 
         // app/config/routing.php
+        use Symfony\Component\Routing\Route;
+        use Symfony\Component\Routing\RouteCollection;
+
+        $collection = new RouteCollection();
         $collection->add('hello', new Route('/hello/{name}', array(
             '_controller' => 'AcmeHelloBundle:Hello:index',
         )));
 
+        return $collection;
+
 Going to ``/hello/ryan`` now executes the ``HelloController::indexAction()``
 controller and passes in ``ryan`` for the ``$name`` variable. Creating a
 "page" means simply creating a controller method and associated route.
@@ -257,11 +263,17 @@ example:
     .. code-block:: php
 
         // app/config/routing.php
+        use Symfony\Component\Routing\Route;
+        use Symfony\Component\Routing\RouteCollection;
+
+        $collection = new RouteCollection();
         $collection->add('hello', new Route('/hello/{firstName}/{lastName}', array(
             '_controller' => 'AcmeHelloBundle:Hello:index',
             'color'       => 'green',
         )));
 
+        return $collection;
+
 The controller for this can take several arguments::
 
     public function indexAction($firstName, $lastName, $color)
diff --git a/book/doctrine.rst b/book/doctrine.rst
index 84a54b49017..996dcdbee9f 100644
--- a/book/doctrine.rst
+++ b/book/doctrine.rst
@@ -85,7 +85,7 @@ information. By convention, this information is usually configured in an
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xmlns:doctrine="http://symfony.com/schema/dic/doctrine"
                 xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                                    http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
+                    http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
 
                 <doctrine:config>
                     <doctrine:dbal
@@ -93,10 +93,8 @@ information. By convention, this information is usually configured in an
                         host="%database_host%"
                         dbname="%database_name%"
                         user="%database_user%"
-                        password="%database_password%"
-                    />
+                        password="%database_password%" />
                 </doctrine:config>
-
             </container>
 
         .. code-block:: php
@@ -175,16 +173,14 @@ for you:
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xmlns:doctrine="http://symfony.com/schema/dic/doctrine"
                 xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                                    http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-                <doctrine:config
-                    driver="pdo_sqlite"
-                    path="%kernel.root_dir%/sqlite.db"
-                    charset="UTF-8"
-                >
-                    <!-- ... -->
-                </doctrine:config>
+                    http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
 
+                <doctrine:config>
+                    <doctrine:dbal
+                        driver="pdo_sqlite"
+                        path="%kernel.root_dir%/sqlite.db"
+                        charset="UTF-8" />
+                </doctrine:config>
             </container>
 
         .. code-block:: php
@@ -319,17 +315,17 @@ in a number of different formats including YAML, XML or directly inside the
         <!-- src/Acme/StoreBundle/Resources/config/doctrine/Product.orm.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
-                            http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
+                http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
 
             <entity name="Acme\StoreBundle\Entity\Product" table="product">
-                <id name="id" type="integer" column="id">
+                <id name="id" type="integer">
                     <generator strategy="AUTO" />
                 </id>
-                <field name="name" column="name" type="string" length="100" />
-                <field name="price" column="price" type="decimal" scale="2" />
-                <field name="description" column="description" type="text" />
+                <field name="name" type="string" length="100" />
+                <field name="price" type="decimal" scale="2" />
+                <field name="description" type="text" />
             </entity>
         </doctrine-mapping>
 
@@ -826,13 +822,15 @@ To do this, add the name of the repository class to your mapping definition:
         <!-- src/Acme/StoreBundle/Resources/config/doctrine/Product.orm.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
-                            http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
+                http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+
+            <entity
+                name="Acme\StoreBundle\Entity\Product"
+                repository-class="Acme\StoreBundle\Entity\ProductRepository">
 
-            <entity name="Acme\StoreBundle\Entity\Product"
-                    repository-class="Acme\StoreBundle\Entity\ProductRepository">
-                    <!-- ... -->
+                <!-- ... -->
             </entity>
         </doctrine-mapping>
 
@@ -945,17 +943,18 @@ To relate the ``Category`` and ``Product`` entities, start by creating a
     .. code-block:: xml
 
         <!-- src/Acme/StoreBundle/Resources/config/doctrine/Category.orm.xml -->
+        <?xml version="1.0" encoding="UTF-8" ?>
         <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
-                            http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+                http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
 
             <entity name="Acme\StoreBundle\Entity\Category">
                 <!-- ... -->
-                <one-to-many field="products"
+                <one-to-many
+                    field="products"
                     target-entity="Product"
-                    mapped-by="category"
-                />
+                    mapped-by="category" />
 
                 <!--
                     don't forget to init the collection in
@@ -1023,22 +1022,21 @@ object, you'll want to add a ``$category`` property to the ``Product`` class:
     .. code-block:: xml
 
         <!-- src/Acme/StoreBundle/Resources/config/doctrine/Product.orm.xml -->
+        <?xml version="1.0" encoding="UTF-8" ?>
         <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
-                            http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+                http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
 
             <entity name="Acme\StoreBundle\Entity\Product">
                 <!-- ... -->
-                <many-to-one field="category"
+                <many-to-one
+                    field="category"
                     target-entity="Category"
                     inversed-by="products"
-                    join-column="category"
-                >
-                    <join-column
-                        name="category_id"
-                        referenced-column-name="id"
-                    />
+                    join-column="category">
+
+                    <join-column name="category_id" referenced-column-name="id" />
                 </many-to-one>
             </entity>
         </doctrine-mapping>
@@ -1306,6 +1304,8 @@ the current date, only when the entity is first persisted (i.e. inserted):
 
     .. code-block:: php-annotations
 
+        // src/Acme/StoreBundle/Entity/Product.php
+
         /**
          * @ORM\PrePersist
          */
@@ -1328,16 +1328,15 @@ the current date, only when the entity is first persisted (i.e. inserted):
         <!-- src/Acme/StoreBundle/Resources/config/doctrine/Product.orm.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
-                            http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
+                http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
 
             <entity name="Acme\StoreBundle\Entity\Product">
-                    <!-- ... -->
-                    <lifecycle-callbacks>
-                        <lifecycle-callback type="prePersist"
-                            method="setCreatedAtValue" />
-                    </lifecycle-callbacks>
+                <!-- ... -->
+                <lifecycle-callbacks>
+                    <lifecycle-callback type="prePersist" method="setCreatedAtValue" />
+                </lifecycle-callbacks>
             </entity>
         </doctrine-mapping>
 
diff --git a/book/forms.rst b/book/forms.rst
index b3e3c16c1ed..34de2a148df 100644
--- a/book/forms.rst
+++ b/book/forms.rst
@@ -129,7 +129,7 @@ corresponding to the ``task`` and ``dueDate`` properties of the ``Task`` class.
 You've also assigned each a "type" (e.g. ``text``, ``date``), which, among
 other things, determines which HTML form tag(s) is rendered for that field.
 
-Finally, you added a submit button with a custom label for submitting the form to 
+Finally, you added a submit button with a custom label for submitting the form to
 the server.
 
 .. versionadded:: 2.3
@@ -1126,20 +1126,21 @@ easy to use in your application.
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd>
+            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
             <services>
-               <service id="acme_demo.form.type.task"
-                class="Acme\TaskBundle\Form\Type\TaskType">
-                  <tag name="form.type" alias="task" />
-               </service>
+                <service
+                    id="acme_demo.form.type.task"
+                    class="Acme\TaskBundle\Form\Type\TaskType">
+
+                    <tag name="form.type" alias="task" />
+                </service>
             </services>
         </container>
 
     .. code-block:: php
 
         // src/Acme/TaskBundle/Resources/config/services.php
-        use Symfony\Component\DependencyInjection\Definition;
-
         $container
             ->register(
                 'acme_demo.form.type.task',
@@ -1590,13 +1591,13 @@ file:
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:twig="http://symfony.com/schema/dic/twig"
             xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                                http://symfony.com/schema/dic/twig http://symfony.com/schema/dic/twig/twig-1.0.xsd">
+                http://symfony.com/schema/dic/twig http://symfony.com/schema/dic/twig/twig-1.0.xsd">
 
             <twig:config>
-                    <twig:form>
-                        <twig:resource>AcmeTaskBundle:Form:fields.html.twig</twig:resource>
-                    </twig:form>
-                    <!-- ... -->
+                <twig:form>
+                    <twig:resource>AcmeTaskBundle:Form:fields.html.twig</twig:resource>
+                </twig:form>
+                <!-- ... -->
             </twig:config>
         </container>
 
@@ -1676,7 +1677,7 @@ file:
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <framework:config>
                 <framework:templating>
diff --git a/book/http_cache.rst b/book/http_cache.rst
index 4b25eda1ebd..0cebde1933b 100644
--- a/book/http_cache.rst
+++ b/book/http_cache.rst
@@ -866,8 +866,7 @@ First, to use ESI, be sure to enable it in your application configuration:
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                http://symfony.com/schema/dic/symfony
-                http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <framework:config>
                 <!-- ... -->
@@ -880,7 +879,7 @@ First, to use ESI, be sure to enable it in your application configuration:
         // app/config/config.php
         $container->loadFromExtension('framework', array(
             // ...
-            'esi'    => array('enabled' => true),
+            'esi' => array('enabled' => true),
         ));
 
 Now, suppose you have a page that is relatively static, except for a news
@@ -988,8 +987,9 @@ that must be enabled in your configuration:
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:doctrine="http://symfony.com/schema/dic/framework"
             xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
+            <!-- ... -->
             <framework:config>
                 <framework:fragments path="/_fragment" />
             </framework:config>
diff --git a/book/http_fundamentals.rst b/book/http_fundamentals.rst
index fa0d80e57fb..b42e56d94ba 100644
--- a/book/http_fundamentals.rst
+++ b/book/http_fundamentals.rst
@@ -429,6 +429,7 @@ by adding an entry for ``/contact`` to your routing configuration file:
 
     .. code-block:: xml
 
+        <!-- app/config/config.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -443,8 +444,8 @@ by adding an entry for ``/contact`` to your routing configuration file:
     .. code-block:: php
 
         // app/config/routing.php
-        use Symfony\Component\Routing\RouteCollection;
         use Symfony\Component\Routing\Route;
+        use Symfony\Component\Routing\RouteCollection;
 
         $collection = new RouteCollection();
         $collection->add('contact', new Route('/contact', array(
diff --git a/book/internals.rst b/book/internals.rst
index ee8bcca6afd..1c3356aeaf1 100644
--- a/book/internals.rst
+++ b/book/internals.rst
@@ -578,7 +578,7 @@ the configuration for the development environment:
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
                                 http://symfony.com/schema/dic/webprofiler http://symfony.com/schema/dic/webprofiler/webprofiler-1.0.xsd
-                                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <!-- load the profiler -->
             <framework:config>
@@ -588,9 +588,7 @@ the configuration for the development environment:
             <!-- enable the web profiler -->
             <webprofiler:config
                 toolbar="true"
-                intercept-redirects="true"
-                verbose="true"
-            />
+                intercept-redirects="true" />
         </container>
 
     .. code-block:: php
@@ -604,7 +602,6 @@ the configuration for the development environment:
         $container->loadFromExtension('web_profiler', array(
             'toolbar'             => true,
             'intercept_redirects' => true,
-            'verbose'             => true,
         ));
 
 When ``only_exceptions`` is set to ``true``, the profiler only collects data
@@ -634,18 +631,18 @@ If you enable the web profiler, you also need to mount the profiler routes:
 
             <import
                 resource="@WebProfilerBundle/Resources/config/routing/profiler.xml"
-                prefix="/_profiler"
-            />
+                prefix="/_profiler" />
         </routes>
 
     .. code-block:: php
 
-        $collection->addCollection(
-            $loader->import(
-                "@WebProfilerBundle/Resources/config/routing/profiler.xml"
-            ),
-            '/_profiler'
-        );
+        use Symfony\Component\Routing\RouteCollection;
+
+        $profiler = $loader->import('@WebProfilerBundle/Resources/config/routing/profiler.xml');
+        $profiler->addPrefix('/_profiler');
+
+        $collection = new RouteCollection();
+        $collection->addCollection($profiler);
 
 As the profiler adds some overhead, you might want to enable it only under
 certain circumstances in the production environment. The ``only_exceptions``
diff --git a/book/page_creation.rst b/book/page_creation.rst
index 3d251aacc99..c689602a3f5 100644
--- a/book/page_creation.rst
+++ b/book/page_creation.rst
@@ -152,7 +152,8 @@ an entry when you generated the ``AcmeHelloBundle``:
             xsi:schemaLocation="http://symfony.com/schema/routing
                 http://symfony.com/schema/routing/routing-1.0.xsd">
 
-            <import resource="@AcmeHelloBundle/Resources/config/routing.xml"
+            <import
+                resource="@AcmeHelloBundle/Resources/config/routing.xml"
                 prefix="/" />
         </routes>
 
@@ -160,21 +161,27 @@ an entry when you generated the ``AcmeHelloBundle``:
 
         // app/config/routing.php
         use Symfony\Component\Routing\RouteCollection;
-        use Symfony\Component\Routing\Route;
+
+        $acmeHello = $loader->import('@AcmeHelloBundle/Resources/config/routing.php');
+        $acmeHello->addPrefix('/');
 
         $collection = new RouteCollection();
-        $collection->addCollection(
-            $loader->import('@AcmeHelloBundle/Resources/config/routing.php'),
-            '/'
-        );
+        $collection->addCollection($acmeHello);
 
         return $collection;
 
 This entry is pretty basic: it tells Symfony to load routing configuration
-from the ``Resources/config/routing.yml`` file that lives inside the ``AcmeHelloBundle``.
+from the ``Resources/config/routing.yml`` (``routing.xml`` or ``routing.php``
+in the XML and PHP code example respectively) file that lives inside the ``AcmeHelloBundle``.
 This means that you place routing configuration directly in ``app/config/routing.yml``
 or organize your routes throughout your application, and import them from here.
 
+.. note::
+
+    You are not limited to load routing configurations that are of the same
+    format. For example, you could also load a YAML file in an XML configuration
+    and vice versa.
+
 Now that the ``routing.yml`` file from the bundle is being imported, add
 the new route that defines the URL of the page that you're about to create:
 
@@ -791,9 +798,9 @@ format you prefer:
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xmlns:twig="http://symfony.com/schema/dic/twig"
             xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd
-                                http://symfony.com/schema/dic/twig http://symfony.com/schema/dic/twig/twig-1.0.xsd">
-                                
+                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd
+                http://symfony.com/schema/dic/twig http://symfony.com/schema/dic/twig/twig-1.0.xsd">
+
             <imports>
                 <import resource="parameters.yml" />
                 <import resource="security.yml" />
@@ -812,16 +819,16 @@ format you prefer:
 
     .. code-block:: php
 
+        // app/config/config.php
         $this->import('parameters.yml');
         $this->import('security.yml');
 
         $container->loadFromExtension('framework', array(
-            'secret'          => '%secret%',
-            'router'          => array(
+            'secret' => '%secret%',
+            'router' => array(
                 'resource' => '%kernel.root_dir%/config/routing.php',
             ),
             // ...
-            ),
         ));
 
         // Twig Configuration
@@ -985,20 +992,19 @@ the configuration file for the ``dev`` environment.
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <imports>
                 <import resource="config.xml" />
             </imports>
 
             <framework:config>
-                <framework:router
-                    resource="%kernel.root_dir%/config/routing_dev.xml"
-                />
+                <framework:router resource="%kernel.root_dir%/config/routing_dev.xml" />
                 <framework:profiler only-exceptions="false" />
             </framework:config>
 
             <!-- ... -->
+        </container>
 
     .. code-block:: php
 
diff --git a/book/propel.rst b/book/propel.rst
index 6b239374e64..b48b5f3a5a1 100644
--- a/book/propel.rst
+++ b/book/propel.rst
@@ -91,28 +91,31 @@ of your ``AcmeStoreBundle``:
 .. code-block:: xml
 
     <?xml version="1.0" encoding="UTF-8" ?>
-    <database name="default"
+    <database
+        name="default"
         namespace="Acme\StoreBundle\Model"
-        defaultIdMethod="native"
-    >
+        defaultIdMethod="native">
+
         <table name="product">
-            <column name="id"
+            <column
+                name="id"
                 type="integer"
                 required="true"
                 primaryKey="true"
-                autoIncrement="true"
-            />
-            <column name="name"
+                autoIncrement="true" />
+
+            <column
+                name="name"
                 type="varchar"
                 primaryString="true"
-                size="100"
-            />
-            <column name="price"
-                type="decimal"
-            />
-            <column name="description"
-                type="longvarchar"
-            />
+                size="100" />
+            <column
+                name="price"
+                type="decimal" />
+
+            <column
+                name="description"
+                type="longvarchar" />
         </table>
     </database>
 
@@ -305,28 +308,35 @@ Start by adding the ``category`` definition in your ``schema.xml``:
 .. code-block:: xml
 
     <?xml version="1.0" encoding="UTF-8" ?>
-    <database name="default"
+    <database
+        name="default"
         namespace="Acme\StoreBundle\Model"
         defaultIdMethod="native">
+
         <table name="product">
-            <column name="id"
+            <column
+                name="id"
                 type="integer"
                 required="true"
                 primaryKey="true"
                 autoIncrement="true" />
 
-            <column name="name"
+            <column
+                name="name"
                 type="varchar"
                 primaryString="true"
                 size="100" />
 
-            <column name="price"
+            <column
+                name="price"
                 type="decimal" />
 
-            <column name="description"
+            <column
+                name="description"
                 type="longvarchar" />
 
-            <column name="category_id"
+            <column
+                name="category_id"
                 type="integer" />
 
             <foreign-key foreignTable="category">
@@ -335,13 +345,15 @@ Start by adding the ``category`` definition in your ``schema.xml``:
         </table>
 
         <table name="category">
-            <column name="id"
+            <column
+                name="id"
                 type="integer"
                 required="true"
                 primaryKey="true"
                 autoIncrement="true" />
 
-            <column name="name"
+            <column
+                name="name"
                 type="varchar"
                 primaryString="true"
                 size="100" />
diff --git a/book/routing.rst b/book/routing.rst
index 3d05d462d6a..4b9898f83a5 100644
--- a/book/routing.rst
+++ b/book/routing.rst
@@ -173,7 +173,7 @@ file:
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <framework:config>
                 <!-- ... -->
@@ -210,12 +210,14 @@ A basic route consists of just two parts: the ``path`` to match and a
 
     .. code-block:: yaml
 
+        # app/config/routing.yml
         _welcome:
             path:      /
             defaults:  { _controller: AcmeDemoBundle:Main:homepage }
 
     .. code-block:: xml
 
+        <!-- app/config/routing.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -230,6 +232,7 @@ A basic route consists of just two parts: the ``path`` to match and a
 
     ..  code-block:: php
 
+        // app/config/routing.php
         use Symfony\Component\Routing\RouteCollection;
         use Symfony\Component\Routing\Route;
 
@@ -258,12 +261,14 @@ routes will contain one or more named "wildcard" placeholders:
 
     .. code-block:: yaml
 
+        # app/config/routing.yml
         blog_show:
             path:      /blog/{slug}
             defaults:  { _controller: AcmeBlogBundle:Blog:show }
 
     .. code-block:: xml
 
+        <!-- app/config/routing.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -277,6 +282,7 @@ routes will contain one or more named "wildcard" placeholders:
 
     .. code-block:: php
 
+        // app/config/routing.php
         use Symfony\Component\Routing\RouteCollection;
         use Symfony\Component\Routing\Route;
 
@@ -307,12 +313,14 @@ the available blog posts for this imaginary blog application:
 
     .. code-block:: yaml
 
+        # app/config/routing.yml
         blog:
             path:      /blog
             defaults:  { _controller: AcmeBlogBundle:Blog:index }
 
     .. code-block:: xml
 
+        <!-- app/config/routing.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -326,6 +334,7 @@ the available blog posts for this imaginary blog application:
 
     .. code-block:: php
 
+        // app/config/routing.php
         use Symfony\Component\Routing\RouteCollection;
         use Symfony\Component\Routing\Route;
 
@@ -345,12 +354,14 @@ entries? Update the route to have a new ``{page}`` placeholder:
 
     .. code-block:: yaml
 
+        # app/config/routing.yml
         blog:
             path:      /blog/{page}
             defaults:  { _controller: AcmeBlogBundle:Blog:index }
 
     .. code-block:: xml
 
+        <!-- app/config/routing.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -364,6 +375,7 @@ entries? Update the route to have a new ``{page}`` placeholder:
 
     .. code-block:: php
 
+        // app/config/routing.php
         use Symfony\Component\Routing\RouteCollection;
         use Symfony\Component\Routing\Route;
 
@@ -388,12 +400,14 @@ This is done by including it in the ``defaults`` collection:
 
     .. code-block:: yaml
 
+        # app/config/routing.yml
         blog:
             path:      /blog/{page}
             defaults:  { _controller: AcmeBlogBundle:Blog:index, page: 1 }
 
     .. code-block:: xml
 
+        <!-- app/config/routing.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -408,6 +422,7 @@ This is done by including it in the ``defaults`` collection:
 
     .. code-block:: php
 
+        // app/config/routing.php
         use Symfony\Component\Routing\RouteCollection;
         use Symfony\Component\Routing\Route;
 
@@ -458,6 +473,7 @@ Take a quick look at the routes that have been created so far:
 
     .. code-block:: yaml
 
+        # app/config/routing.yml
         blog:
             path:      /blog/{page}
             defaults:  { _controller: AcmeBlogBundle:Blog:index, page: 1 }
@@ -468,6 +484,7 @@ Take a quick look at the routes that have been created so far:
 
     .. code-block:: xml
 
+        <!-- app/config/routing.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -486,6 +503,7 @@ Take a quick look at the routes that have been created so far:
 
     .. code-block:: php
 
+        // app/config/routing.php
         use Symfony\Component\Routing\RouteCollection;
         use Symfony\Component\Routing\Route;
 
@@ -502,7 +520,7 @@ Take a quick look at the routes that have been created so far:
         return $collection;
 
 Can you spot the problem? Notice that both routes have patterns that match
-URL's that look like ``/blog/*``. The Symfony router will always choose the
+URLs that look like ``/blog/*``. The Symfony router will always choose the
 **first** matching route it finds. In other words, the ``blog_show`` route
 will *never* be matched. Instead, a URL like ``/blog/my-blog-post`` will match
 the first route (``blog``) and return a nonsense value of ``my-blog-post``
@@ -525,6 +543,7 @@ requirements can easily be added for each parameter. For example:
 
     .. code-block:: yaml
 
+        # app/config/routing.yml
         blog:
             path:      /blog/{page}
             defaults:  { _controller: AcmeBlogBundle:Blog:index, page: 1 }
@@ -533,6 +552,7 @@ requirements can easily be added for each parameter. For example:
 
     .. code-block:: xml
 
+        <!-- app/config/routing.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -548,6 +568,7 @@ requirements can easily be added for each parameter. For example:
 
     .. code-block:: php
 
+        // app/config/routing.php
         use Symfony\Component\Routing\RouteCollection;
         use Symfony\Component\Routing\Route;
 
@@ -597,6 +618,7 @@ URL:
 
     .. code-block:: yaml
 
+        # app/config/routing.yml
         homepage:
             path:      /{culture}
             defaults:  { _controller: AcmeDemoBundle:Main:homepage, culture: en }
@@ -605,6 +627,7 @@ URL:
 
     .. code-block:: xml
 
+        <!-- app/config/routing.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -620,6 +643,7 @@ URL:
 
     .. code-block:: php
 
+        // app/config/routing.php
         use Symfony\Component\Routing\RouteCollection;
         use Symfony\Component\Routing\Route;
 
@@ -662,6 +686,7 @@ be accomplished with the following route configuration:
 
     .. code-block:: yaml
 
+        # app/config/routing.yml
         contact:
             path:     /contact
             defaults: { _controller: AcmeDemoBundle:Main:contact }
@@ -674,6 +699,7 @@ be accomplished with the following route configuration:
 
     .. code-block:: xml
 
+        <!-- app/config/routing.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -691,6 +717,7 @@ be accomplished with the following route configuration:
 
     .. code-block:: php
 
+        // app/config/routing.php
         use Symfony\Component\Routing\RouteCollection;
         use Symfony\Component\Routing\Route;
 
@@ -745,6 +772,7 @@ routing system can be:
 
     .. code-block:: yaml
 
+        # app/config/routing.yml
         article_show:
           path:     /articles/{culture}/{year}/{title}.{_format}
           defaults: { _controller: AcmeDemoBundle:Article:show, _format: html }
@@ -755,6 +783,7 @@ routing system can be:
 
     .. code-block:: xml
 
+        <!-- app/config/routing.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -775,6 +804,7 @@ routing system can be:
 
     .. code-block:: php
 
+        // app/config/routing.php
         use Symfony\Component\Routing\RouteCollection;
         use Symfony\Component\Routing\Route;
 
@@ -819,7 +849,7 @@ a slash. URLs matching this route might look like:
 
     Sometimes you want to make certain parts of your routes globally configurable.
     Symfony provides you with a way to do this by leveraging service container
-    parameters. Read more about this in ":doc:`/cookbook/routing/service_container_parameters`.
+    parameters. Read more about this in ":doc:`/cookbook/routing/service_container_parameters`".
 
 Special Routing Parameters
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -833,7 +863,7 @@ that are special: each adds a unique piece of functionality inside your applicat
 
 * ``_format``: Used to set the request format (:ref:`read more <book-routing-format-param>`);
 
-* ``_locale``: Used to set the locale on the request (:ref:`read more <book-translation-locale-url>`);
+* ``_locale``: Used to set the locale on the request (:ref:`read more <book-translation-locale-url>`).
 
 .. index::
    single: Routing; Controllers
@@ -1044,7 +1074,8 @@ instead of simply ``/hello/{name}``:
             xsi:schemaLocation="http://symfony.com/schema/routing
                 http://symfony.com/schema/routing/routing-1.0.xsd">
 
-            <import resource="@AcmeHelloBundle/Resources/config/routing.xml"
+            <import
+                resource="@AcmeHelloBundle/Resources/config/routing.xml"
                 prefix="/admin" />
         </routes>
 
@@ -1053,13 +1084,10 @@ instead of simply ``/hello/{name}``:
         // app/config/routing.php
         use Symfony\Component\Routing\RouteCollection;
 
-        $collection = new RouteCollection();
-
-        $acmeHello = $loader->import(
-            "@AcmeHelloBundle/Resources/config/routing.php"
-        );
+        $acmeHello = $loader->import('@AcmeHelloBundle/Resources/config/routing.php');
         $acmeHello->addPrefix('/admin');
 
+        $collection = new RouteCollection();
         $collection->addCollection($acmeHello);
 
         return $collection;
diff --git a/book/security.rst b/book/security.rst
index 03344bcb655..c4f259c874f 100644
--- a/book/security.rst
+++ b/book/security.rst
@@ -123,7 +123,7 @@ authentication (i.e. the old-school username/password box):
                             'ryan' => array(
                                 'password' => 'ryanpass',
                                 'roles' => 'ROLE_USER',
-                                ),
+                            ),
                             'admin' => array(
                                 'password' => 'kitten',
                                 'roles' => 'ROLE_ADMIN',
@@ -455,7 +455,7 @@ Next, create the controller that will display the login form::
             } else {
                 $error = '';
             }
-            
+
             // last username entered by the user
             $lastUsername = (null === $session) ? '' : $session->get(SecurityContextInterface::LAST_USERNAME);
 
@@ -599,17 +599,26 @@ see :doc:`/cookbook/security/form_login`.
 
         .. code-block:: yaml
 
+            # app/config/security.yml
+
+            # ...
             access_control:
                 - { path: ^/, roles: ROLE_ADMIN }
 
         .. code-block:: xml
 
+            <!-- app/config/security.xml -->
+
+            <!-- ... -->
             <access-control>
                 <rule path="^/" role="ROLE_ADMIN" />
             </access-control>
 
         .. code-block:: php
 
+            // app/config/security.php
+
+            // ...
             'access_control' => array(
                 array('path' => '^/', 'role' => 'ROLE_ADMIN'),
             ),
@@ -620,12 +629,18 @@ see :doc:`/cookbook/security/form_login`.
 
         .. code-block:: yaml
 
+            # app/config/security.yml
+
+            # ...
             access_control:
                 - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY }
                 - { path: ^/, roles: ROLE_ADMIN }
 
         .. code-block:: xml
 
+            <!-- app/config/security.xml -->
+
+            <!-- ... -->
             <access-control>
                 <rule path="^/login" role="IS_AUTHENTICATED_ANONYMOUSLY" />
                 <rule path="^/" role="ROLE_ADMIN" />
@@ -633,6 +648,9 @@ see :doc:`/cookbook/security/form_login`.
 
         .. code-block:: php
 
+            // app/config/security.php
+
+            // ...
             'access_control' => array(
                 array('path' => '^/login', 'role' => 'IS_AUTHENTICATED_ANONYMOUSLY'),
                 array('path' => '^/', 'role' => 'ROLE_ADMIN'),
@@ -646,6 +664,9 @@ see :doc:`/cookbook/security/form_login`.
 
         .. code-block:: yaml
 
+            # app/config/security.yml
+
+            # ...
             firewalls:
                 login_firewall:
                     pattern:   ^/login$
@@ -656,6 +677,9 @@ see :doc:`/cookbook/security/form_login`.
 
         .. code-block:: xml
 
+            <!-- app/config/security.xml -->
+
+            <!-- ... -->
             <firewall name="login_firewall" pattern="^/login$">
                 <anonymous />
             </firewall>
@@ -665,6 +689,9 @@ see :doc:`/cookbook/security/form_login`.
 
         .. code-block:: php
 
+            // app/config/security.php
+
+            // ...
             'firewalls' => array(
                 'login_firewall' => array(
                     'pattern'   => '^/login$',
@@ -742,11 +769,21 @@ You can define as many URL patterns as you need - each is a regular expression.
     .. code-block:: xml
 
         <!-- app/config/security.xml -->
-        <config>
-            <!-- ... -->
-            <rule path="^/admin/users" role="ROLE_SUPER_ADMIN" />
-            <rule path="^/admin" role="ROLE_ADMIN" />
-        </config>
+        <?xml version="1.0" encoding="UTF-8"?>
+        <srv:container xmlns="http://symfony.com/schema/dic/security"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:srv="http://symfony.com/schema/dic/services"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+            <config>
+                <!-- ... -->
+                <access-control>
+                    <rule path="^/admin/users" role="ROLE_SUPER_ADMIN" />
+                    <rule path="^/admin" role="ROLE_ADMIN" />
+                </access-control>
+            </config>
+        </srv:container>
 
     .. code-block:: php
 
@@ -814,15 +851,30 @@ Take the following ``access_control`` entries as an example:
 
     .. code-block:: xml
 
-            <access-control>
-                <rule path="^/admin" role="ROLE_USER_IP" ip="127.0.0.1" />
-                <rule path="^/admin" role="ROLE_USER_HOST" host="symfony\.com$" />
-                <rule path="^/admin" role="ROLE_USER_METHOD" method="POST, PUT" />
-                <rule path="^/admin" role="ROLE_USER" />
-            </access-control>
+        <!-- app/config/security.xml -->
+        <?xml version="1.0" encoding="UTF-8"?>
+        <srv:container xmlns="http://symfony.com/schema/dic/security"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:srv="http://symfony.com/schema/dic/services"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+            <config>
+                <!-- ... -->
+                <access-control>
+                    <rule path="^/admin" role="ROLE_USER_IP" ip="127.0.0.1" />
+                    <rule path="^/admin" role="ROLE_USER_HOST" host="symfony\.com$" />
+                    <rule path="^/admin" role="ROLE_USER_METHOD" method="POST, PUT" />
+                    <rule path="^/admin" role="ROLE_USER" />
+                </access-control>
+            </config>
+        </srv:container>
 
     .. code-block:: php
 
+        // app/config/security.php
+        $container->loadFromExtension('security', array(
+            // ...
             'access_control' => array(
                 array(
                     'path' => '^/admin',
@@ -844,6 +896,7 @@ Take the following ``access_control`` entries as an example:
                     'role' => 'ROLE_USER',
                 ),
             ),
+        ));
 
 For each incoming request, Symfony will decide which ``access_control``
 to use based on the URI, the client's IP address, the incoming host name,
@@ -945,14 +998,29 @@ given prefix, ``/esi``, from outside access:
 
     .. code-block:: xml
 
-            <access-control>
-                <rule path="^/esi" role="IS_AUTHENTICATED_ANONYMOUSLY"
-                    ips="127.0.0.1, ::1" />
-                <rule path="^/esi" role="ROLE_NO_ACCESS" />
-            </access-control>
+        <!-- app/config/security.xml -->
+        <?xml version="1.0" encoding="UTF-8"?>
+        <srv:container xmlns="http://symfony.com/schema/dic/security"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:srv="http://symfony.com/schema/dic/services"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+            <config>
+                <!-- ... -->
+                <access-control>
+                    <rule path="^/esi" role="IS_AUTHENTICATED_ANONYMOUSLY"
+                        ips="127.0.0.1, ::1" />
+                    <rule path="^/esi" role="ROLE_NO_ACCESS" />
+                </access-control>
+            </config>
+        </srv:container>
 
     .. code-block:: php
 
+        // app/config/security.php
+        $container->loadFromExtension('security', array(
+            // ...
             'access_control' => array(
                 array(
                     'path' => '^/esi',
@@ -964,6 +1032,7 @@ given prefix, ``/esi``, from outside access:
                     'role' => 'ROLE_NO_ACCESS'
                 ),
             ),
+        ));
 
 Here is how it works when the path is ``/esi/something`` coming from the
 ``10.0.0.1`` IP:
@@ -1008,13 +1077,25 @@ the user will be redirected to ``https``:
 
     .. code-block:: xml
 
+        <!-- app/config/security.xml -->
+        <?xml version="1.0" encoding="UTF-8"?>
+        <srv:container xmlns="http://symfony.com/schema/dic/security"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:srv="http://symfony.com/schema/dic/services"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
+
             <access-control>
-                <rule path="^/cart/checkout" role="IS_AUTHENTICATED_ANONYMOUSLY"
-                    requires_channel="https" />
+                <rule path="^/cart/checkout"
+                    role="IS_AUTHENTICATED_ANONYMOUSLY"
+                    requires-channel="https" />
             </access-control>
+        </srv:container>
 
     .. code-block:: php
 
+        // app/config/security.php
+        $container->loadFromExtension('security', array(
             'access_control' => array(
                 array(
                     'path' => '^/cart/checkout',
@@ -1022,6 +1103,7 @@ the user will be redirected to ``https``:
                     'requires_channel' => 'https',
                 ),
             ),
+        ));
 
 Users
 -----
@@ -1067,15 +1149,23 @@ In fact, you've seen this already in the example in this chapter.
     .. code-block:: xml
 
         <!-- app/config/security.xml -->
-        <config>
-            <!-- ... -->
-            <provider name="default_provider">
-                <memory>
-                    <user name="ryan" password="ryanpass" roles="ROLE_USER" />
-                    <user name="admin" password="kitten" roles="ROLE_ADMIN" />
-                </memory>
-            </provider>
-        </config>
+        <?xml version="1.0" encoding="UTF-8"?>
+        <srv:container xmlns="http://symfony.com/schema/dic/security"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:srv="http://symfony.com/schema/dic/services"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+            <config>
+                <!-- ... -->
+                <provider name="default_provider">
+                    <memory>
+                        <user name="ryan" password="ryanpass" roles="ROLE_USER" />
+                        <user name="admin" password="kitten" roles="ROLE_ADMIN" />
+                    </memory>
+                </provider>
+            </config>
+        </srv:container>
 
     .. code-block:: php
 
@@ -1192,11 +1282,19 @@ class:
     .. code-block:: xml
 
         <!-- app/config/security.xml -->
-        <config>
-            <provider name="main">
-                <entity class="Acme\UserBundle\Entity\User" property="username" />
-            </provider>
-        </config>
+        <?xml version="1.0" encoding="UTF-8"?>
+        <srv:container xmlns="http://symfony.com/schema/dic/security"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:srv="http://symfony.com/schema/dic/services"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+            <config>
+                <provider name="main">
+                    <entity class="Acme\UserBundle\Entity\User" property="username" />
+                </provider>
+            </config>
+        </srv:container>
 
     .. code-block:: php
 
@@ -1262,24 +1360,34 @@ do the following:
     .. code-block:: xml
 
         <!-- app/config/security.xml -->
-        <config>
-            <!-- ... -->
-            <provider name="in_memory">
-                <memory>
-                    <user name="ryan"
-                        password="$2a$12$w/aHvnC/XNeDVrrl65b3dept8QcKqpADxUlbraVXXsC03Jam5hvoO"
-                        roles="ROLE_USER" />
-                    <user name="admin"
-                        password="$2a$12$HmOsqRDJK0HuMDQ5Fb2.AOLMQHyNHGD0seyjU3lEVusjT72QQEIpW"
-                        roles="ROLE_ADMIN" />
-                </memory>
-            </provider>
-
-            <encoder class="Symfony\Component\Security\Core\User\User"
-                algorithm="bcrypt"
-                cost="12"
-            />
-        </config>
+        <?xml version="1.0" encoding="UTF-8"?>
+        <srv:container xmlns="http://symfony.com/schema/dic/security"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:srv="http://symfony.com/schema/dic/services"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+            <config>
+                <!-- ... -->
+                <provider name="in_memory">
+                    <memory>
+                        <user
+                            name="ryan"
+                            password="$2a$12$w/aHvnC/XNeDVrrl65b3dept8QcKqpADxUlbraVXXsC03Jam5hvoO"
+                            roles="ROLE_USER" />
+                        <user
+                            name="admin"
+                            password="$2a$12$HmOsqRDJK0HuMDQ5Fb2.AOLMQHyNHGD0seyjU3lEVusjT72QQEIpW"
+                            roles="ROLE_ADMIN" />
+                    </memory>
+                </provider>
+
+                <encoder
+                    class="Symfony\Component\Security\Core\User\User"
+                    algorithm="bcrypt"
+                    cost="12" />
+            </config>
+        </srv:container>
 
     .. code-block:: php
 
@@ -1424,22 +1532,30 @@ a new provider that chains the two together:
     .. code-block:: xml
 
         <!-- app/config/security.xml -->
-        <config>
-            <provider name="chain_provider">
-                <chain>
-                    <provider>in_memory</provider>
-                    <provider>user_db</provider>
-                </chain>
-            </provider>
-            <provider name="in_memory">
-                <memory>
-                    <user name="foo" password="test" />
-                </memory>
-            </provider>
-            <provider name="user_db">
-                <entity class="Acme\UserBundle\Entity\User" property="username" />
-            </provider>
-        </config>
+        <?xml version="1.0" encoding="UTF-8"?>
+        <srv:container xmlns="http://symfony.com/schema/dic/security"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:srv="http://symfony.com/schema/dic/services"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+            <config>
+                <provider name="chain_provider">
+                    <chain>
+                        <provider>in_memory</provider>
+                        <provider>user_db</provider>
+                    </chain>
+                </provider>
+                <provider name="in_memory">
+                    <memory>
+                        <user name="foo" password="test" />
+                    </memory>
+                </provider>
+                <provider name="user_db">
+                    <entity class="Acme\UserBundle\Entity\User" property="username" />
+                </provider>
+            </config>
+        </srv:container>
 
     .. code-block:: php
 
@@ -1484,6 +1600,7 @@ the first provider is always used:
             firewalls:
                 secured_area:
                     # ...
+                    pattern: ^/
                     provider: user_db
                     http_basic:
                         realm: "Secured Demo Area"
@@ -1493,13 +1610,21 @@ the first provider is always used:
     .. code-block:: xml
 
         <!-- app/config/security.xml -->
-        <config>
-            <firewall name="secured_area" pattern="^/" provider="user_db">
-                <!-- ... -->
-                <http-basic realm="Secured Demo Area" provider="in_memory" />
-                <form-login />
-            </firewall>
-        </config>
+        <?xml version="1.0" encoding="UTF-8"?>
+        <srv:container xmlns="http://symfony.com/schema/dic/security"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:srv="http://symfony.com/schema/dic/services"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+            <config>
+                <firewall name="secured_area" pattern="^/" provider="user_db">
+                    <!-- ... -->
+                    <http-basic realm="Secured Demo Area" provider="in_memory" />
+                    <form-login />
+                </firewall>
+            </config>
+        </srv:container>
 
     .. code-block:: php
 
@@ -1508,6 +1633,7 @@ the first provider is always used:
             'firewalls' => array(
                 'secured_area' => array(
                     // ...
+                    'pattern' => '^/',
                     'provider' => 'user_db',
                     'http_basic' => array(
                         // ...
@@ -1564,10 +1690,18 @@ rules by creating a role hierarchy:
     .. code-block:: xml
 
         <!-- app/config/security.xml -->
-        <config>
-            <role id="ROLE_ADMIN">ROLE_USER</role>
-            <role id="ROLE_SUPER_ADMIN">ROLE_ADMIN, ROLE_ALLOWED_TO_SWITCH</role>
-        </config>
+        <?xml version="1.0" encoding="UTF-8"?>
+        <srv:container xmlns="http://symfony.com/schema/dic/security"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:srv="http://symfony.com/schema/dic/services"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+            <config>
+                <role id="ROLE_ADMIN">ROLE_USER</role>
+                <role id="ROLE_SUPER_ADMIN">ROLE_ADMIN, ROLE_ALLOWED_TO_SWITCH</role>
+            </config>
+        </srv:container>
 
     .. code-block:: php
 
@@ -1716,13 +1850,21 @@ the firewall can handle this automatically for you when you activate the
     .. code-block:: xml
 
         <!-- app/config/security.xml -->
-        <config>
-            <firewall name="secured_area" pattern="^/">
+        <?xml version="1.0" encoding="UTF-8"?>
+        <srv:container xmlns="http://symfony.com/schema/dic/security"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:srv="http://symfony.com/schema/dic/services"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+            <config>
+                <firewall name="secured_area" pattern="^/">
+                    <!-- ... -->
+                    <logout path="/logout" target="/" />
+                </firewall>
                 <!-- ... -->
-                <logout path="/logout" target="/" />
-            </firewall>
-            <!-- ... -->
-        </config>
+            </config>
+        </srv:container>
 
     .. code-block:: php
 
@@ -1827,11 +1969,19 @@ cookie will be ever created by Symfony2):
     .. code-block:: xml
 
         <!-- app/config/security.xml -->
-        <config>
-            <firewall stateless="true">
-                <http-basic />
-            </firewall>
-        </config>
+        <?xml version="1.0" encoding="UTF-8"?>
+        <srv:container xmlns="http://symfony.com/schema/dic/security"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:srv="http://symfony.com/schema/dic/services"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+            <config>
+                <firewall stateless="true">
+                    <http-basic />
+                </firewall>
+            </config>
+        </srv:container>
 
     .. code-block:: php
 
diff --git a/book/service_container.rst b/book/service_container.rst
index b147b233b14..a0150c6b6d1 100644
--- a/book/service_container.rst
+++ b/book/service_container.rst
@@ -416,7 +416,7 @@ configuration.
     .. code-block:: php
 
         // app/config/config.php
-        $this->import('@AcmeHelloBundle/Resources/config/services.php');
+        $loader->import('@AcmeHelloBundle/Resources/config/services.php');
 
 The ``imports`` directive allows your application to include service container
 configuration resources from any other location (most commonly from bundles).
@@ -484,7 +484,7 @@ invokes the service container extension inside the FrameworkBundle:
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <framework:config secret="xxxxxxxxxx">
                 <framework:form />
@@ -828,7 +828,7 @@ it exists and do nothing if it doesn't:
         ));
 
 In YAML, the special ``@?`` syntax tells the service container that the dependency
-is optional. Of course, the ``NewsletterManager`` must also be written to
+is optional. Of course, the ``NewsletterManager`` must also be rewritten to
 allow for an optional dependency::
 
         public function __construct(Mailer $mailer = null)
@@ -892,6 +892,7 @@ Configuring the service container is easy:
 
     .. code-block:: yaml
 
+        # src/Acme/HelloBundle/Resources/config/services.yml
         services:
             newsletter_manager:
                 class:     "%newsletter_manager.class%"
@@ -899,6 +900,7 @@ Configuring the service container is easy:
 
     .. code-block:: xml
 
+        <!-- src/Acme/HelloBundle/Resources/config/services.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -912,6 +914,7 @@ Configuring the service container is easy:
 
     .. code-block:: php
 
+        // src/Acme/HelloBundle/Resources/config/services.php
         $container->setDefinition('newsletter_manager', new Definition(
             '%newsletter_manager.class%',
             array(
@@ -946,6 +949,7 @@ to be used for a specific purpose. Take the following example:
 
     .. code-block:: yaml
 
+        # app/config/services.yml
         services:
             foo.twig.extension:
                 class: Acme\HelloBundle\Extension\FooExtension
@@ -954,19 +958,25 @@ to be used for a specific purpose. Take the following example:
 
     .. code-block:: xml
 
+        <!-- app/config/services.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
-            <service id="foo.twig.extension"
+            <service
+                id="foo.twig.extension"
                 class="Acme\HelloBundle\Extension\FooExtension">
+
                 <tag name="twig.extension" />
             </service>
         </container>
 
     .. code-block:: php
 
+        // app/config/services.php
+        use Symfony\Component\DependencyInjection\Definition;
+
         $definition = new Definition('Acme\HelloBundle\Extension\FooExtension');
         $definition->addTag('twig.extension');
         $container->setDefinition('foo.twig.extension', $definition);
diff --git a/book/templating.rst b/book/templating.rst
index babfe94881b..f37a4df97f1 100644
--- a/book/templating.rst
+++ b/book/templating.rst
@@ -727,8 +727,9 @@ tags:
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xmlns:framework="http://symfony.com/schema/dic/symfony"
                 xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                                    http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+                    http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
+                <!-- ... -->
                 <framework:config>
                     <framework:fragments path="/_fragment" />
                 </framework:config>
@@ -763,11 +764,11 @@ in your application configuration:
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
+            <!-- ... -->
             <framework:config>
-                <framework:templating
-                    hinclude-default-template="AcmeDemoBundle::hinclude.html.twig" />
+                <framework:templating hinclude-default-template="AcmeDemoBundle::hinclude.html.twig" />
             </framework:config>
         </container>
 
@@ -847,12 +848,14 @@ configuration:
 
     .. code-block:: yaml
 
+        # app/config/routing.yml
         _welcome:
             path:     /
             defaults: { _controller: AcmeDemoBundle:Welcome:index }
 
     .. code-block:: xml
 
+        <!-- app/config/routing.yml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -866,6 +869,10 @@ configuration:
 
     .. code-block:: php
 
+        // app/config/routing.php
+        use Symfony\Component\Routing\Route;
+        use Symfony\Component\Routing\RouteCollection;
+
         $collection = new RouteCollection();
         $collection->add('_welcome', new Route('/', array(
             '_controller' => 'AcmeDemoBundle:Welcome:index',
@@ -885,19 +892,21 @@ To link to the page, just use the ``path`` Twig function and refer to the route:
 
         <a href="<?php echo $view['router']->generate('_welcome') ?>">Home</a>
 
-As expected, this will generate the URL ``/``. Now for a more complicated
+As expected, this will generate the URL ``/``. Now, for a more complicated
 route:
 
 .. configuration-block::
 
     .. code-block:: yaml
 
+        # app/config/routing.yml
         article_show:
             path:     /article/{slug}
             defaults: { _controller: AcmeArticleBundle:Article:show }
 
     .. code-block:: xml
 
+        <!-- app/config/routing.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -911,6 +920,10 @@ route:
 
     .. code-block:: php
 
+        // app/config/routing.php
+        use Symfony\Component\Routing\Route;
+        use Symfony\Component\Routing\RouteCollection;
+
         $collection = new RouteCollection();
         $collection->add('article_show', new Route('/article/{slug}', array(
             '_controller' => 'AcmeArticleBundle:Article:show',
@@ -1169,11 +1182,12 @@ configuration file:
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
+            <!-- ... -->
             <framework:config>
                 <framework:templating>
-                    <framework:engine id="twig" />
+                    <framework:engine>twig</framework:engine>
                 </framework:templating>
             </framework:config>
         </container>
diff --git a/book/testing.rst b/book/testing.rst
index 7a62022a1f8..bc484bf76dc 100644
--- a/book/testing.rst
+++ b/book/testing.rst
@@ -494,8 +494,8 @@ force him with the ``followRedirects()`` method::
 
     $client->followRedirects();
 
-If you pass ``false`` to the ``followRedirects()`` method, the redirects 
-will no longer be followed::     
+If you pass ``false`` to the ``followRedirects()`` method, the redirects
+will no longer be followed::
 
     $client->followRedirects(false);
 
@@ -724,7 +724,7 @@ configuration option:
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:swiftmailer="http://symfony.com/schema/dic/swiftmailer"
             xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                                http://symfony.com/schema/dic/swiftmailer http://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd">
+                http://symfony.com/schema/dic/swiftmailer http://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd">
 
             <!-- ... -->
             <swiftmailer:config disable-delivery="true" />
diff --git a/book/translation.rst b/book/translation.rst
index ec103e2077a..6b18a4f2718 100644
--- a/book/translation.rst
+++ b/book/translation.rst
@@ -69,7 +69,7 @@ enable the ``translator`` in your configuration:
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <framework:config>
                 <framework:translator fallback="en" />
@@ -451,6 +451,7 @@ by the routing system using the special ``_locale`` parameter:
 
     .. code-block:: yaml
 
+        # app/config/routing.yml
         contact:
             path:     /{_locale}/contact
             defaults: { _controller: AcmeDemoBundle:Contact:index }
@@ -459,6 +460,7 @@ by the routing system using the special ``_locale`` parameter:
 
     .. code-block:: xml
 
+        <!-- app/config/routing.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -473,6 +475,7 @@ by the routing system using the special ``_locale`` parameter:
 
     .. code-block:: php
 
+        // app/config/routing.php
         use Symfony\Component\Routing\RouteCollection;
         use Symfony\Component\Routing\Route;
 
@@ -517,9 +520,15 @@ the framework:
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <framework:config>
-            <framework:default-locale>en</framework:default-locale>
-        </framework:config>
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:framework="http://symfony.com/schema/dic/symfony"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+            <framework:config default-locale="en" />
+        </container>
 
     .. code-block:: php
 
diff --git a/book/validation.rst b/book/validation.rst
index f0a54ab9b59..7b2cdc5ff82 100644
--- a/book/validation.rst
+++ b/book/validation.rst
@@ -272,7 +272,7 @@ annotations if you're using the annotation method to specify your constraints:
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <framework:config>
                 <framework:validation enable-annotations="true" />
@@ -1139,8 +1139,8 @@ provides a sequence of groups to be validated:
         <constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
-                http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd"
-        >
+                http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
+
             <class name="Acme\DemoBundle\Entity\User">
                 <group-sequence-provider />
                 <!-- ... -->