Merge remote-tracking branch 'origin/2.0' into 2.0

weaverryan · weaverryan · commit 1b417c50e59c · 2013-03-30T15:53:13.000-05:00
diff --git a/components/dependency_injection/introduction.rst b/components/dependency_injection/introduction.rst
@@ -229,7 +229,6 @@ config files:
 
     .. code-block:: yaml
 
-        # src/Acme/HelloBundle/Resources/config/services.yml
         parameters:
             # ...
             mailer.transport: sendmail
@@ -245,7 +244,6 @@ config files:
 
     .. code-block:: xml
 
-        <!-- src/Acme/HelloBundle/Resources/config/services.xml -->
         <parameters>
             <!-- ... -->
             <parameter key="mailer.transport">sendmail</parameter>
diff --git a/cookbook/profiler/data_collector.rst b/cookbook/profiler/data_collector.rst
@@ -138,7 +138,7 @@ All blocks have access to the ``collector`` object.
 .. tip::
 
     Built-in templates use a base64 encoded image for the toolbar (``<img
-    src="src="data:image/png;base64,..."``). You can easily calculate the
+    src="data:image/png;base64,..."``). You can easily calculate the
     base64 value for an image with this little script: ``echo
     base64_encode(file_get_contents($_SERVER['argv'][1]));``.
 
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/symfony1.rst b/cookbook/symfony1.rst
@@ -20,7 +20,7 @@ So, sit back and relax as you travel from "then" to "now".
 Directory Structure
 -------------------
 
-When looking at a Symfony2 project - for example, the `Symfony2 Standard`_ -
+When looking at a Symfony2 project - for example, the `Symfony2 Standard Edition`_ -
 you'll notice a very different directory structure than in symfony1. The
 differences, however, are somewhat superficial.
 
@@ -133,13 +133,13 @@ example::
     }
 
 The file itself lives at
-``vendor/bundle/Sensio/Bundle/FrameworkExtraBundle/SensioFrameworkExtraBundle.php``.
+``vendor/bundles/Sensio/Bundle/FrameworkExtraBundle/SensioFrameworkExtraBundle.php``.
 As you can see, the location of the file follows the namespace of the class.
 Specifically, the namespace, ``Sensio\Bundle\FrameworkExtraBundle``, spells out
 the directory that the file should live in
-(``vendor/bundle/Sensio/Bundle/FrameworkExtraBundle``). This is because, in the
+(``vendor/bundles/Sensio/Bundle/FrameworkExtraBundle``). This is because, in the
 ``app/autoload.php`` file, you'll configure Symfony to look for the ``Sensio``
-namespace in the ``vendor/bundle`` directory:
+namespace in the ``vendor/bundles`` directory:
 
 .. code-block:: php
 
@@ -367,4 +367,4 @@ In reality, the Symfony2 configuration is much more powerful and is used
 primarily to configure objects that you can use. For more information, see
 the chapter titled ":doc:`/book/service_container`".
 
-.. _`Symfony2 Standard`: https://github.com/symfony/symfony-standard
+.. _`Symfony2 Standard Edition`: https://github.com/symfony/symfony-standard
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
