From 2bf7529f526a748f5fcf12eb26f9b29636269fea Mon Sep 17 00:00:00 2001
From: Guilhem Niot <guilhem.niot@gmail.com>
Date: Wed, 17 May 2017 13:04:41 +0200
Subject: [PATCH] Fix xml blocks

---
 bundles/best_practices.rst                | 14 +++-
 bundles/configuration.rst                 |  3 +-
 bundles/prepend_extension.rst             | 20 ++++--
 configuration/environments.rst            | 76 +++++++++++++++-----
 configuration/external_parameters.rst     | 45 ++++++++----
 configuration/override_dir_structure.rst  |  2 +
 configuration/using_parameters_in_dic.rst |  8 +--
 console/commands_as_services.rst          |  8 ++-
 console/logging.rst                       | 12 ++--
 console/request_context.rst               |  2 +-
 controller/error_pages.rst                |  9 ++-
 controller/service.rst                    | 46 +++++++++---
 controller/soap_web_service.rst           | 18 +++--
 controller/upload_file.rst                |  8 +--
 doctrine/custom_dql_functions.rst         |  6 +-
 doctrine/dbal.rst                         | 45 ++++++++----
 doctrine/multiple_entity_managers.rst     | 45 ++++++------
 doctrine/pdo_session_storage.rst          | 85 ++++++++++++++--------
 doctrine/resolve_target_entity.rst        |  7 +-
 email.rst                                 |  3 +-
 email/dev_environment.rst                 | 30 ++++----
 email/spool.rst                           | 11 +--
 event_dispatcher.rst                      |  6 +-
 event_dispatcher/before_after_filters.rst | 55 ++++++++++----
 form/create_custom_field_type.rst         | 52 ++++++++++----
 form/create_form_type_extension.rst       | 19 +++--
 form/dynamic_form_modification.rst        | 19 +++--
 form/form_collections.rst                 |  1 +
 form/form_customization.rst               | 88 ++++++++++++++++-------
 form/form_dependencies.rst                |  3 +-
 form/form_themes.rst                      |  6 +-
 form/type_guesser.rst                     |  9 ++-
 introduction/symfony1.rst                 | 30 +++++---
 logging/channels_handlers.rst             |  8 +--
 logging/monolog_console.rst               | 16 +++--
 logging/monolog_email.rst                 | 14 ++--
 logging/monolog_regex_based_excludes.rst  |  4 +-
 profiler/data_collector.rst               | 23 ++++--
 profiler/matchers.rst                     | 25 ++++---
 profiler/storage.rst                      |  4 +-
 reference/configuration/debug.rst         |  3 +-
 reference/configuration/doctrine.rst      | 13 ++--
 reference/configuration/framework.rst     | 30 +++++---
 reference/configuration/monolog.rst       |  3 +-
 reference/configuration/security.rst      | 66 +++++++++++------
 reference/configuration/swiftmailer.rst   |  7 +-
 reference/configuration/twig.rst          | 16 +++--
 reference/configuration/web_profiler.rst  | 22 ++++--
 reference/dic_tags.rst                    | 57 ++++++++++-----
 request/load_balancer_reverse_proxy.rst   |  5 +-
 request/mime_type.rst                     |  8 +--
 routing/custom_route_loader.rst           |  6 +-
 routing/service_container_parameters.rst  | 19 +++--
 routing/slash_in_parameter.rst            |  4 +-
 serializer.rst                            | 81 +++++++++++++++------
 service_container/alias_private.rst       |  3 +-
 service_container/configurators.rst       |  3 +-
 service_container/expression_language.rst |  6 +-
 service_container/factories.rst           |  9 ++-
 service_container/import.rst              |  6 +-
 service_container/injection_types.rst     |  9 ++-
 service_container/lazy_services.rst       |  3 +-
 service_container/parameters.rst          | 12 ++--
 service_container/parent_services.rst     |  8 ++-
 service_container/request.rst             |  3 +-
 service_container/scopes.rst              | 38 ++++++----
 service_container/service_decoration.rst  | 14 ++--
 service_container/synthetic_services.rst  |  3 +-
 service_container/tags.rst                | 11 +--
 session/limit_metadata_writes.rst         |  5 +-
 session/locale_sticky_session.rst         | 19 +++--
 session/php_bridge.rst                    | 10 ++-
 session/proxy_examples.rst                |  1 +
 session/sessions_directory.rst            | 13 ++--
 templating/PHP.rst                        | 24 +++++--
 templating/global_variables.rst           | 54 ++++++++++----
 templating/hinclude.rst                   |  6 +-
 templating/namespaced_paths.rst           | 17 +++--
 templating/render_without_controller.rst  |  2 -
 templating/templating_service.rst         |  3 +-
 templating/twig_extension.rst             | 21 ++++--
 validation.rst                            | 21 ++++--
 validation/custom_constraint.rst          | 17 +++--
 83 files changed, 1061 insertions(+), 505 deletions(-)

diff --git a/bundles/best_practices.rst b/bundles/best_practices.rst
index 44e65e1d66c..fb22e55d44e 100644
--- a/bundles/best_practices.rst
+++ b/bundles/best_practices.rst
@@ -348,9 +348,17 @@ The end user can provide values in any configuration file:
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <parameters>
-            <parameter key="acme_blog.author.email">fabien@example.com</parameter>
-        </parameters>
+        <?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">
+
+            <parameters>
+                <parameter key="acme_blog.author.email">fabien@example.com</parameter>
+            </parameters>
+
+        </container>
 
     .. code-block:: php
 
diff --git a/bundles/configuration.rst b/bundles/configuration.rst
index 252eff7487a..081e7df682a 100644
--- a/bundles/configuration.rst
+++ b/bundles/configuration.rst
@@ -225,7 +225,7 @@ thrown)::
         $configuration = new Configuration();
 
         $config = $this->processConfiguration($configuration, $configs);
-        
+
         // you now have these 2 config keys
         // $config['twitter']['client_id'] and $config['twitter']['client_secret']
     }
@@ -424,7 +424,6 @@ Assuming the XSD file is called ``hello-1.0.xsd``, the schema location will be
 
     <!-- app/config/config.xml -->
     <?xml version="1.0" ?>
-
     <container xmlns="http://symfony.com/schema/dic/services"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns:acme-hello="http://acme_company.com/schema/dic/hello"
diff --git a/bundles/prepend_extension.rst b/bundles/prepend_extension.rst
index 3b4107f7b70..28610a27154 100644
--- a/bundles/prepend_extension.rst
+++ b/bundles/prepend_extension.rst
@@ -12,7 +12,7 @@ users to choose to remove functionality they are not using. Creating multiple
 bundles has the drawback that configuration becomes more tedious and settings
 often need to be repeated for various bundles.
 
-It is possible to remove the disadvantage of the multiple bundle approach 
+It is possible to remove the disadvantage of the multiple bundle approach
 by enabling a single Extension to prepend the settings for any bundle.
 It can use the settings defined in the ``app/config/config.yml``
 to prepend settings just as if they had been written explicitly by
@@ -116,11 +116,21 @@ The above would be the equivalent of writing the following into the
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <acme-something:config use-acme-goodbye="false">
-            <acme-something:entity-manager-name>non_default</acme-something:entity-manager-name>
-        </acme-something: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:acme-something="http://example.org/schema/dic/acme_something"
+            xmlns:acme-other="http://example.org/schema/dic/acme_other"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
 
-        <acme-other:config use-acme-goodbye="false" />
+            <acme-something:config use-acme-goodbye="false">
+                <acme-something:entity-manager-name>non_default</acme-something:entity-manager-name>
+            </acme-something:config>
+
+            <acme-other:config use-acme-goodbye="false" />
+
+        </container>
 
     .. code-block:: php
 
diff --git a/configuration/environments.rst b/configuration/environments.rst
index f89ce2d6501..e1ff4635de8 100644
--- a/configuration/environments.rst
+++ b/configuration/environments.rst
@@ -69,11 +69,22 @@ accomplished easily and transparently:
 
     .. code-block:: xml
 
-        <imports>
-            <import resource="config.xml" />
-        </imports>
+        <?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: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">
 
-        <!-- ... -->
+            <imports>
+                <import resource="config.xml" />
+            </imports>
+
+            <!-- ... -->
+
+        </container>
 
     .. code-block:: php
 
@@ -104,11 +115,22 @@ configuration file:
     .. code-block:: xml
 
         <!-- app/config/config_dev.xml -->
-        <imports>
-            <import resource="config.xml" />
-        </imports>
+        <?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:webprofiler="http://symfony.com/schema/dic/webprofiler"
+            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">
+
+            <imports>
+                <import resource="config.xml" />
+            </imports>
+
+            <webprofiler:config toolbar="true" />
 
-        <webprofiler:config toolbar="true" />
+        </container>
 
     .. code-block:: php
 
@@ -201,7 +223,18 @@ this code and changing the environment string.
 
         .. code-block:: xml
 
-            <doctrine:dbal logging="%kernel.debug%" />
+            <?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: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:dbal logging="%kernel.debug%" />
+
+            </container>
 
         .. code-block:: php
 
@@ -283,13 +316,24 @@ The best way to accomplish this is via a new environment called, for example,
     .. code-block:: xml
 
         <!-- app/config/config_benchmark.xml -->
-        <imports>
-            <import resource="config_prod.xml" />
-        </imports>
-
-        <framework:config>
-            <framework:profiler only-exceptions="false" />
-        </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">
+
+            <imports>
+                <import resource="config_prod.xml" />
+            </imports>
+
+            <framework:config>
+                <framework:profiler only-exceptions="false" />
+            </framework:config>
+
+        </container>
 
     .. code-block:: php
 
diff --git a/configuration/external_parameters.rst b/configuration/external_parameters.rst
index a04eb59c997..93ee262ed91 100644
--- a/configuration/external_parameters.rst
+++ b/configuration/external_parameters.rst
@@ -103,17 +103,26 @@ You can now reference these parameters wherever you need them.
 
     .. code-block:: xml
 
-        <!-- xmlns:doctrine="http://symfony.com/schema/dic/doctrine" -->
-        <!-- xsi:schemaLocation="http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd"> -->
-
-        <doctrine:config>
-            <doctrine:dbal
-                driver="pdo_mysql"
-                dbname="symfony_project"
-                user="%database.user%"
-                password="%database.password%"
-            />
-        </doctrine:config>
+        <!-- app/config/config.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"
+            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>
+                <doctrine:dbal
+                    driver="pdo_mysql"
+                    dbname="symfony_project"
+                    user="%database.user%"
+                    password="%database.password%"
+                />
+            </doctrine:config>
+
+        </container>
 
     .. code-block:: php
 
@@ -150,9 +159,17 @@ in the container. The following imports a file named ``parameters.php``.
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <imports>
-            <import resource="parameters.php" />
-        </imports>
+        <?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">
+
+            <imports>
+                <import resource="parameters.php" />
+            </imports>
+
+        </container>
 
     .. code-block:: php
 
diff --git a/configuration/override_dir_structure.rst b/configuration/override_dir_structure.rst
index 2ad097b0c05..146debeabe3 100644
--- a/configuration/override_dir_structure.rst
+++ b/configuration/override_dir_structure.rst
@@ -115,6 +115,7 @@ define your own templates directory (or directories):
             <twig:config>
                 <twig:path>%kernel.root_dir%/../templates</twig:path>
             </twig:config>
+
         </container>
 
     .. code-block:: php
@@ -192,6 +193,7 @@ file:
 
                 <!-- ... -->
                 <assetic:config read-from="%kernel.root_dir%/../../public_html" />
+
             </container>
 
         .. code-block:: php
diff --git a/configuration/using_parameters_in_dic.rst b/configuration/using_parameters_in_dic.rst
index 6e68ed5eef1..4d45d7738c2 100644
--- a/configuration/using_parameters_in_dic.rst
+++ b/configuration/using_parameters_in_dic.rst
@@ -56,10 +56,10 @@ Now, examine the results to see this closely:
             <my-bundle:config logging="true" />
             <!-- true, as expected -->
 
-             <my-bundle:config logging="%kernel.debug%" />
-             <!-- true/false (depends on 2nd parameter of AppKernel),
-                  as expected, because %kernel.debug% inside configuration
-                  gets evaluated before being passed to the extension -->
+            <my-bundle:config logging="%kernel.debug%" />
+            <!-- true/false (depends on 2nd parameter of AppKernel),
+                 as expected, because %kernel.debug% inside configuration
+                 gets evaluated before being passed to the extension -->
 
             <my-bundle:config />
             <!-- passes the string "%kernel.debug%".
diff --git a/console/commands_as_services.rst b/console/commands_as_services.rst
index 3d5a24f7ee8..12bfb0cbffb 100644
--- a/console/commands_as_services.rst
+++ b/console/commands_as_services.rst
@@ -39,7 +39,7 @@ with ``console.command``:
         <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">
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
                 <service id="app.command.my_command"
@@ -47,6 +47,7 @@ with ``console.command``:
                     <tag name="console.command" />
                 </service>
             </services>
+
         </container>
 
     .. code-block:: php
@@ -89,7 +90,7 @@ store the default value in some ``%command.default_name%`` parameter::
         public function __construct($defaultName)
         {
             $this->defaultName = $defaultName;
-            
+
             parent::__construct();
         }
 
@@ -145,7 +146,7 @@ inject the ``command.default_name`` parameter:
         <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">
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <parameters>
                 <parameter key="command.default_name">Javier</parameter>
@@ -158,6 +159,7 @@ inject the ``command.default_name`` parameter:
                     <tag name="console.command" />
                 </service>
             </services>
+
         </container>
 
     .. code-block:: php
diff --git a/console/logging.rst b/console/logging.rst
index 552b141077e..0ce9072c6f6 100644
--- a/console/logging.rst
+++ b/console/logging.rst
@@ -95,8 +95,9 @@ First configure a listener for console exception events in the service container
         <!-- 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">
+            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">
 
             <services>
                 <service id="app.listener.command_exception" class="AppBundle\EventListener\ConsoleExceptionListener">
@@ -104,6 +105,7 @@ First configure a listener for console exception events in the service container
                     <tag name="kernel.event_listener" event="console.exception" />
                 </service>
             </services>
+
         </container>
 
     .. code-block:: php
@@ -189,8 +191,9 @@ First configure a listener for console terminate events in the service container
         <!-- 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">
+            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">
 
             <services>
                 <service id="app.listener.command_error" class="AppBundle\EventListener\ErrorLoggerListener">
@@ -198,6 +201,7 @@ First configure a listener for console terminate events in the service container
                     <tag name="kernel.event_listener" event="console.terminate" />
                 </service>
             </services>
+
         </container>
 
     .. code-block:: php
diff --git a/console/request_context.rst b/console/request_context.rst
index 3bd7568c18a..b0983d270ed 100644
--- a/console/request_context.rst
+++ b/console/request_context.rst
@@ -41,7 +41,6 @@ will override the defaults.
 
         <!-- app/config/parameters.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">
 
@@ -50,6 +49,7 @@ will override the defaults.
                 <parameter key="router.request_context.scheme">https</parameter>
                 <parameter key="router.request_context.base_url">my/path</parameter>
             </parameters>
+
         </container>
 
     .. code-block:: php
diff --git a/controller/error_pages.rst b/controller/error_pages.rst
index c1389b848b4..9953fb990cd 100644
--- a/controller/error_pages.rst
+++ b/controller/error_pages.rst
@@ -251,6 +251,7 @@ configuration option to point to it:
             <twig:config>
                 <twig:exception-controller>AppBundle:Exception:showException</twig:exception-controller>
             </twig:config>
+
         </container>
 
     .. code-block:: php
@@ -299,11 +300,12 @@ In that case, you might want to override one or both of the ``showAction()`` and
         .. code-block:: xml
 
             <!-- app/config/services.xml -->
-            <?xml version="1.0" encoding="utf-8" ?>
+            <?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="app.exception_controller"
                         class="AppBundle\Controller\CustomExceptionController"
@@ -312,6 +314,7 @@ In that case, you might want to override one or both of the ``showAction()`` and
                         <argument>%kernel.debug%</argument>
                     </service>
                 </services>
+
             </container>
 
         .. code-block:: php
diff --git a/controller/service.rst b/controller/service.rst
index 28836464cd0..8c9c0179a70 100644
--- a/controller/service.rst
+++ b/controller/service.rst
@@ -72,9 +72,17 @@ Then you can define it as a service as follows:
     .. code-block:: xml
 
         <!-- app/config/services.xml -->
-        <services>
-            <service id="app.hello_controller" class="AppBundle\Controller\HelloController" />
-        </services>
+        <?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">
+
+            <services>
+                <service id="app.hello_controller" class="AppBundle\Controller\HelloController" />
+            </services>
+
+        </container>
 
     .. code-block:: php
 
@@ -112,9 +120,17 @@ the route ``_controller`` value:
     .. code-block:: xml
 
         <!-- app/config/routing.xml -->
-        <route id="hello" path="/hello">
-            <default key="_controller">app.hello_controller:indexAction</default>
-        </route>
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <routes xmlns="http://symfony.com/schema/routing"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://symfony.com/schema/routing
+                http://symfony.com/schema/routing/routing-1.0.xsd">
+
+            <route id="hello" path="/hello">
+                <default key="_controller">app.hello_controller:indexAction</default>
+            </route>
+
+        </routes>
 
     .. code-block:: php
 
@@ -219,11 +235,19 @@ argument:
     .. code-block:: xml
 
         <!-- app/config/services.xml -->
-        <services>
-            <service id="app.hello_controller" class="AppBundle\Controller\HelloController">
-                <argument type="service" id="templating"/>
-            </service>
-        </services>
+        <?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">
+
+            <services>
+                <service id="app.hello_controller" class="AppBundle\Controller\HelloController">
+                    <argument type="service" id="templating"/>
+                </service>
+            </services>
+
+        </container>
 
     .. code-block:: php
 
diff --git a/controller/soap_web_service.rst b/controller/soap_web_service.rst
index 6a2fe21940e..4ef063c0e05 100644
--- a/controller/soap_web_service.rst
+++ b/controller/soap_web_service.rst
@@ -68,11 +68,19 @@ a ``HelloService`` object properly:
     .. code-block:: xml
 
         <!-- app/config/services.xml -->
-        <services>
-            <service id="hello_service" class="Acme\SoapBundle\Services\HelloService">
-                <argument type="service" id="mailer"/>
-            </service>
-        </services>
+        <?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">
+
+            <services>
+                <service id="hello_service" class="Acme\SoapBundle\Services\HelloService">
+                    <argument type="service" id="mailer"/>
+                </service>
+            </services>
+
+        </container>
 
     .. code-block:: php
 
diff --git a/controller/upload_file.rst b/controller/upload_file.rst
index 6621862ff72..c2d88bb9205 100644
--- a/controller/upload_file.rst
+++ b/controller/upload_file.rst
@@ -274,13 +274,13 @@ Then, define a service for this class:
         <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"
-        >
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
             <!-- ... -->
 
             <service id="app.brochure_uploader" class="AppBundle\FileUploader">
                 <argument>%brochures_directory%</argument>
             </service>
+
         </container>
 
     .. code-block:: php
@@ -394,8 +394,7 @@ Now, register this class as a Doctrine listener:
         <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"
-        >
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
             <!-- ... -->
 
             <service id="app.doctrine_brochure_listener"
@@ -406,6 +405,7 @@ Now, register this class as a Doctrine listener:
                 <tag name="doctrine.event_listener" event="prePersist"/>
                 <tag name="doctrine.event_listener" event="preUpdate"/>
             </service>
+
         </container>
 
     .. code-block:: php
diff --git a/doctrine/custom_dql_functions.rst b/doctrine/custom_dql_functions.rst
index 77f38f7022f..bc9687c065a 100644
--- a/doctrine/custom_dql_functions.rst
+++ b/doctrine/custom_dql_functions.rst
@@ -32,8 +32,10 @@ In Symfony, you can register your custom DQL functions as follows:
         <container xmlns="http://symfony.com/schema/dic/services"
             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">
+            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>
                 <doctrine:orm>
diff --git a/doctrine/dbal.rst b/doctrine/dbal.rst
index 70e183d84c5..99f06981e1f 100644
--- a/doctrine/dbal.rst
+++ b/doctrine/dbal.rst
@@ -40,17 +40,28 @@ To get started, configure the database connection parameters:
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <doctrine:config>
-            <doctrine:dbal
-                name="default"
-                dbname="Symfony"
-                user="root"
-                password="null"
-                charset="UTF8"
-                server-version="5.6"
-                driver="pdo_mysql"
-            />
-        </doctrine: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: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>
+                <doctrine:dbal
+                    name="default"
+                    dbname="Symfony"
+                    user="root"
+                    password="null"
+                    charset="UTF8"
+                    server-version="5.6"
+                    driver="pdo_mysql"
+                />
+            </doctrine:config>
+
+        </container>
 
     .. code-block:: php
 
@@ -107,8 +118,10 @@ mapping types, read Doctrine's `Custom Mapping Types`_ section of their document
         <container xmlns="http://symfony.com/schema/dic/services"
             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">
+            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>
                 <doctrine:dbal>
@@ -159,8 +172,10 @@ mapping type:
         <container xmlns="http://symfony.com/schema/dic/services"
             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">
+            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>
                 <doctrine:dbal>
diff --git a/doctrine/multiple_entity_managers.rst b/doctrine/multiple_entity_managers.rst
index 5f73f8701e9..d468a233b83 100644
--- a/doctrine/multiple_entity_managers.rst
+++ b/doctrine/multiple_entity_managers.rst
@@ -59,15 +59,17 @@ The following configuration code shows how you can configure two entity managers
     .. code-block:: xml
 
         <?xml version="1.0" encoding="UTF-8"?>
-        <srv:container xmlns="http://symfony.com/schema/dic/doctrine"
+        <container xmlns="http://symfony.com/schema/dic/services"
             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
-                                http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
-            <config>
-                <dbal default-connection="default">
-                    <connection name="default"
+            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>
+                <doctrine:dbal default-connection="default">
+                    <doctrine:connection name="default"
                         driver="pdo_mysql"
                         host="%database_host%"
                         port="%database_port%"
@@ -77,7 +79,7 @@ The following configuration code shows how you can configure two entity managers
                         charset="UTF8"
                     />
 
-                    <connection name="customer"
+                    <doctrine:connection name="customer"
                         driver="pdo_mysql"
                         host="%database_host2%"
                         port="%database_port2%"
@@ -86,20 +88,20 @@ The following configuration code shows how you can configure two entity managers
                         password="%database_password2%"
                         charset="UTF8"
                     />
-                </dbal>
+                </doctrine:dbal>
 
-                <orm default-entity-manager="default">
-                    <entity-manager name="default" connection="default">
-                        <mapping name="AppBundle" />
-                        <mapping name="AcmeStoreBundle" />
-                    </entity-manager>
+                <doctrine:orm default-entity-manager="default">
+                    <doctrine:entity-manager name="default" connection="default">
+                        <doctrine:mapping name="AppBundle" />
+                        <doctrine:mapping name="AcmeStoreBundle" />
+                    </doctrine:entity-manager>
 
-                    <entity-manager name="customer" connection="customer">
-                        <mapping name="AcmeCustomerBundle" />
-                    </entity-manager>
-                </orm>
-            </config>
-        </srv:container>
+                    <doctrine:entity-manager name="customer" connection="customer">
+                        <doctrine:mapping name="AcmeCustomerBundle" />
+                    </doctrine:entity-manager>
+                </doctrine:orm>
+            </doctrine:config>
+        </container>
 
     .. code-block:: php
 
@@ -227,4 +229,3 @@ The same applies to repository calls::
             ;
         }
     }
-
diff --git a/doctrine/pdo_session_storage.rst b/doctrine/pdo_session_storage.rst
index daf0c0ada6c..42166ca5d19 100644
--- a/doctrine/pdo_session_storage.rst
+++ b/doctrine/pdo_session_storage.rst
@@ -40,19 +40,28 @@ To use it, you just need to change some parameters in the main configuration fil
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <framework:config>
-            <framework:session handler-id="session.handler.pdo" cookie-lifetime="3600" auto-start="true"/>
-        </framework:config>
-
-        <services>
-            <service id="session.handler.pdo" class="Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler" public="false">
-                <argument>mysql:dbname=mydatabase</argument>
-                <argument type="collection">
-                    <argument key="db_username">myuser</argument>
-                    <argument key="db_password">mypassword</argument>
-                </argument>
-            </service>
-        </services>
+        <?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/symfony-1.0.xsd">
+
+            <framework:config>
+                <framework:session handler-id="session.handler.pdo" cookie-lifetime="3600" auto-start="true"/>
+            </framework:config>
+
+            <services>
+                <service id="session.handler.pdo" class="Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler" public="false">
+                    <argument>mysql:dbname=mydatabase</argument>
+                    <argument type="collection">
+                        <argument key="db_username">myuser</argument>
+                        <argument key="db_password">mypassword</argument>
+                    </argument>
+                </service>
+            </services>
+        </container>
 
     .. code-block:: php
 
@@ -99,16 +108,23 @@ a second array argument to ``PdoSessionHandler``:
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <services>
-            <service id="session.handler.pdo" class="Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler" public="false">
-                <argument>mysql:dbname=mydatabase</argument>
-                <argument type="collection">
-                    <argument key="db_table">sessions</argument>
-                    <argument key="db_username">myuser</argument>
-                    <argument key="db_password">mypassword</argument>
-                </argument>
-            </service>
-        </services>
+        <?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">
+
+            <services>
+                <service id="session.handler.pdo" class="Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler" public="false">
+                    <argument>mysql:dbname=mydatabase</argument>
+                    <argument type="collection">
+                        <argument key="db_table">sessions</argument>
+                        <argument key="db_username">myuser</argument>
+                        <argument key="db_password">mypassword</argument>
+                    </argument>
+                </service>
+            </services>
+        </container>
 
     .. code-block:: php
 
@@ -170,13 +186,22 @@ of your project's data, you can use the connection settings from the
 
     .. code-block:: xml
 
-        <service id="session.handler.pdo" class="Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler" public="false">
-            <argument>mysql:host=%database_host%;port=%database_port%;dbname=%database_name%</argument>
-            <argument type="collection">
-                <argument key="db_username">%database_user%</argument>
-                <argument key="db_password">%database_password%</argument>
-            </argument>
-        </service>
+        <?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">
+
+            <services>
+                <service id="session.handler.pdo" class="Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler" public="false">
+                    <argument>mysql:host=%database_host%;port=%database_port%;dbname=%database_name%</argument>
+                    <argument type="collection">
+                        <argument key="db_username">%database_user%</argument>
+                        <argument key="db_password">%database_password%</argument>
+                    </argument>
+                </service>
+            </services>
+        </container>
 
     .. code-block:: php
 
diff --git a/doctrine/resolve_target_entity.rst b/doctrine/resolve_target_entity.rst
index 92b2f1297e9..9c5901b354d 100644
--- a/doctrine/resolve_target_entity.rst
+++ b/doctrine/resolve_target_entity.rst
@@ -123,11 +123,14 @@ about the replacement:
     .. code-block:: xml
 
         <!-- app/config/config.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"
             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">
+            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>
                 <doctrine:orm>
diff --git a/email.rst b/email.rst
index 6b6af8c4768..3e736791b40 100644
--- a/email.rst
+++ b/email.rst
@@ -45,7 +45,8 @@ already included:
         <container xmlns="http://symfony.com/schema/dic/services"
             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
+            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">
 
             <swiftmailer:config
diff --git a/email/dev_environment.rst b/email/dev_environment.rst
index 42ba08ed9bb..0dc0e2fa5d4 100644
--- a/email/dev_environment.rst
+++ b/email/dev_environment.rst
@@ -37,7 +37,8 @@ will not be sent when you run tests, but will continue to be sent in the
         <container xmlns="http://symfony.com/schema/dic/services"
             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
+            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">
 
             <swiftmailer:config disable-delivery="true" />
@@ -77,7 +78,8 @@ via the ``delivery_addresses`` option:
         <container xmlns="http://symfony.com/schema/dic/services"
             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
+            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">
 
             <swiftmailer:config>
@@ -159,7 +161,8 @@ by adding the ``delivery_whitelist`` option:
         <container xmlns="http://symfony.com/schema/dic/services"
             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
+            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">
 
             <swiftmailer:config>
@@ -215,16 +218,19 @@ you to open the report with details of the sent emails.
     .. code-block:: xml
 
         <!-- app/config/config_dev.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"
             xmlns:webprofiler="http://symfony.com/schema/dic/webprofiler"
-            xsi:schemaLocation="http://symfony.com/schema/dic/webprofiler
-            http://symfony.com/schema/dic/webprofiler/webprofiler-1.0.xsd">
-        -->
-
-        <webprofiler:config
-            intercept-redirects="true"
-        />
+            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">
+
+            <webprofiler:config
+                intercept-redirects="true"
+            />
+        </container>
 
     .. code-block:: php
 
diff --git a/email/spool.rst b/email/spool.rst
index 825a9d3ee6b..2621be481b4 100644
--- a/email/spool.rst
+++ b/email/spool.rst
@@ -60,9 +60,9 @@ swiftmailer with the memory option, use the following configuration:
 Spool Using Files
 ------------------
 
-When you use the filesystem for spooling, Symfony creates a folder in the given 
+When you use the filesystem for spooling, Symfony creates a folder in the given
 path for each mail service (e.g. "default" for the default service). This folder
-will contain files for each email in the spool. So make sure this directory is 
+will contain files for each email in the spool. So make sure this directory is
 writable by Symfony (or your webserver/php)!
 
 In order to use the spool with files, use the following configuration:
@@ -85,7 +85,8 @@ In order to use the spool with files, use the following configuration:
         <container xmlns="http://symfony.com/schema/dic/services"
             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
+            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">
 
             <swiftmailer:config>
@@ -150,12 +151,12 @@ at a regular interval.
 
     If you use the memory spool, this change is transparent and has no impact.
     But when using the filesystem spool, the message class is serialized in
-    a file with the randomized class name. The problem is that this random 
+    a file with the randomized class name. The problem is that this random
     class name changes on every cache clear. So if you send a mail and then you
     clear the cache, the message will not be unserializable.
 
     On the next execution of ``swiftmailer:spool:send`` an error will raise because
     the class ``Swift_Message_<someRandomCharacters>`` doesn't exist (anymore).
 
-    The solutions are either to use the memory spool or to load the 
+    The solutions are either to use the memory spool or to load the
     ``swiftmailer`` service without the ``lazy`` option (see :doc:`/service_container/lazy_services`).
diff --git a/event_dispatcher.rst b/event_dispatcher.rst
index 59d909f715a..8bc88be3cbb 100644
--- a/event_dispatcher.rst
+++ b/event_dispatcher.rst
@@ -88,7 +88,8 @@ using a special "tag":
         <?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="app.exception_listener"
@@ -196,7 +197,8 @@ Now, you just need to register the class as a service and add the
         <?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="app.exception_subscriber"
diff --git a/event_dispatcher/before_after_filters.rst b/event_dispatcher/before_after_filters.rst
index 6827343ed5e..0ed6588c0e6 100644
--- a/event_dispatcher/before_after_filters.rst
+++ b/event_dispatcher/before_after_filters.rst
@@ -49,12 +49,19 @@ parameters key:
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <parameters>
-            <parameter key="tokens" type="collection">
-                <parameter key="client1">pass1</parameter>
-                <parameter key="client2">pass2</parameter>
-            </parameter>
-        </parameters>
+        <?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">
+
+            <parameters>
+                <parameter key="tokens" type="collection">
+                    <parameter key="client1">pass1</parameter>
+                    <parameter key="client2">pass2</parameter>
+                </parameter>
+            </parameters>
+        </container>
 
     .. code-block:: php
 
@@ -164,10 +171,19 @@ your listener to be called just before any controller is executed.
     .. code-block:: xml
 
         <!-- app/config/services.xml -->
-        <service id="app.tokens.action_listener" class="AppBundle\EventListener\TokenListener">
-            <argument>%tokens%</argument>
-            <tag name="kernel.event_listener" event="kernel.controller" method="onKernelController" />
-        </service>
+        <?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">
+
+            <services>
+                <service id="app.tokens.action_listener" class="AppBundle\EventListener\TokenListener">
+                    <argument>%tokens%</argument>
+                    <tag name="kernel.event_listener" event="kernel.controller" method="onKernelController" />
+                </service>
+            </services>
+        </container>
 
     .. code-block:: php
 
@@ -260,11 +276,20 @@ event:
     .. code-block:: xml
 
         <!-- app/config/services.xml -->
-        <service id="app.tokens.action_listener" class="AppBundle\EventListener\TokenListener">
-            <argument>%tokens%</argument>
-            <tag name="kernel.event_listener" event="kernel.controller" method="onKernelController" />
-            <tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" />
-        </service>
+        <?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">
+
+            <services>
+                <service id="app.tokens.action_listener" class="AppBundle\EventListener\TokenListener">
+                    <argument>%tokens%</argument>
+                    <tag name="kernel.event_listener" event="kernel.controller" method="onKernelController" />
+                    <tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" />
+                </service>
+            </services>
+        </container>
 
     .. code-block:: php
 
diff --git a/form/create_custom_field_type.rst b/form/create_custom_field_type.rst
index 09da766b1b8..fc8c0d905f2 100644
--- a/form/create_custom_field_type.rst
+++ b/form/create_custom_field_type.rst
@@ -172,9 +172,19 @@ link for details), create a ``gender_widget`` block to handle this:
         .. code-block:: xml
 
             <!-- app/config/config.xml -->
-            <twig:config>
-                <twig:form-theme>form/fields.html.twig</twig:form-theme>
-            </twig: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: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">
+
+                <twig:config>
+                    <twig:form-theme>form/fields.html.twig</twig:form-theme>
+                </twig:config>
+            </container>
 
         .. code-block:: php
 
@@ -283,12 +293,19 @@ example, suppose that you're storing the gender parameters in configuration:
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <parameters>
-            <parameter key="genders" type="collection">
-                <parameter key="m">Male</parameter>
-                <parameter key="f">Female</parameter>
-            </parameter>
-        </parameters>
+        <?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">
+
+            <parameters>
+                <parameter key="genders" type="collection">
+                    <parameter key="m">Male</parameter>
+                    <parameter key="f">Female</parameter>
+                </parameter>
+            </parameters>
+        </container>
 
     .. code-block:: php
 
@@ -316,10 +333,19 @@ the ``genders`` parameter value as the first argument to its to-be-created
     .. code-block:: xml
 
         <!-- src/AppBundle/Resources/config/services.xml -->
-        <service id="app.form.type.gender" class="AppBundle\Form\Type\GenderType">
-            <argument>%genders%</argument>
-            <tag name="form.type" alias="app_gender" />
-        </service>
+        <?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">
+
+            <services>
+                <service id="app.form.type.gender" class="AppBundle\Form\Type\GenderType">
+                    <argument>%genders%</argument>
+                    <tag name="form.type" alias="app_gender" />
+                </service>
+            </services>
+        </container>
 
     .. code-block:: php
 
diff --git a/form/create_form_type_extension.rst b/form/create_form_type_extension.rst
index 4368d920c4c..c3af5806d1f 100644
--- a/form/create_form_type_extension.rst
+++ b/form/create_form_type_extension.rst
@@ -108,11 +108,20 @@ tag:
 
     .. code-block:: xml
 
-        <service id="app.image_type_extension"
-            class="AppBundle\Form\Extension\ImageTypeExtension"
-        >
-            <tag name="form.type_extension" alias="file" />
-        </service>
+        <?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">
+
+            <services>
+                <service id="app.image_type_extension"
+                    class="AppBundle\Form\Extension\ImageTypeExtension"
+                >
+                    <tag name="form.type_extension" alias="file" />
+                </service>
+            </services>
+        </container>
 
     .. code-block:: php
 
diff --git a/form/dynamic_form_modification.rst b/form/dynamic_form_modification.rst
index 7d68af38e53..6c8dc979405 100644
--- a/form/dynamic_form_modification.rst
+++ b/form/dynamic_form_modification.rst
@@ -390,12 +390,19 @@ it with :ref:`dic-tags-form-type`.
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <services>
-            <service id="app.form.friend_message" class="AppBundle\Form\Type\FriendMessageFormType">
-                <argument type="service" id="security.token_storage" />
-                <tag name="form.type" alias="app_friend_message" />
-            </service>
-        </services>
+        <?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">
+
+            <services>
+                <service id="app.form.friend_message" class="AppBundle\Form\Type\FriendMessageFormType">
+                    <argument type="service" id="security.token_storage" />
+                    <tag name="form.type" alias="app_friend_message" />
+                </service>
+            </services>
+        </container>
 
     .. code-block:: php
 
diff --git a/form/form_collections.rst b/form/form_collections.rst
index 6e62a4d71bd..26fc88ea9fa 100644
--- a/form/form_collections.rst
+++ b/form/form_collections.rst
@@ -521,6 +521,7 @@ you will learn about next!).
         .. code-block:: xml
 
             <!-- src/AppBundle/Resources/config/doctrine/Task.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
diff --git a/form/form_customization.rst b/form/form_customization.rst
index beb5e2fe5d9..fe17a0e7a2f 100644
--- a/form/form_customization.rst
+++ b/form/form_customization.rst
@@ -479,10 +479,20 @@ rendered.
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <twig:config>
-            <twig:form-theme>form/fields.html.twig</twig:form-theme>
-            <!-- ... -->
-        </twig: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: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">
+
+            <twig:config>
+                <twig:form-theme>form/fields.html.twig</twig:form-theme>
+                <!-- ... -->
+            </twig:config>
+        </container>
 
     .. code-block:: php
 
@@ -512,10 +522,20 @@ resource to use such a layout:
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <twig:config>
-            <twig:form-theme>form_table_layout.html.twig</twig:form-theme>
-            <!-- ... -->
-        </twig: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: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">
+
+            <twig:config>
+                <twig:form-theme>form_table_layout.html.twig</twig:form-theme>
+                <!-- ... -->
+            </twig:config>
+        </container>
 
     .. code-block:: php
 
@@ -560,14 +580,24 @@ form is rendered.
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <framework:config>
-            <framework:templating>
-                <framework:form>
-                    <framework:resource>AppBundle:Form</framework:resource>
-                </framework:form>
-            </framework:templating>
-            <!-- ... -->
-        </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>
+                <framework:templating>
+                    <framework:form>
+                        <framework:resource>AppBundle:Form</framework:resource>
+                    </framework:form>
+                </framework:templating>
+                <!-- ... -->
+            </framework:config>
+        </container>
 
     .. code-block:: php
 
@@ -603,14 +633,24 @@ resource to use such a layout:
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <framework:config>
-            <framework:templating>
-                <framework:form>
-                    <resource>FrameworkBundle:FormTable</resource>
-                </framework:form>
-            </framework:templating>
-            <!-- ... -->
-        </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>
+                <framework:templating>
+                    <framework:form>
+                        <resource>FrameworkBundle:FormTable</resource>
+                    </framework:form>
+                </framework:templating>
+                <!-- ... -->
+            </framework:config>
+        </container>
 
     .. code-block:: php
 
diff --git a/form/form_dependencies.rst b/form/form_dependencies.rst
index 916694b4ca6..80173f97c2e 100644
--- a/form/form_dependencies.rst
+++ b/form/form_dependencies.rst
@@ -110,7 +110,8 @@ Next, register this as a service and tag it with ``form.type``:
         <?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="app.form.type.task" class="AppBundle\Form\TaskType">
diff --git a/form/form_themes.rst b/form/form_themes.rst
index 00026637dc8..76c29d3a612 100644
--- a/form/form_themes.rst
+++ b/form/form_themes.rst
@@ -212,7 +212,8 @@ file:
         <container xmlns="http://symfony.com/schema/dic/services"
             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
+            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">
 
             <twig:config>
@@ -294,7 +295,8 @@ file:
         <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
+            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>
diff --git a/form/type_guesser.rst b/form/type_guesser.rst
index 2ce5d264de4..ecf5be7928e 100644
--- a/form/type_guesser.rst
+++ b/form/type_guesser.rst
@@ -194,15 +194,14 @@ creating a service and tagging it as ``form.type_guesser``:
         <!-- app/config/services.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema-instance"
-            xsd:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
-        >
-            <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">
 
+            <services>
                 <service class="AppBundle\Form\TypeGuesser\PHPDocTypeGuesser">
                     <tag name="form.type_guesser"/>
                 </service>
-
             </services>
         </container>
 
diff --git a/introduction/symfony1.rst b/introduction/symfony1.rst
index 43df70e94dd..428462e0e00 100644
--- a/introduction/symfony1.rst
+++ b/introduction/symfony1.rst
@@ -274,10 +274,10 @@ do the following:
 
         <!-- 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"
-            xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
+            xsi:schemaLocation="http://symfony.com/schema/routing
+                http://symfony.com/schema/routing/routing-1.0.xsd">
 
             <import resource="@AcmeDemoBundle/Resources/config/routing.xml" />
         </routes>
@@ -309,9 +309,16 @@ You can use this same strategy to bring in configuration from a bundle:
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <imports>
-            <import resource="@AcmeDemoBundle/Resources/config/config.xml" />
-        </imports>
+        <?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">
+
+            <imports>
+                <import resource="@AcmeDemoBundle/Resources/config/config.xml" />
+            </imports>
+        </container>
 
     .. code-block:: php
 
@@ -342,9 +349,16 @@ key of your configuration:
 
     .. code-block:: xml
 
-        <parameters>
-            <parameter key="email.from_address">foo.bar@example.com</parameter>
-        </parameters>
+        <?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">
+
+            <parameters>
+                <parameter key="email.from_address">foo.bar@example.com</parameter>
+            </parameters>
+        </container>
 
     .. code-block:: php
 
diff --git a/logging/channels_handlers.rst b/logging/channels_handlers.rst
index 918ed2a0142..f149f31c7e0 100644
--- a/logging/channels_handlers.rst
+++ b/logging/channels_handlers.rst
@@ -56,8 +56,8 @@ in all environments, or just ``config_prod.yml`` to happen only in ``prod``:
             xsi:schemaLocation="http://symfony.com/schema/dic/services
                 http://symfony.com/schema/dic/services/services-1.0.xsd
                 http://symfony.com/schema/dic/monolog
-                http://symfony.com/schema/dic/monolog/monolog-1.0.xsd"
-        >
+                http://symfony.com/schema/dic/monolog/monolog-1.0.xsd">
+
             <monolog:config>
                 <monolog:handler name="security" type="stream" path="%kernel.logs_dir%/security.log">
                     <monolog:channels>
@@ -152,8 +152,8 @@ need to tag your services:
             xsi:schemaLocation="http://symfony.com/schema/dic/services
                 http://symfony.com/schema/dic/services/services-1.0.xsd
                 http://symfony.com/schema/dic/monolog
-                http://symfony.com/schema/dic/monolog/monolog-1.0.xsd"
-        >
+                http://symfony.com/schema/dic/monolog/monolog-1.0.xsd">
+
             <monolog:config>
                 <monolog:channel>foo</monolog:channel>
                 <monolog:channel>bar</monolog:channel>
diff --git a/logging/monolog_console.rst b/logging/monolog_console.rst
index ad8db9c1f0c..d56a5f9949b 100644
--- a/logging/monolog_console.rst
+++ b/logging/monolog_console.rst
@@ -76,7 +76,10 @@ the default in Symfony Standard Edition 2.4 too.
         <!-- app/config/config.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
-            xmlns:monolog="http://symfony.com/schema/dic/monolog">
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:monolog="http://symfony.com/schema/dic/monolog"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <monolog:config>
                 <monolog:handler name="console" type="console" />
@@ -121,7 +124,10 @@ information):
         <!-- app/config/config.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
-            xmlns:monolog="http://symfony.com/schema/dic/monolog">
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:monolog="http://symfony.com/schema/dic/monolog"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <monolog:config>
                 <monolog:handler name="console" type="console" formatter="my_formatter">
@@ -163,15 +169,15 @@ information):
         <!-- 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">
+            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">
 
              <services>
                 <service id="my_formatter" class="Symfony\Bridge\Monolog\Formatter\ConsoleFormatter">
                     <argument>[%%datetime%%] %%start_tag%%%%message%%%%end_tag%% (%%level_name%%) %%context%% %%extra%%\n</argument>
                 </service>
              </services>
-
         </container>
 
     .. code-block:: php
diff --git a/logging/monolog_email.rst b/logging/monolog_email.rst
index c7c4f773351..800c93ac009 100644
--- a/logging/monolog_email.rst
+++ b/logging/monolog_email.rst
@@ -47,11 +47,12 @@ it is broken down.
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:monolog="http://symfony.com/schema/dic/monolog"
-            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                                http://symfony.com/schema/dic/monolog http://symfony.com/schema/dic/monolog/monolog-1.0.xsd">
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd
+                http://symfony.com/schema/dic/monolog http://symfony.com/schema/dic/monolog/monolog-1.0.xsd">
 
             <monolog:config>
-                <!-- 
+                <!--
                 500 errors are logged at the critical level,
                 to also log 400 level errors (but not 404's):
                 action-level="error"
@@ -145,7 +146,7 @@ notifications to a manageable level, specially in critical failure scenarios.
 
 The messages are then passed to the ``swift`` handler. This is the handler that
 actually deals with emailing you the error. The settings for this are
-straightforward, the to and from addresses, the formatter, the content type 
+straightforward, the to and from addresses, the formatter, the content type
 and the subject.
 
 You can combine these handlers with other handlers so that the errors still
@@ -187,8 +188,9 @@ get logged on the server as well as the emails being sent:
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:monolog="http://symfony.com/schema/dic/monolog"
-            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
-                                http://symfony.com/schema/dic/monolog http://symfony.com/schema/dic/monolog/monolog-1.0.xsd">
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd
+                http://symfony.com/schema/dic/monolog http://symfony.com/schema/dic/monolog/monolog-1.0.xsd">
 
             <monolog:config>
                 <monolog:handler
diff --git a/logging/monolog_regex_based_excludes.rst b/logging/monolog_regex_based_excludes.rst
index 1c9b000a59f..51df5adf716 100644
--- a/logging/monolog_regex_based_excludes.rst
+++ b/logging/monolog_regex_based_excludes.rst
@@ -35,8 +35,8 @@ configuration:
             xsi:schemaLocation="http://symfony.com/schema/dic/services
                 http://symfony.com/schema/dic/services/services-1.0.xsd
                 http://symfony.com/schema/dic/monolog
-                http://symfony.com/schema/dic/monolog/monolog-1.0.xsd"
-        >
+                http://symfony.com/schema/dic/monolog/monolog-1.0.xsd">
+
             <monolog:config>
                 <monolog:handler type="fingers_crossed" name="main" handler="...">
                     <!-- ... -->
diff --git a/profiler/data_collector.rst b/profiler/data_collector.rst
index 6c37816a81c..f19e9c65b73 100644
--- a/profiler/data_collector.rst
+++ b/profiler/data_collector.rst
@@ -104,8 +104,8 @@ To enable a data collector, define it as a regular service and tag it as
         <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"
-        >
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
+
             <services>
                 <service id="app.request_collector"
                     class="AppBundle\DataCollector\RequestCollector"
@@ -268,8 +268,8 @@ the ``data_collector`` tag in your service configuration:
         <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"
-        >
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
+
             <services>
                 <service id="app.request_collector"
                     class="AppBundle\DataCollector\RequestCollector"
@@ -319,9 +319,18 @@ want your collector to be displayed before them, use a higher value:
     .. code-block:: xml
 
         <!-- app/config/services.xml -->
-        <service id="app.request_collector" class="AppBundle\DataCollector\RequestCollector">
-            <tag name="data_collector" template="..." id="..." priority="300" />
-        </service>
+        <?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">
+
+            <services>
+                <service id="app.request_collector" class="AppBundle\DataCollector\RequestCollector">
+                    <tag name="data_collector" template="..." id="..." priority="300" />
+                </service>
+            </services>
+        </container>
 
     .. code-block:: php
 
diff --git a/profiler/matchers.rst b/profiler/matchers.rst
index 3ba3702e956..aabebbf33a7 100644
--- a/profiler/matchers.rst
+++ b/profiler/matchers.rst
@@ -40,8 +40,7 @@ configuration:
             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/symfony-1.0.xsd">
 
             <framework:config>
                 <!-- ... -->
@@ -128,12 +127,19 @@ won't use it directly:
     .. code-block:: xml
 
         <!-- app/config/services.xml -->
-        <services>
-            <service id="app.profiler.matcher.super_admin"
-                class="AppBundle\Profiler\SuperAdminMatcher" public="false">
-                <argument type="service" id="security.authorization_checker" />
-            </service>
-        </services>
+        <?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">
+
+            <services>
+                <service id="app.profiler.matcher.super_admin"
+                    class="AppBundle\Profiler\SuperAdminMatcher" public="false">
+                    <argument type="service" id="security.authorization_checker" />
+                </service>
+            </services>
+        </container>
 
     .. code-block:: php
 
@@ -173,8 +179,7 @@ profiler to use this service as the matcher:
             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/symfony-1.0.xsd">
 
             <framework:config>
                 <!-- ... -->
diff --git a/profiler/storage.rst b/profiler/storage.rst
index fa242f1d478..206e3f12e03 100644
--- a/profiler/storage.rst
+++ b/profiler/storage.rst
@@ -31,8 +31,8 @@ uses MySQL as the storage for the profiler with a lifetime of one hour:
             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/symfony-1.0.xsd">
+
             <framework:config>
                 <framework:profiler
                     dsn="mysql:host=localhost;dbname=%database_name%"
diff --git a/reference/configuration/debug.rst b/reference/configuration/debug.rst
index e4c038b1457..c5f280641c3 100644
--- a/reference/configuration/debug.rst
+++ b/reference/configuration/debug.rst
@@ -67,7 +67,8 @@ destination for dumps. Typically, you would set this to ``php://stderr``:
         <container xmlns="http://symfony.com/schema/dic/debug"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:debug="http://symfony.com/schema/dic/debug"
-            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
                 http://symfony.com/schema/dic/debug http://symfony.com/schema/dic/debug/debug-1.0.xsd">
 
             <debug:config dump-destination="php://stderr" />
diff --git a/reference/configuration/doctrine.rst b/reference/configuration/doctrine.rst
index fa94fa6e177..2e736926be2 100644
--- a/reference/configuration/doctrine.rst
+++ b/reference/configuration/doctrine.rst
@@ -421,8 +421,7 @@ The following block shows all possible configuration keys:
             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/doctrine-1.0.xsd">
 
             <doctrine:config>
                 <doctrine:dbal
@@ -564,7 +563,10 @@ directory instead:
 
         <?xml version="1.0" charset="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
-            xmlns:doctrine="http://symfony.com/schema/dic/doctrine">
+            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">
 
             <doctrine:config>
                 <doctrine:orm auto-mapping="true">
@@ -614,7 +616,10 @@ namespace in the ``src/Entity`` directory and gives them an ``App`` alias
 
         <?xml version="1.0" charset="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
-            xmlns:doctrine="http://symfony.com/schema/dic/doctrine">
+            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">
 
             <doctrine:config>
                 <doctrine:orm>
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
index e706b7ef00e..fa9c18ec4cc 100644
--- a/reference/configuration/framework.rst
+++ b/reference/configuration/framework.rst
@@ -197,7 +197,8 @@ details, see :doc:`/request/load_balancer_reverse_proxy`.
         <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
+            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 trusted-proxies="192.0.0.1, 10.0.0.0/8" />
@@ -249,7 +250,8 @@ you use PHPstorm on the Mac OS platform, you will do something like:
         <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
+            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 ide="phpstorm://open?file=%%f&line=%%l" />
@@ -345,7 +347,8 @@ respond and the user will receive a 500 response.
         <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
+            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>
@@ -472,7 +475,8 @@ You can also set ``esi`` to ``true`` to enable it:
         <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
+            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>
@@ -833,7 +837,8 @@ setting the value to ``null``:
         <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
+            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>
@@ -879,7 +884,8 @@ This option allows you to define a base path to be used for assets:
         <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
+            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>
@@ -927,7 +933,8 @@ collection each time it generates an asset's path:
         <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
+            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>
@@ -969,7 +976,8 @@ You can group assets into packages, to specify different base URLs for them:
         <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
+            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>
@@ -1059,7 +1067,8 @@ Now, activate the ``version`` option:
         <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
+            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>
@@ -1180,7 +1189,8 @@ Assume you have custom global form themes in
         <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
+            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>
diff --git a/reference/configuration/monolog.rst b/reference/configuration/monolog.rst
index 6c69c07e31a..a067d95bc10 100644
--- a/reference/configuration/monolog.rst
+++ b/reference/configuration/monolog.rst
@@ -84,8 +84,7 @@ Full Default Configuration
             xsi:schemaLocation="http://symfony.com/schema/dic/services
                 http://symfony.com/schema/dic/services/services-1.0.xsd
                 http://symfony.com/schema/dic/monolog
-                http://symfony.com/schema/dic/monolog/monolog-1.0.xsd"
-        >
+                http://symfony.com/schema/dic/monolog/monolog-1.0.xsd">
 
             <monolog:config>
                 <monolog:handler
diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst
index fb95d172674..903d07f8fe7 100644
--- a/reference/configuration/security.rst
+++ b/reference/configuration/security.rst
@@ -410,14 +410,22 @@ Using the BCrypt Password Encoder
     .. code-block:: xml
 
         <!-- app/config/security.xml -->
-        <config>
-            <!-- ... -->
-            <encoder
-                class="Symfony\Component\Security\Core\User\User"
-                algorithm="bcrypt"
-                cost="15"
-            />
-        </config>
+        <?xml version="1.0" charset="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>
+                <!-- ... -->
+                <encoder
+                    class="Symfony\Component\Security\Core\User\User"
+                    algorithm="bcrypt"
+                    cost="15"
+                />
+            </config>
+        </srv:container>
 
     .. code-block:: php
 
@@ -492,14 +500,22 @@ multiple firewalls, the "context" could actually be shared:
     .. code-block:: xml
 
         <!-- app/config/security.xml -->
-        <security:config>
-            <security:firewall name="somename" context="my_context">
-                <!-- ... -->
-            </security:firewall>
-            <security:firewall name="othername" context="my_context">
-                <!-- ... -->
-            </security:firewall>
-        </security:config>
+        <?xml version="1.0" charset="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="somename" context="my_context">
+                    <!-- ... -->
+                </firewall>
+                <firewall name="othername" context="my_context">
+                    <!-- ... -->
+                </firewall>
+            </config>
+        </srv:container>
 
     .. code-block:: php
 
@@ -544,11 +560,19 @@ To use HTTP-Digest authentication you need to provide a realm and a key:
     .. code-block:: xml
 
         <!-- app/config/security.xml -->
-        <security:config>
-            <security:firewall name="somename">
-                <security:http-digest key="a_random_string" realm="secure-api" />
-            </security:firewall>
-        </security:config>
+        <?xml version="1.0" charset="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="somename">
+                    <http-digest key="a_random_string" realm="secure-api" />
+                </firewall>
+            </config>
+        </srv:container>
 
     .. code-block:: php
 
diff --git a/reference/configuration/swiftmailer.rst b/reference/configuration/swiftmailer.rst
index 53555680760..f9bc62b6c83 100644
--- a/reference/configuration/swiftmailer.rst
+++ b/reference/configuration/swiftmailer.rst
@@ -267,7 +267,8 @@ Full Default Configuration
         <container xmlns="http://symfony.com/schema/dic/services"
             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
+            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">
 
             <swiftmailer:config
@@ -319,8 +320,8 @@ key (the default mailer is identified by the ``default_mailer`` option):
             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/swiftmailer-1.0.xsd">
+
             <swiftmailer:config default-mailer="second_mailer">
                 <swiftmailer:mailer name="first_mailer"/>
                 <swiftmailer:mailer name="second_mailer"/>
diff --git a/reference/configuration/twig.rst b/reference/configuration/twig.rst
index 2ccfb9dc718..d07e522de0a 100644
--- a/reference/configuration/twig.rst
+++ b/reference/configuration/twig.rst
@@ -56,11 +56,13 @@ TwigBundle Configuration ("twig")
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
+        <?xml version="1.0" charset="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             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">
+            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">
 
             <twig:config
                 auto-reload="%kernel.debug%"
@@ -277,8 +279,9 @@ The values of the ``paths`` option are defined as ``key: value`` pairs where the
         <container xmlns="http://symfony.com/schema/dic/services"
             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">
+            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">
 
             <twig:config>
                 <!-- ... -->
@@ -320,8 +323,9 @@ for that directory:
         <container xmlns="http://symfony.com/schema/dic/services"
             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">
+            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">
 
             <twig:config>
                 <!-- ... -->
diff --git a/reference/configuration/web_profiler.rst b/reference/configuration/web_profiler.rst
index ebc0f35695d..bfbd4c75a44 100644
--- a/reference/configuration/web_profiler.rst
+++ b/reference/configuration/web_profiler.rst
@@ -33,9 +33,19 @@ Full Default Configuration
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <web-profiler:config
-            toolbar="false"
-            verbose="true"
-            intercept-redirects="false"
-            excluded-ajax-paths="^/bundles|^/_wdt"
-        />
+        <?xml version="1.0" charset="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:webprofiler="http://symfony.com/schema/dic/webprofiler"
+            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">
+
+            <web-profiler:config
+                toolbar="false"
+                verbose="true"
+                intercept-redirects="false"
+                excluded-ajax-paths="^/bundles|^/_wdt"
+            />
+        </container>
diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst
index 574023da1d7..8f630cfcef8 100644
--- a/reference/dic_tags.rst
+++ b/reference/dic_tags.rst
@@ -100,7 +100,8 @@ And then register it as a tagged service:
         <?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="app.custom_assetic_worker" class="AppBundle\Assetic\CustomWorker">
@@ -161,7 +162,8 @@ Second, define a service:
         <?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="app.custom_assetic_filter" class="AppBundle\Assetic\CustomFilter">
@@ -263,7 +265,8 @@ services:
         <?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="app.mysql_lock" public="false"
@@ -313,7 +316,8 @@ the generic ``app.lock`` service can be defined as follows:
         <?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="app.mysql_lock" public="false"
@@ -469,7 +473,8 @@ Then register this class and tag it with ``kernel.cache_clearer``:
         <?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="my_cache_clearer" class="AppBundle\Cache\MyClearer">
@@ -544,7 +549,8 @@ tag:
         <?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="app.warmer.my_custom_warmer"
@@ -634,7 +640,8 @@ configuration and tag it with ``kernel.event_subscriber``:
         <?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
@@ -705,7 +712,8 @@ channel when injecting the logger in a service.
         <?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="app.custom_logger" class="AppBundle\Log\CustomLogger">
@@ -762,7 +770,8 @@ You can add a processor globally:
         <?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="my_service" class="Monolog\Processor\IntrospectionProcessor">
@@ -803,7 +812,8 @@ attribute:
         <?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="my_service" class="Monolog\Processor\IntrospectionProcessor">
@@ -840,7 +850,8 @@ You can also add a processor for a specific logging channel by using the
         <?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="my_service" class="Monolog\Processor\IntrospectionProcessor">
@@ -886,7 +897,8 @@ of your configuration and tag it with ``routing.loader``:
         <?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
@@ -1035,7 +1047,8 @@ templates):
         <?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
@@ -1088,7 +1101,8 @@ Now, register your loader as a service and tag it with ``translation.loader``:
         <?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
@@ -1187,7 +1201,8 @@ required option: ``alias``, which defines the name of the extractor::
         <?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
@@ -1247,7 +1262,8 @@ This is the name that's used to determine which dumper should be used.
         <?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
@@ -1296,7 +1312,8 @@ configuration and tag it with ``twig.extension``:
         <?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
@@ -1342,7 +1359,8 @@ also have to be added as regular services:
         <?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="twig.extension.intl" class="Twig_Extensions_Extension_Intl">
@@ -1383,7 +1401,8 @@ the new loader and tag it with ``twig.loader``:
         <?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
diff --git a/request/load_balancer_reverse_proxy.rst b/request/load_balancer_reverse_proxy.rst
index 8bf9b294d07..ca41ff35bdf 100644
--- a/request/load_balancer_reverse_proxy.rst
+++ b/request/load_balancer_reverse_proxy.rst
@@ -42,8 +42,9 @@ and which reverse proxy IP addresses will be doing this type of thing:
         <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">
+            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 trusted-proxies="192.0.0.1, 10.0.0.0/8">
                 <!-- ... -->
diff --git a/request/mime_type.rst b/request/mime_type.rst
index 269156654c3..ea431d070f8 100644
--- a/request/mime_type.rst
+++ b/request/mime_type.rst
@@ -43,8 +43,8 @@ All you have to do is to configure the ``jsonp`` format:
             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/symfony-1.0.xsd">
+
             <framework:config>
                 <framework:request>
                     <framework:format name="jsonp">
@@ -91,8 +91,8 @@ All you have to do is to configure the ``jsonp`` format:
                 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/symfony-1.0.xsd">
+
                 <framework:config>
                     <framework:request>
                         <framework:format name="csv">
diff --git a/routing/custom_route_loader.rst b/routing/custom_route_loader.rst
index 9184d65cf13..0dbd3e0f920 100644
--- a/routing/custom_route_loader.rst
+++ b/routing/custom_route_loader.rst
@@ -155,7 +155,8 @@ Now define a service for the ``ExtraLoader``:
         <?xml version="1.0" ?>
         <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="app.routing_loader" class="AppBundle\Routing\ExtraLoader">
@@ -198,7 +199,8 @@ What remains to do is adding a few lines to the routing configuration:
         <?xml version="1.0" encoding="UTF-8" ?>
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
+            xsi:schemaLocation="http://symfony.com/schema/routing
+                http://symfony.com/schema/routing/routing-1.0.xsd">
 
             <import resource="." type="extra" />
         </routes>
diff --git a/routing/service_container_parameters.rst b/routing/service_container_parameters.rst
index dcfe60f8650..8e24657a40d 100644
--- a/routing/service_container_parameters.rst
+++ b/routing/service_container_parameters.rst
@@ -31,7 +31,8 @@ inside your routing configuration:
         <?xml version="1.0" encoding="UTF-8" ?>
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
+            xsi:schemaLocation="http://symfony.com/schema/routing
+                http://symfony.com/schema/routing/routing-1.0.xsd">
 
             <route id="contact" path="/{_locale}/contact">
                 <default key="_controller">AppBundle:Main:contact</default>
@@ -68,9 +69,16 @@ in your container:
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <parameters>
-            <parameter key="app.locales">en|es</parameter>
-        </parameters>
+        <?xml version="1.0" charset="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">
+
+            <parameters>
+                <parameter key="app.locales">en|es</parameter>
+            </parameters>
+        </container>
 
     .. code-block:: php
 
@@ -95,7 +103,8 @@ path):
         <?xml version="1.0" encoding="UTF-8" ?>
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
+            xsi:schemaLocation="http://symfony.com/schema/routing
+                http://symfony.com/schema/routing/routing-1.0.xsd">
 
             <route id="some_route" path="/%app.route_prefix%/contact">
                 <default key="_controller">AppBundle:Main:contact</default>
diff --git a/routing/slash_in_parameter.rst b/routing/slash_in_parameter.rst
index 9a2801705cd..a7415fb165b 100644
--- a/routing/slash_in_parameter.rst
+++ b/routing/slash_in_parameter.rst
@@ -50,10 +50,10 @@ a more permissive regex path.
     .. code-block:: xml
 
         <?xml version="1.0" encoding="UTF-8" ?>
-
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
+            xsi:schemaLocation="http://symfony.com/schema/routing
+                http://symfony.com/schema/routing/routing-1.0.xsd">
 
             <route id="_hello" path="/hello/{username}">
                 <default key="_controller">AppBundle:Demo:hello</default>
diff --git a/serializer.rst b/serializer.rst
index eb462ba0f61..f36ea204470 100644
--- a/serializer.rst
+++ b/serializer.rst
@@ -36,14 +36,24 @@ it in your configuration:
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <framework:config>
-            <!-- ... -->
-            <framework:serializer enable-annotations="true" />
-            <!--
-            Alternatively, if you don't want to use annotations
-            <framework:serializer enabled="true" />
-            -->
-        </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>
+                <!-- ... -->
+                <framework:serializer enable-annotations="true" />
+                <!--
+                Alternatively, if you don't want to use annotations
+                <framework:serializer enabled="true" />
+                -->
+            </framework:config>
+        </container>
 
     .. code-block:: php
 
@@ -115,11 +125,18 @@ Here is an example on how to load the
     .. code-block:: xml
 
         <!-- app/config/services.xml -->
-        <services>
-            <service id="get_set_method_normalizer" class="Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer" public="false">
-                <tag name="serializer.normalizer" />
-            </service>
-        </services>
+        <?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">
+
+            <services>
+                <service id="get_set_method_normalizer" class="Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer" public="false">
+                    <tag name="serializer.normalizer" />
+                </service>
+            </services>
+        </container>
 
     .. code-block:: php
 
@@ -155,10 +172,20 @@ with the following configuration:
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <framework:config>
-            <!-- ... -->
-            <framework:serializer enable-annotations="true" />
-        </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>
+                <!-- ... -->
+                <framework:serializer enable-annotations="true" />
+            </framework:config>
+        </container>
 
     .. code-block:: php
 
@@ -178,7 +205,7 @@ to your class and choose which groups to use when serializing::
         $someObject,
         'json', array('groups' => array('group1'))
     );
-    
+
 In addition to the ``@Groups`` annotation, the Serializer component also
 supports Yaml or XML files. These files are automatically loaded when being
 stored in one of the following locations:
@@ -216,10 +243,20 @@ A service leveraging `APCu`_ (and APC for PHP < 5.5) is built-in.
     .. code-block:: xml
 
         <!-- app/config/config_prod.xml -->
-        <framework:config>
-            <!-- ... -->
-            <framework:serializer cache="serializer.mapping.cache.apc" />
-        </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>
+                <!-- ... -->
+                <framework:serializer cache="serializer.mapping.cache.apc" />
+            </framework:config>
+        </container>
 
     .. code-block:: php
 
diff --git a/service_container/alias_private.rst b/service_container/alias_private.rst
index 60a736f1766..f38c987b090 100644
--- a/service_container/alias_private.rst
+++ b/service_container/alias_private.rst
@@ -97,7 +97,8 @@ services.
         <?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="app.phpmailer" class="AppBundle\Mail\PhpMailer" />
diff --git a/service_container/configurators.rst b/service_container/configurators.rst
index 4c999af6137..01590b62f54 100644
--- a/service_container/configurators.rst
+++ b/service_container/configurators.rst
@@ -140,7 +140,8 @@ You can configure the service configurator using the ``configurator`` option:
         <?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="app.email_formatter_manager" class="AppBundle\Mail\EmailFormatterManager">
diff --git a/service_container/expression_language.rst b/service_container/expression_language.rst
index 100d06b4e93..9889485cd56 100644
--- a/service_container/expression_language.rst
+++ b/service_container/expression_language.rst
@@ -37,8 +37,7 @@ of the new ``mailer_configuration`` service? One way is to use an expression:
         <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"
-            >
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
                 <service id="my_mailer" class="AppBundle\Mailer">
@@ -83,8 +82,7 @@ via a ``container`` variable. Here's another example:
         <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"
-            >
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
                 <service id="my_mailer" class="AppBundle\Mailer">
diff --git a/service_container/factories.rst b/service_container/factories.rst
index cce11ebd0fb..4814ff6edfe 100644
--- a/service_container/factories.rst
+++ b/service_container/factories.rst
@@ -55,7 +55,8 @@ configure the service container to use the
         <?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="app.newsletter_manager" class="AppBundle\Email\NewsletterManager">
@@ -114,7 +115,8 @@ Configuration of the service container then looks like this:
         <?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="app.newsletter_manager_factory"
@@ -192,7 +194,8 @@ method in the previous example takes the ``templating`` service as an argument:
         <?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>
                 <!-- ... -->
diff --git a/service_container/import.rst b/service_container/import.rst
index 75fa0722ad1..bc9da428f28 100644
--- a/service_container/import.rst
+++ b/service_container/import.rst
@@ -157,9 +157,9 @@ invokes the service container extension inside the FrameworkBundle:
         <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"
-        >
+            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 secret="xxxxxxxxxx">
                 <framework:form />
diff --git a/service_container/injection_types.rst b/service_container/injection_types.rst
index 1cad6337089..ab6b2a64bf4 100644
--- a/service_container/injection_types.rst
+++ b/service_container/injection_types.rst
@@ -53,7 +53,8 @@ service container configuration:
         <?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>
                 <!-- ... -->
@@ -133,7 +134,8 @@ that accepts the dependency::
         <?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>
                 <!-- ... -->
@@ -204,7 +206,8 @@ Another possibility is just setting public fields of the class directly::
         <?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>
                 <!-- ... -->
diff --git a/service_container/lazy_services.rst b/service_container/lazy_services.rst
index a1f31f9c9c1..11f55bfc1aa 100644
--- a/service_container/lazy_services.rst
+++ b/service_container/lazy_services.rst
@@ -60,7 +60,8 @@ You can mark the service as ``lazy`` by manipulating its definition:
         <?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="app.twig_extension" class="AppBundle\Twig\AppExtension" lazy="true" />
diff --git a/service_container/parameters.rst b/service_container/parameters.rst
index d8a01d728f6..d9ca1e3b637 100644
--- a/service_container/parameters.rst
+++ b/service_container/parameters.rst
@@ -25,7 +25,8 @@ Use the ``parameters`` section of a config file to set parameters:
         <?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">
 
             <parameters>
                 <parameter key="mailer.transport">sendmail</parameter>
@@ -62,7 +63,8 @@ and hidden with the service definition:
         <?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">
 
             <parameters>
                 <parameter key="mailer.transport">sendmail</parameter>
@@ -183,7 +185,8 @@ for all parameters that are arrays.
         <?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">
 
             <parameters>
                 <parameter key="my_mailer.gateways" type="collection">
@@ -236,7 +239,8 @@ key and define the type as ``constant``.
         <?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">
 
             <parameters>
                 <parameter key="global.constant.value" type="constant">GLOBAL_CONSTANT</parameter>
diff --git a/service_container/parent_services.rst b/service_container/parent_services.rst
index 914da6ccab8..7aeba899625 100644
--- a/service_container/parent_services.rst
+++ b/service_container/parent_services.rst
@@ -63,11 +63,12 @@ duplicated service definitions:
         <?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>
                 <!-- as no class is configured, the parent service MUST be abstract -->
-                <service id="app.base_doctrine_repository" abstract="true"> 
+                <service id="app.base_doctrine_repository" abstract="true">
                     <argument type="service" id="doctrine.entity_manager" />
 
                     <call method="setLogger">
@@ -169,7 +170,8 @@ in the child class:
         <?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>
                 <!-- ... -->
diff --git a/service_container/request.rst b/service_container/request.rst
index 30989ec1dee..7a54a00c2d0 100644
--- a/service_container/request.rst
+++ b/service_container/request.rst
@@ -50,7 +50,8 @@ Now, just inject the ``request_stack``, which behaves like any normal service:
         <?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
diff --git a/service_container/scopes.rst b/service_container/scopes.rst
index 59dea939444..960fefc33f1 100644
--- a/service_container/scopes.rst
+++ b/service_container/scopes.rst
@@ -141,13 +141,20 @@ argument is the ``ClientConfiguration`` object:
     .. code-block:: xml
 
         <!-- app/config/services.xml -->
-        <services>
-            <service id="my_mailer"
-                    class="AppBundle\Mail\Mailer"
-                    scope="client">
-                    <argument type="service" id="client_configuration" />
-            </service>
-        </services>
+        <?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">
+
+            <services>
+                <service id="my_mailer"
+                        class="AppBundle\Mail\Mailer"
+                        scope="client">
+                        <argument type="service" id="client_configuration" />
+                </service>
+            </services>
+        </container>
 
     .. code-block:: php
 
@@ -212,11 +219,18 @@ The service configuration for this class would look something like this:
     .. code-block:: xml
 
         <!-- app/config/services.xml -->
-        <services>
-            <service id="my_mailer" class="AppBundle\Mail\Mailer">
-                 <argument type="service" id="service_container" />
-            </service>
-        </services>
+        <?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">
+
+            <services>
+                <service id="my_mailer" class="AppBundle\Mail\Mailer">
+                     <argument type="service" id="service_container" />
+                </service>
+            </services>
+        </container>
 
     .. code-block:: php
 
diff --git a/service_container/service_decoration.rst b/service_container/service_decoration.rst
index 530a2596029..f5c144f58e1 100644
--- a/service_container/service_decoration.rst
+++ b/service_container/service_decoration.rst
@@ -25,16 +25,14 @@ the original service is lost:
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsd="http://www.w3.org/2001/XMLSchema-instance"
-            xsd:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
-        >
-            <services>
+            xsd:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
+            <services>
                 <service id="app.mailer" class="AppBundle\Mailer" />
 
                 <!-- this replaces the old app.mailer definition with the new
                      one, the old definition is lost -->
                 <service id="app.mailer" class="AppBundle\DecoratingMailer" />
-
             </services>
         </container>
 
@@ -73,8 +71,8 @@ a reference of the old one  as ``app.decorating_mailer.inner``:
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsd="http://www.w3.org/2001/XMLSchema-instance"
-            xsd:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
-        >
+            xsd:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
             <services>
                 <!-- ... -->
 
@@ -140,8 +138,8 @@ convention, the old ``app.mailer`` service is renamed to
             <?xml version="1.0" encoding="UTF-8" ?>
             <container xmlns="http://symfony.com/schema/dic/services"
                 xmlns:xsd="http://www.w3.org/2001/XMLSchema-instance"
-                xsd:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
-            >
+                xsd:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
                 <services>
                     <!-- ... -->
 
diff --git a/service_container/synthetic_services.rst b/service_container/synthetic_services.rst
index 301e6cae18b..9788cb59bea 100644
--- a/service_container/synthetic_services.rst
+++ b/service_container/synthetic_services.rst
@@ -47,7 +47,8 @@ configuration:
         <?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>
 
diff --git a/service_container/tags.rst b/service_container/tags.rst
index 555a2d8d88a..c1b7515e90c 100644
--- a/service_container/tags.rst
+++ b/service_container/tags.rst
@@ -114,14 +114,13 @@ Then, define the chain as a service:
         <?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="app.mailer_transport_chain"
                     class="AppBundle\Mail\TransportChain"
                 />
-
             </services>
         </container>
 
@@ -159,7 +158,8 @@ For example, you may add the following transports as services:
         <?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="app.smtp_transport" class="\Swift_SmtpTransport">
@@ -300,7 +300,8 @@ To answer this, change the service declaration:
         <?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="app.smtp_transport" class="\Swift_SmtpTransport">
diff --git a/session/limit_metadata_writes.rst b/session/limit_metadata_writes.rst
index 5708a793567..de28ccb52a8 100644
--- a/session/limit_metadata_writes.rst
+++ b/session/limit_metadata_writes.rst
@@ -33,8 +33,9 @@ than zero:
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
             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
-                                http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+            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>
                 <framework:session metadata-update-threshold="120" />
diff --git a/session/locale_sticky_session.rst b/session/locale_sticky_session.rst
index 2ac8bbf4d6a..b07e53b8f73 100644
--- a/session/locale_sticky_session.rst
+++ b/session/locale_sticky_session.rst
@@ -75,12 +75,21 @@ Then register the listener:
 
     .. code-block:: xml
 
-        <service id="app.locale_listener"
-            class="AppBundle\EventListener\LocaleListener">
-            <argument>%kernel.default_locale%</argument>
+        <?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">
 
-            <tag name="kernel.event_subscriber" />
-        </service>
+            <services>
+                <service id="app.locale_listener"
+                    class="AppBundle\EventListener\LocaleListener">
+                    <argument>%kernel.default_locale%</argument>
+
+                    <tag name="kernel.event_subscriber" />
+                </service>
+            </services>
+        </container>
 
     .. code-block:: php
 
diff --git a/session/php_bridge.rst b/session/php_bridge.rst
index c122337c0c8..125909d8cd6 100644
--- a/session/php_bridge.rst
+++ b/session/php_bridge.rst
@@ -27,7 +27,10 @@ for the ``handler_id``:
 
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
-            xmlns:framework="http://symfony.com/schema/dic/symfony">
+            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">
 
             <framework:config>
                 <framework:session storage-id="session.storage.php_bridge"
@@ -63,7 +66,10 @@ the example below:
 
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
-            xmlns:framework="http://symfony.com/schema/dic/symfony">
+            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">
 
             <framework:config>
                 <framework:session storage-id="session.storage.php_bridge"
diff --git a/session/proxy_examples.rst b/session/proxy_examples.rst
index 0bab1eef5b1..d38cfd741ba 100644
--- a/session/proxy_examples.rst
+++ b/session/proxy_examples.rst
@@ -63,6 +63,7 @@ Symfony to use your own session handler instead of the default one:
             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">
+
             <framework:config>
                 <framework:session handler-id="app.session_handler" />
             </framework:config>
diff --git a/session/sessions_directory.rst b/session/sessions_directory.rst
index 4bfedda6304..ce3df13f908 100644
--- a/session/sessions_directory.rst
+++ b/session/sessions_directory.rst
@@ -28,8 +28,8 @@ to store session data. This is because of the following configuration:
             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/symfony-1.0.xsd">
+
             <framework:config>
                 <!-- handler-id set to null will use default session handler from php.ini -->
                 <framework:session handler-id="null" />
@@ -71,8 +71,8 @@ means that when you clear the cache, any current sessions will also be deleted:
             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/symfony-1.0.xsd">
+
             <framework:config>
                 <framework:session />
             </framework:config>
@@ -121,8 +121,8 @@ session directory to ``app/sessions``:
             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/symfony-1.0.xsd">
+
             <framework:config>
                 <framework:session handler-id="session.handler.native_file"
                     save-path="%kernel.root_dir%/sessions"
@@ -139,4 +139,3 @@ session directory to ``app/sessions``:
                 'save_path'  => '%kernel.root_dir%/sessions',
             ),
         ));
-
diff --git a/templating/PHP.rst b/templating/PHP.rst
index 79a73734d49..80e74d31431 100644
--- a/templating/PHP.rst
+++ b/templating/PHP.rst
@@ -33,13 +33,23 @@ your application configuration file:
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <framework:config>
-            <!-- ... -->
-            <framework:templating>
-                <framework:engine id="twig" />
-                <framework:engine id="php" />
-            </framework:templating>
-        </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>
+                <!-- ... -->
+                <framework:templating>
+                    <framework:engine id="twig" />
+                    <framework:engine id="php" />
+                </framework:templating>
+            </framework:config>
+        </container>
 
     .. code-block:: php
 
diff --git a/templating/global_variables.rst b/templating/global_variables.rst
index 3509df5005c..c2a0551fdd1 100644
--- a/templating/global_variables.rst
+++ b/templating/global_variables.rst
@@ -20,10 +20,20 @@ This is possible inside your ``app/config/config.yml`` file:
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <twig:config>
-            <!-- ... -->
-            <twig:global key="ga_tracking">UA-xxxxx-x</twig:global>
-        </twig: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: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">
+
+            <twig:config>
+                <!-- ... -->
+                <twig:global key="ga_tracking">UA-xxxxx-x</twig:global>
+            </twig:config>
+        </container>
 
     .. code-block:: php
 
@@ -67,9 +77,19 @@ system, which lets you isolate or reuse the value:
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <twig:config>
-            <twig:global key="ga_tracking">%ga_tracking%</twig:global>
-        </twig: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: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">
+
+            <twig:config>
+                <twig:global key="ga_tracking">%ga_tracking%</twig:global>
+            </twig:config>
+        </container>
 
     .. code-block:: php
 
@@ -111,10 +131,20 @@ This should feel familiar, as it's the same syntax you use in service configurat
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <twig:config>
-            <!-- ... -->
-            <twig:global key="user_management">@app.user_management</twig:global>
-        </twig: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: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">
+
+            <twig:config>
+                <!-- ... -->
+                <twig:global key="user_management">@app.user_management</twig:global>
+            </twig:config>
+        </container>
 
     .. code-block:: php
 
@@ -124,4 +154,4 @@ This should feel familiar, as it's the same syntax you use in service configurat
              'globals' => array(
                  'user_management' => '@app.user_management',
              ),
-        ));
\ No newline at end of file
+        ));
diff --git a/templating/hinclude.rst b/templating/hinclude.rst
index 19d471a6fa2..60b50a862ce 100644
--- a/templating/hinclude.rst
+++ b/templating/hinclude.rst
@@ -53,7 +53,8 @@ tags:
             <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
+                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">
 
                 <!-- ... -->
@@ -90,7 +91,8 @@ in your application configuration:
         <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
+            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">
 
             <!-- ... -->
diff --git a/templating/namespaced_paths.rst b/templating/namespaced_paths.rst
index 543d4dc9601..03834cc06ba 100644
--- a/templating/namespaced_paths.rst
+++ b/templating/namespaced_paths.rst
@@ -51,11 +51,12 @@ directory:
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <?xml version="1.0" ?>
+        <?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:twig="http://symfony.com/schema/dic/twig"
-        >
+            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">
 
             <twig:config debug="%kernel.debug%" strict-variables="%kernel.debug%">
                 <twig:path namespace="foo_bar">%kernel.root_dir%/../vendor/acme/foo-bar/templates</twig:path>
@@ -110,10 +111,12 @@ specific template doesn't exist.
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <?xml version="1.0" ?>
+        <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
-                   xmlns:twig="http://symfony.com/schema/dic/twig"
-        >
+            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">
 
             <twig:config debug="%kernel.debug%" strict-variables="%kernel.debug%">
                 <twig:path namespace="theme">%kernel.root_dir%/../vendor/acme/themes/theme1</twig:path>
diff --git a/templating/render_without_controller.rst b/templating/render_without_controller.rst
index 236a9a33359..20e2ca240c3 100644
--- a/templating/render_without_controller.rst
+++ b/templating/render_without_controller.rst
@@ -27,7 +27,6 @@ can do this without creating a controller:
     .. code-block:: xml
 
         <?xml version="1.0" encoding="UTF-8" ?>
-
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
@@ -100,7 +99,6 @@ other variables in your route, you can control exactly how your page is cached:
     .. code-block:: xml
 
         <?xml version="1.0" encoding="UTF-8" ?>
-
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
diff --git a/templating/templating_service.rst b/templating/templating_service.rst
index 7b1ef51ae0b..48912791c31 100644
--- a/templating/templating_service.rst
+++ b/templating/templating_service.rst
@@ -42,7 +42,8 @@ configuration file:
         <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
+            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">
 
             <!-- ... -->
diff --git a/templating/twig_extension.rst b/templating/twig_extension.rst
index 183302a4778..53c320defc3 100644
--- a/templating/twig_extension.rst
+++ b/templating/twig_extension.rst
@@ -84,13 +84,20 @@ Now you must let the Service Container know about your newly created Twig Extens
     .. code-block:: xml
 
         <!-- app/config/services.xml -->
-        <services>
-            <service id="app.twig_extension"
-                class="AppBundle\Twig\AppExtension"
-                public="false">
-                <tag name="twig.extension" />
-            </service>
-        </services>
+        <?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">
+
+            <services>
+                <service id="app.twig_extension"
+                    class="AppBundle\Twig\AppExtension"
+                    public="false">
+                    <tag name="twig.extension" />
+                </service>
+            </services>
+        </container>
 
     .. code-block:: php
 
diff --git a/validation.rst b/validation.rst
index 6a1a7ac316a..017f2aff3f0 100644
--- a/validation.rst
+++ b/validation.rst
@@ -71,7 +71,8 @@ following:
         <?xml version="1.0" encoding="UTF-8" ?>
         <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">
+            xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
+                http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
 
             <class name="AppBundle\Entity\Author">
                 <property name="name">
@@ -229,7 +230,8 @@ file:
         <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
+            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>
@@ -264,7 +266,8 @@ previous configuration by the following:
         <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
+            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>
@@ -360,7 +363,8 @@ constraint, have several configuration options available. Suppose that the
         <?xml version="1.0" encoding="UTF-8" ?>
         <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">
+            xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
+                http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
 
             <class name="AppBundle\Entity\Author">
                 <property name="gender">
@@ -444,7 +448,8 @@ options can be specified in this way.
         <?xml version="1.0" encoding="UTF-8" ?>
         <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">
+            xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
+                http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
 
             <class name="AppBundle\Entity\Author">
                 <property name="gender">
@@ -573,7 +578,8 @@ class to have at least 3 characters.
         <?xml version="1.0" encoding="UTF-8" ?>
         <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">
+            xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
+                http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
 
             <class name="AppBundle\Entity\Author">
                 <property name="firstName">
@@ -658,7 +664,8 @@ this method must return ``true``:
         <?xml version="1.0" encoding="UTF-8" ?>
         <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">
+            xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
+                http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
 
             <class name="AppBundle\Entity\Author">
                 <getter property="passwordLegal">
diff --git a/validation/custom_constraint.rst b/validation/custom_constraint.rst
index c6ba3a01b25..2430143dd0e 100644
--- a/validation/custom_constraint.rst
+++ b/validation/custom_constraint.rst
@@ -183,10 +183,19 @@ tag so that the validation system knows about it:
     .. code-block:: xml
 
         <!-- app/config/services.xml -->
-        <service id="app.contains_alphanumeric_validator" class="AppBundle\Validator\Constraints\ContainsAlphanumericValidator">
-            <argument type="service" id="doctrine.orm.default_entity_manager" />
-            <tag name="validator.constraint_validator" />
-        </service>
+        <?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">
+
+            <services>
+                <service id="app.contains_alphanumeric_validator" class="AppBundle\Validator\Constraints\ContainsAlphanumericValidator">
+                    <argument type="service" id="doctrine.orm.default_entity_manager" />
+                    <tag name="validator.constraint_validator" />
+                </service>
+            </services>
+        </container>
 
     .. code-block:: php