- The ``repoze.bfg.urldispatch.Route`` constructor (not an API) now

  accepts a different ordering of arguments.  Previously it was
  ``(pattern, name, factory=None, predicates=())``.  It is now
  ``(name, pattern, factory=None, predicates=())``.  This is in
  support of consistency with ``configurator.add_route``.

- The ``repoze.bfg.urldispatch.RoutesMapper.connect`` method (not an
  API) now accepts a different ordering of arguments.  Previously it
  was ``(pattern, name, factory=None, predicates=())``.  It is now
  ``(name, pattern, factory=None, predicates=())``.  This is in
  support of consistency with ``configurator.add_route``.

- The ``repoze.bfg.urldispatch.RoutesMapper`` object now has a
  ``get_route`` method which returns a single Route object or
  ``None``.

- A new interface ``repoze.bfg.interfaces.IRoute`` was added.  The
  ``repoze.bfg.urldispatch.Route`` object implements this interface.

- The canonical attribute for accessing the routing pattern from a
  route object is now ``pattern`` rather than ``path``.

- The argument to ``repoze.bfg.configuration.Configurator.add_route``
  which was previously called ``path`` is now called ``pattern`` for
  better explicability.  For backwards compatibility purposes, passing
  a keyword argument named ``path`` to ``add_route`` will still work
  indefinitely.

- The ``path`` attribute to the ZCML ``route`` directive is now named
  ``pattern`` for better explicability.  The older ``path`` attribute
  will continue to work indefinitely.

- All narrative, API, and tutorial docs which referred to a route
  pattern as a ``path`` have now been updated to refer to them as a
  ``pattern``.

- The routesalchemy template has been updated to use ``pattern`` in
  its route declarations rather than ``path``.

4 files changed, 18 insertions, 16 deletions

diff --git a/docs/tutorials/bfgwiki2/src/authorization/tutorial/configure.zcml b/docs/tutorials/bfgwiki2/src/authorization/tutorial/configure.zcml
index e51a67d70..213573d7a 100644
--- a/docs/tutorials/bfgwiki2/src/authorization/tutorial/configure.zcml
+++ b/docs/tutorials/bfgwiki2/src/authorization/tutorial/configure.zcml
@@ -4,38 +4,38 @@
   <include package="repoze.bfg.includes" />
 
   <static
+    pattern="templates/static"
     name="static"
-    path="templates/static"
     />
 
   <route
-     path="login"
+     pattern="login"
      name="login"
      view=".login.login"
      view_renderer="templates/login.pt"
      />
 
   <route
-     path="logout"
+     pattern="logout"
      name="logout"
      view=".login.logout"
      />
 
   <route
-    path=""
+    pattern=""
     name="view_wiki"
     view=".views.view_wiki"
     />
     
   <route
-     path=":pagename"
+     pattern=":pagename"
      name="view_page"
      view=".views.view_page"
      view_renderer="templates/view.pt"
      />
 
   <route
-     path="add_page/:pagename"
+     pattern="add_page/:pagename"
      name="add_page"
      view=".views.add_page"
      view_renderer="templates/edit.pt"
@@ -43,7 +43,7 @@
      />
 
   <route
-     path=":pagename/edit_page"
+     pattern=":pagename/edit_page"
      name="edit_page"
      view=".views.edit_page"
      view_renderer="templates/edit.pt"
diff --git a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/configure.zcml b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/configure.zcml
index 143f58a45..f04eec9b4 100644
--- a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/configure.zcml
+++ b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/configure.zcml
@@ -3,15 +3,16 @@
   <!-- this must be included for the view declarations to work -->
   <include package="repoze.bfg.includes" />
 
-  <route path=""
+  <route
+    pattern=""
     name="home"
     view=".views.my_view"
     view_renderer="templates/mytemplate.pt"
     />
 
   <static
+    pattern="templates/static"
     name="static"
-    path="templates/static"
     />
 
 </configure>
diff --git a/docs/tutorials/bfgwiki2/src/models/tutorial/configure.zcml b/docs/tutorials/bfgwiki2/src/models/tutorial/configure.zcml
index 143f58a45..f04eec9b4 100644
--- a/docs/tutorials/bfgwiki2/src/models/tutorial/configure.zcml
+++ b/docs/tutorials/bfgwiki2/src/models/tutorial/configure.zcml
@@ -3,15 +3,16 @@
   <!-- this must be included for the view declarations to work -->
   <include package="repoze.bfg.includes" />
 
-  <route path=""
+  <route
+    pattern=""
     name="home"
     view=".views.my_view"
     view_renderer="templates/mytemplate.pt"
     />
 
   <static
+    pattern="templates/static"
     name="static"
-    path="templates/static"
     />
 
 </configure>
diff --git a/docs/tutorials/bfgwiki2/src/views/tutorial/configure.zcml b/docs/tutorials/bfgwiki2/src/views/tutorial/configure.zcml
index 7a8576a56..f86468186 100644
--- a/docs/tutorials/bfgwiki2/src/views/tutorial/configure.zcml
+++ b/docs/tutorials/bfgwiki2/src/views/tutorial/configure.zcml
@@ -4,32 +4,32 @@
   <include package="repoze.bfg.includes" />
 
   <static
+    pattern="templates/static"
     name="static"
-    path="templates/static"
     />
 
   <route
-    path=""
+    pattern=""
     name="view_wiki"
     view=".views.view_wiki"
     />
     
   <route
-     path=":pagename"
+     pattern=":pagename"
      name="view_page"
      view=".views.view_page"
      view_renderer="templates/view.pt"
      />
 
   <route
-     path="add_page/:pagename"
+     pattern="add_page/:pagename"
      name="add_page"
      view=".views.add_page"
      view_renderer="templates/edit.pt"
      />
 
   <route
-     path=":pagename/edit_page"
+     pattern=":pagename/edit_page"
      name="edit_page"
      view=".views.edit_page"
      view_renderer="templates/edit.pt"