summaryrefslogtreecommitdiff
path: root/docs/narr/traversal.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-08-15 18:40:27 +0200
committerChris McDonough <chrism@plope.com>2013-08-15 18:40:27 +0200
commit5aab1e9c2aebbbb0e955a34067db9a196d430a0c (patch)
tree727028ad4eeb596c291d0f96fbc9bb520ec971fd /docs/narr/traversal.rst
parentb210ce350a3856166376f63a32725cc1516ba294 (diff)
parent7319ab677216063581e47a231fd70b8b55a19466 (diff)
downloadpyramid-5aab1e9c2aebbbb0e955a34067db9a196d430a0c.tar.gz
pyramid-5aab1e9c2aebbbb0e955a34067db9a196d430a0c.tar.bz2
pyramid-5aab1e9c2aebbbb0e955a34067db9a196d430a0c.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