summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2010-01-24 08:45:35 +0000
committerChris McDonough <chrism@agendaless.com>2010-01-24 08:45:35 +0000
commit333bd06861e55f97dfcaeebff100657734829add (patch)
tree495b62d5b297a52f29f042adca5d54a319d413c2 /docs
parentcc6a44df0a8535d2bc91944ae34a2521c12c7a07 (diff)
downloadpyramid-333bd06861e55f97dfcaeebff100657734829add.tar.gz
pyramid-333bd06861e55f97dfcaeebff100657734829add.tar.bz2
pyramid-333bd06861e55f97dfcaeebff100657734829add.zip
Merge reversepolarity branch.
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/urldispatch.rst6
-rw-r--r--docs/zcml/route.rst8
2 files changed, 14 insertions, 0 deletions
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index 05c04e03f..495b05a14 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -585,6 +585,12 @@ information.
If the ``view`` argument is not provided, this argument has no
effect.
+``use_global_views``
+ When a request matches this route, and view lookup cannot find a view
+ which has a 'route_name' predicate argument that matches the route,
+ try to fall back to using a view that otherwise matches the context,
+ request, and view name (but does not match the route name predicate).
+
Route Matching
--------------
diff --git a/docs/zcml/route.rst b/docs/zcml/route.rst
index bb842819d..169252d77 100644
--- a/docs/zcml/route.rst
+++ b/docs/zcml/route.rst
@@ -203,6 +203,14 @@ Attributes
.. note:: This feature is new as of :mod:`repoze.bfg` 1.1.
+``use_global_views``
+ When a request matches this route, and view lookup cannot find a view
+ which has a 'route_name' predicate argument that matches the route,
+ try to fall back to using a view that otherwise matches the context,
+ request, and view name (but does not match the route name predicate).
+
+ .. note:: This feature is new as of :mod:`repoze.bfg` 1.2.
+
Alternatives
~~~~~~~~~~~~