summaryrefslogtreecommitdiff
path: root/docs/narr/traversal.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-08-10 02:32:28 -0400
committerChris McDonough <chrism@plope.com>2013-08-10 02:32:28 -0400
commitdff772959de5604c44a445bee30b9bdf9741f56b (patch)
tree53c2a6a57e7d205e78aab7054684d312de6b4fb7 /docs/narr/traversal.rst
parent3f503d0a30b487b590fc3e12834ce12d8ed0a25c (diff)
parent3c173be3c43aba74554265cbfe3a11f4de9ca537 (diff)
downloadpyramid-dff772959de5604c44a445bee30b9bdf9741f56b.tar.gz
pyramid-dff772959de5604c44a445bee30b9bdf9741f56b.tar.bz2
pyramid-dff772959de5604c44a445bee30b9bdf9741f56b.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/traversal.rst')
-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 2eb6ece13..a60c5ba56 100644
--- a/docs/narr/traversal.rst
+++ b/docs/narr/traversal.rst
@@ -289,7 +289,7 @@ system uses this algorithm to find a :term:`context` resource and a
return resource "C".
#. Traversal ends when a) the entire path is exhausted or b) when any
- resouce raises a :exc:`KeyError` from its ``__getitem__`` or c) when any
+ resource raises a :exc:`KeyError` from its ``__getitem__`` or c) when any
non-final path element traversal does not have a ``__getitem__`` method
(resulting in a :exc:`AttributeError`) or d) when any path element is
prefixed with the set of characters ``@@`` (indicating that the characters