summaryrefslogtreecommitdiff
path: root/docs/narr/urldispatch.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-29 01:36:49 -0500
committerChris McDonough <chrism@plope.com>2011-01-29 01:36:49 -0500
commit91ab804c9786d680a1eff9041de1bea76e75c225 (patch)
tree3261680948dbd55cf573aef4a35f1d3e69c85d00 /docs/narr/urldispatch.rst
parent3e4f429cce60465f2d58d0a60eb6a3adb5f9a377 (diff)
parent6b471ecd40cc04a595349e7074f02d836fd2ea6a (diff)
downloadpyramid-91ab804c9786d680a1eff9041de1bea76e75c225.tar.gz
pyramid-91ab804c9786d680a1eff9041de1bea76e75c225.tar.bz2
pyramid-91ab804c9786d680a1eff9041de1bea76e75c225.zip
Merge branch 'master' of https://github.com/osmaker/pyramid into osmaker-master
Diffstat (limited to 'docs/narr/urldispatch.rst')
-rw-r--r--docs/narr/urldispatch.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index ad0550e69..626d2db2c 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -439,7 +439,7 @@ neither predicates nor view configuration information.
matched which contains a ``*traverse`` remainder marker in its pattern (see
:ref:`using_traverse_in_a_route_pattern`). The ``traverse`` argument
allows you to associate route patterns with an arbitrary traversal path
- without using a a ``*traverse`` remainder marker; instead you can use other
+ without using a ``*traverse`` remainder marker; instead you can use other
match information.
Note that the ``traverse`` argument is ignored when attached to a route