[#2221] More tweaks to routing movement in standard distribution

Author: weaverryan

cookbook/bundles/remove.rst

@@ -48,8 +48,8 @@ that refers to the bundle.
 2.1 Remove bundle routing
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The routing for the AcmeDemoBundle can be found in
-``app/config/routing_dev.yml``. The route is ``_acme_demo``, remove this entry.
+The routing for the AcmeDemoBundle can be found in ``app/config/routing_dev.yml``.
+Remove the ``_acme_demo`` entry at the bottom of this file.
 
 2.2 Remove bundle configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

cookbook/routing/custom_route_loader.rst

@@ -35,10 +35,12 @@ and therefore have two important methods:
 :method:`Symfony\\Component\\Config\\Loader\\LoaderInterface::supports`
 and :method:`Symfony\\Component\\Config\\Loader\\LoaderInterface::load`.
 
-Take these lines from ``routing.yml``:
+Take these lines from the ``routing.yml`` in the AcmeDemoBundle of the Standard
+Edition:
 
 .. code-block:: yaml
 
+    # src/Acme/DemoBundle/Resources/config/routing.yml
     _demo:
         resource: "@AcmeDemoBundle/Controller/DemoController.php"
         type:     annotation

quick_tour/the_big_picture.rst

@@ -201,11 +201,22 @@ requested URL against some configured paths. By default, these paths
 file. When you're in the ``dev`` :ref:`environment<quick-tour-big-picture-environments>` -
 indicated by the app_**dev**.php front controller - the ``app/config/routing_dev.yml``
 configuration file is also loaded. In the Standard Edition, the routes to
-these "demo" pages are placed in that file:
+these "demo" pages are imported from this file:
 
 .. code-block:: yaml
 
     # app/config/routing_dev.yml
+    # ...
+
+    # AcmeDemoBundle routes (to be removed)
+    _acme_demo:
+        resource: "@AcmeDemoBundle/Resources/config/routing.yml"
+
+This imports a ``routing.yml`` file that lives inside the AcmeDemoBundle:
+
+.. code-block:: yaml
+
+    # src/Acme/DemoBundle/Resources/config/routing.yml
     _welcome:
         path:  /
         defaults: { _controller: AcmeDemoBundle:Welcome:index }
@@ -318,7 +329,8 @@ key:
 
 .. code-block:: yaml
 
-    # app/config/routing_dev.yml
+    # src/Acme/DemoBundle/Resources/config/routing.yml
+    # ...
     _demo:
         resource: "@AcmeDemoBundle/Controller/DemoController.php"
         type:     annotation