summaryrefslogtreecommitdiff
path: root/docs/narr
diff options
context:
space:
mode:
authorCasey Duncan <casey.duncan@gmail.com>2010-11-18 17:58:23 -0700
committerCasey Duncan <casey.duncan@gmail.com>2010-11-18 17:58:23 -0700
commit673d55a3188d88c5fcf66062a894818a66722334 (patch)
treee1bab67822dcef5ab9a228dabd91662753faf13e /docs/narr
parenta17af042716a0899721670e78c27df59d623e6e2 (diff)
downloadpyramid-673d55a3188d88c5fcf66062a894818a66722334.tar.gz
pyramid-673d55a3188d88c5fcf66062a894818a66722334.tar.bz2
pyramid-673d55a3188d88c5fcf66062a894818a66722334.zip
Remove "and", add commas
Diffstat (limited to 'docs/narr')
-rw-r--r--docs/narr/traversal.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/traversal.rst b/docs/narr/traversal.rst
index 56594ed5a..67296d21a 100644
--- a/docs/narr/traversal.rst
+++ b/docs/narr/traversal.rst
@@ -360,7 +360,7 @@ and a :term:`view name`.
of path segments that come from ``PATH_INFO`` that are "left over"
after traversal has completed.
-Once :term:`context` and :term:`view name` and associated attributes
+Once :term:`context`, :term:`view name`, and associated attributes
such as the :term:`subpath` are located, the job of :term:`traversal`
is finished. It passes back the information it obtained to its
caller, the :app:`Pyramid` :term:`Router`, which subsequently