Merge pull request symfony#2329 from caponica/YML_before_XML

weaverryan · weaverryan · commit aaf55b04000c · 2013-03-30T13:27:02.000-07:00
Reordered two code blocks so that YML appears before XML
diff --git a/cookbook/request/mime_type.rst b/cookbook/request/mime_type.rst
@@ -43,11 +43,20 @@ project::
 Registering your Listener
 -------------------------
 
-As for any other listener, you need to add it in one of your configuration
-file and register it as a listener by adding the ``kernel.event_listener`` tag:
+As with any other listener, you need to add it in one of your configuration
+files and register it as a listener by adding the ``kernel.event_listener`` tag:
 
 .. configuration-block::
 
+    .. code-block:: yaml
+
+        # app/config/config.yml
+        services:
+            acme.demobundle.listener.request:
+                class: Acme\DemoBundle\RequestListener
+                tags:
+                    - { name: kernel.event_listener, event: kernel.request, method: onKernelRequest }
+
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
@@ -63,15 +72,6 @@ file and register it as a listener by adding the ``kernel.event_listener`` tag:
             </services>
         </container>
 
-    .. code-block:: yaml
-
-        # app/config/config.yml
-        services:
-            acme.demobundle.listener.request:
-                class: Acme\DemoBundle\RequestListener
-                tags:
-                    - { name: kernel.event_listener, event: kernel.request, method: onKernelRequest }
-
     .. code-block:: php
 
         # app/config/config.php
diff --git a/cookbook/templating/twig_extension.rst b/cookbook/templating/twig_extension.rst
@@ -56,19 +56,10 @@ As an example you'll create a price filter to format a given number into price::
 Register an Extension as a Service
 ----------------------------------
 
-Now you must let Service Container know about your newly created Twig Extension:
+Now you must let the Service Container know about your newly created Twig Extension:
 
 .. configuration-block::
 
-    .. code-block:: xml
-
-        <!-- src/Acme/DemoBundle/Resources/config/services.xml -->
-        <services>
-            <service id="acme.twig.acme_extension" class="Acme\DemoBundle\Twig\AcmeExtension">
-                <tag name="twig.extension" />
-            </service>
-        </services>
-
     .. code-block:: yaml
 
         # src/Acme/DemoBundle/Resources/config/services.yml
@@ -78,6 +69,15 @@ Now you must let Service Container know about your newly created Twig Extension:
                 tags:
                     - { name: twig.extension }
 
+    .. code-block:: xml
+
+        <!-- src/Acme/DemoBundle/Resources/config/services.xml -->
+        <services>
+            <service id="acme.twig.acme_extension" class="Acme\DemoBundle\Twig\AcmeExtension">
+                <tag name="twig.extension" />
+            </service>
+        </services>
+
     .. code-block:: php
 
         // src/Acme/DemoBundle/Resources/config/services.php
