summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-11-17 13:52:28 -0500
committerChris McDonough <chrism@plope.com>2010-11-17 13:52:28 -0500
commit42ec1ec1de4e1ce6b70af1d5e520493d9d7ec91a (patch)
tree357c8177f34cfa0027c42d5c4334384be6b11035 /docs
parent4f8c69f2ce04b5cb02b07c3891180cb46abd6aa2 (diff)
parent8c6a4cea3ed0e588ffa395a99859cb1ac780360f (diff)
downloadpyramid-42ec1ec1de4e1ce6b70af1d5e520493d9d7ec91a.tar.gz
pyramid-42ec1ec1de4e1ce6b70af1d5e520493d9d7ec91a.tar.bz2
pyramid-42ec1ec1de4e1ce6b70af1d5e520493d9d7ec91a.zip
Merge branch 'mgedmin-master'
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/hybrid.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/hybrid.rst b/docs/narr/hybrid.rst
index 61ac68d5d..b89d10c9f 100644
--- a/docs/narr/hybrid.rst
+++ b/docs/narr/hybrid.rst
@@ -358,7 +358,7 @@ Using the ``traverse`` Argument In a Route Definition
Rather than using the ``*traverse`` remainder marker in a pattern, you
can use the ``traverse`` argument to the
-:meth:`pyramid.configuration.Configurator.add_route`` method.
+:meth:`pyramid.configuration.Configurator.add_route` method.
When you use the ``*traverse`` remainder marker, the traversal path is
limited to being the remainder segments of a request URL when a route