Merge pull request symfony#2726 from WouterJ/issue_2719

Fixed deprecated route methods
lemoinem · Jun 16, 2013 · 1f3a687 · 1f3a687
2 parents 28f4ae7 + 041df67
commit 1f3a687
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/book/routing.rst b/book/routing.rst
@@ -1026,7 +1026,11 @@ instead of simply ``/hello/{name}``:
         use Symfony\Component\Routing\RouteCollection;
 
         $collection = new RouteCollection();
-        $collection->addCollection($loader->import("@AcmeHelloBundle/Resources/config/routing.php"), '/admin');
+
+        $acmeHello = $loader->import("@AcmeHelloBundle/Resources/config/routing.php");
+        $acmeHello->setPrefix('/admin');
+
+        $collection->addCollection($acmeHello);
 
         return $collection;
 

diff --git a/cookbook/routing/service_container_parameters.rst b/cookbook/routing/service_container_parameters.rst
@@ -75,7 +75,7 @@ in your container:
 
     .. code-block:: php
 
-        # app/config/config.php
+        // app/config/config.php
         $container->setParameter('acme_demo.locales', 'en|es');
 
 You can also use a parameter to define your route path (or part of your