summaryrefslogtreecommitdiff
path: root/docs/narr/traversal.rst
diff options
context:
space:
mode:
authorPaul Everitt <paul@agendaless.com>2013-08-13 13:50:06 -0400
committerPaul Everitt <paul@agendaless.com>2013-08-13 13:50:06 -0400
commit0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6 (patch)
tree6d9f12bc42fde9fea95d7754f2decff212acf6ee /docs/narr/traversal.rst
parentd44d0e044555cd1287680fc8368632a64ebe979b (diff)
parent5ae91a8ef06c4484bf748c7be578b28d0ca0f12c (diff)
downloadpyramid-0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6.tar.gz
pyramid-0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6.tar.bz2
pyramid-0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6.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