diff options
| author | Paul Everitt <paul@agendaless.com> | 2013-08-13 13:58:56 -0400 |
|---|---|---|
| committer | Paul Everitt <paul@agendaless.com> | 2013-08-13 13:58:56 -0400 |
| commit | a66e00e9bd51fdffd85fef14e83f12502f2d864e (patch) | |
| tree | 43eb06f24df2818e2db5a947e9866c8076257e91 /docs/narr/traversal.rst | |
| parent | bf84d90b4dccb9fc52c8fe385e52f7a63e9a5535 (diff) | |
| parent | 5ae91a8ef06c4484bf748c7be578b28d0ca0f12c (diff) | |
| download | pyramid-a66e00e9bd51fdffd85fef14e83f12502f2d864e.tar.gz pyramid-a66e00e9bd51fdffd85fef14e83f12502f2d864e.tar.bz2 pyramid-a66e00e9bd51fdffd85fef14e83f12502f2d864e.zip | |
Merge remote-tracking branch 'origin/master' into docs.gettingstarted
Conflicts:
docs/index.rst
docs/latexindex.rst
setup.py
Diffstat (limited to 'docs/narr/traversal.rst')
| -rw-r--r-- | docs/narr/traversal.rst | 2 |
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 |