[#2165] Filling in a few more changes of pattern -> path

weaverryan · weaverryan · commit 6dbbb3c5eca0 · 2013-01-22T07:01:04.000-08:00
diff --git a/book/security.rst b/book/security.rst
@@ -1709,7 +1709,7 @@ a route so that you can use it to generate the URL:
 
         # app/config/routing.yml
         logout:
-            pattern:   /logout
+            path:   /logout
 
     .. code-block:: xml
 
@@ -1720,7 +1720,7 @@ a route so that you can use it to generate the URL:
             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="logout" pattern="/logout" />
+            <route id="logout" path="/logout" />
 
         </routes>
 
diff --git a/cookbook/configuration/apache_router.rst b/cookbook/configuration/apache_router.rst
@@ -37,7 +37,7 @@ To test that it's working, let's create a very basic route for demo bundle:
 
     # app/config/routing.yml
     hello:
-        pattern:  /hello/{name}
+        path:  /hello/{name}
         defaults: { _controller: AcmeDemoBundle:Demo:hello }
 
 
diff --git a/cookbook/controller/service.rst b/cookbook/controller/service.rst
@@ -22,7 +22,7 @@ value:
 .. code-block:: yaml
 
     my_controller:
-        pattern:   /
+        path:   /
         defaults:  { _controller: my_controller:indexAction }
 
 To use a controller in this way, it must be defined in the service container
diff --git a/cookbook/templating/PHP.rst b/cookbook/templating/PHP.rst
@@ -282,7 +282,7 @@ pattern:
 
     # src/Acme/HelloBundle/Resources/config/routing.yml
     hello: # The route name
-        pattern:  /hello/{name}
+        path:  /hello/{name}
         defaults: { _controller: AcmeHelloBundle:Hello:index }
 
 Using Assets: images, JavaScripts, and stylesheets
diff --git a/cookbook/templating/render_without_controller.rst b/cookbook/templating/render_without_controller.rst
@@ -19,7 +19,7 @@ can do this without creating a controller:
     .. code-block:: yaml
 
         acme_privacy:
-            pattern: /privacy
+            path: /privacy
             defaults:
                 _controller: FrameworkBundle:Template:template
                 template: 'AcmeBundle:Static:privacy.html.twig'
@@ -32,7 +32,7 @@ can do this without creating a controller:
             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="acme_privacy" pattern="/privacy">
+            <route id="acme_privacy" path="/privacy">
                 <default key="_controller">FrameworkBundle:Template:template</default>
                 <default key="template">AcmeBundle:Static:privacy.html.twig</default>
             </route>
@@ -90,7 +90,7 @@ other variables in your route, you can control exactly how your page is cached:
     .. code-block:: yaml
 
         acme_privacy:
-            pattern: /privacy
+            path: /privacy
             defaults:
                 _controller: FrameworkBundle:Template:template
                 template: 'AcmeBundle:Static:privacy.html.twig'
@@ -105,7 +105,7 @@ other variables in your route, you can control exactly how your page is cached:
             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="acme_privacy" pattern="/privacy">
+            <route id="acme_privacy" path="/privacy">
                 <default key="_controller">FrameworkBundle:Template:template</default>
                 <default key="template">AcmeBundle:Static:privacy.html.twig</default>
                 <default key="maxAge">86400</default>
diff --git a/quick_tour/the_big_picture.rst b/quick_tour/the_big_picture.rst
@@ -179,7 +179,7 @@ Routing
 ~~~~~~~
 
 Symfony2 routes the request to the code that handles it by trying to match the
-requested URL against some configured patterns. By default, these patterns
+requested URL against some configured paths. By default, these paths
 (called routes) are defined in the ``app/config/routing.yml`` configuration
 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``
@@ -190,7 +190,7 @@ these "demo" pages are placed in that file:
 
     # app/config/routing_dev.yml
     _welcome:
-        pattern:  /
+        path:  /
         defaults: { _controller: AcmeDemoBundle:Welcome:index }
 
     _demo:
@@ -331,7 +331,7 @@ file, routes are defined as annotations on action methods::
         // ...
     }
 
-The ``@Route()`` annotation defines a new route with a pattern of
+The ``@Route()`` annotation defines a new route with a path of
 ``/hello/{name}`` that executes the ``helloAction`` method when matched. A
 string enclosed in curly brackets like ``{name}`` is called a placeholder. As
 you can see, its value can be retrieved through the ``$name`` method argument.
diff --git a/quick_tour/the_controller.rst b/quick_tour/the_controller.rst
@@ -41,7 +41,7 @@ automatically selects the right template, here ``hello.xml.twig``:
 That's all there is to it. For standard formats, Symfony2 will also
 automatically choose the best ``Content-Type`` header for the response. If
 you want to support different formats for a single action, use the ``{_format}``
-placeholder in the route pattern instead::
+placeholder in the route path instead::
 
     // src/Acme/DemoBundle/Controller/DemoController.php
     use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
