Merge pull request symfony#2165 from WouterJ/update_routing_22

[2.2] Updated most routing changes

Author: weaverryan

book/controller.rst

@@ -141,7 +141,7 @@ Mapping a URL to a Controller
 -----------------------------
 
 The new controller returns a simple HTML page. To actually view this page
-in your browser, you need to create a route, which maps a specific URL pattern
+in your browser, you need to create a route, which maps a specific URL path
 to the controller:
 
 .. configuration-block::
@@ -150,13 +150,13 @@ to the controller:
 
  # app/config/routing.yml
  hello:
- pattern: /hello/{name}
- defaults:  { _controller: AcmeHelloBundle:Hello:index }
+ path: /hello/{name}
+ defaults: { _controller: AcmeHelloBundle:Hello:index }
 
  .. code-block:: xml
 
  <!-- app/config/routing.xml -->
- <route id="hello" pattern="/hello/{name}">
+ <route id="hello" path="/hello/{name}">
  <default key="_controller">AcmeHelloBundle:Hello:index</default>
  </route>
 
@@ -229,13 +229,13 @@ example:
 
  # app/config/routing.yml
  hello:
- pattern: /hello/{first_name}/{last_name}
- defaults:  { _controller: AcmeHelloBundle:Hello:index, color: green }
+ path: /hello/{first_name}/{last_name}
+ defaults: { _controller: AcmeHelloBundle:Hello:index, color: green }
 
  .. code-block:: xml
 
  <!-- app/config/routing.xml -->
- <route id="hello" pattern="/hello/{first_name}/{last_name}">
+ <route id="hello" path="/hello/{first_name}/{last_name}">
  <default key="_controller">AcmeHelloBundle:Hello:index</default>
  <default key="color">green</default>
  </route>

book/from_flat_php_to_symfony2.rst

@@ -639,11 +639,11 @@ A routing configuration map provides this information in a readable format:
 
  # app/config/routing.yml
  blog_list:
- pattern: /blog
+ path:  /blog
  defaults: { _controller: AcmeBlogBundle:Blog:list }
 
  blog_show:
- pattern: /blog/show/{id}
+ path:  /blog/show/{id}
  defaults: { _controller: AcmeBlogBundle:Blog:show }
 
 Now that Symfony2 is handling all the mundane tasks, the front controller

book/http_fundamentals.rst

@@ -423,12 +423,12 @@ by adding an entry for ``/contact`` to your routing configuration file:
 
  # app/config/routing.yml
  contact:
- pattern: /contact
+ path:  /contact
  defaults: { _controller: AcmeDemoBundle:Main:contact }
 
  .. code-block:: xml
 
- <route id="contact" pattern="/contact">
+ <route id="contact" path="/contact">
  <default key="_controller">AcmeBlogBundle:Main:contact</default>
  </route>
 

book/page_creation.rst

@@ -8,7 +8,7 @@ Creating a new page in Symfony2 is a simple two-step process:
 
 * *Create a route*: A route defines the URL (e.g. ``/about``) to your page
  and specifies a controller (which is a PHP function) that Symfony2 should
- execute when the URL of an incoming request matches the route pattern;
+ execute when the URL of an incoming request matches the route path;
 
 * *Create a controller*: A controller is a PHP function that takes the incoming
  request and transforms it into the Symfony2 ``Response`` object that's
@@ -147,7 +147,7 @@ the new route that defines the URL of the page that you're about to create:
 
  # src/Acme/HelloBundle/Resources/config/routing.yml
  hello:
- pattern: /hello/{name}
+ path:  /hello/{name}
  defaults: { _controller: AcmeHelloBundle:Hello:index }
 
  .. code-block:: xml
@@ -159,7 +159,7 @@ the new route that defines the URL of the page that you're about to create:
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
 
- <route id="hello" pattern="/hello/{name}">
+ <route id="hello" path="/hello/{name}">
  <default key="_controller">AcmeHelloBundle:Hello:index</default>
  </route>
  </routes>
@@ -177,9 +177,9 @@ the new route that defines the URL of the page that you're about to create:
 
  return $collection;
 
-The routing consists of two basic pieces: the ``pattern``, which is the URL
+The routing consists of two basic pieces: the ``path``, which is the URL
 that this route will match, and a ``defaults`` array, which specifies the
-controller that should be executed. The placeholder syntax in the pattern
+controller that should be executed. The placeholder syntax in the path
 (``{name}``) is a wildcard. It means that ``/hello/Ryan``, ``/hello/Fabien``
 or any other similar URL will match this route. The ``{name}`` placeholder
 parameter will also be passed to the controller so that you can use its value