Merge pull request symfony#2726 from WouterJ/issue_2719

Fixed deprecated route methods

Author: weaverryan

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;
 

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