diff options
| author | Chris McDonough <chrism@plope.com> | 2011-02-05 14:42:34 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-02-05 14:42:34 -0500 |
| commit | 88fba8dbd201118241965d6a056ae09372b0630c (patch) | |
| tree | e0c30696df5827037048eb0cdd6c0731653a1734 /docs/narr/traversal.rst | |
| parent | ce0e371e067f3628620a7db5a50056c9a045979f (diff) | |
| parent | 291995fa17ae55adfda09c4eda095fd5e8cb21d8 (diff) | |
| download | pyramid-88fba8dbd201118241965d6a056ae09372b0630c.tar.gz pyramid-88fba8dbd201118241965d6a056ae09372b0630c.tar.bz2 pyramid-88fba8dbd201118241965d6a056ae09372b0630c.zip | |
fix conflicts
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 14d6d240d..b3747be61 100644 --- a/docs/narr/traversal.rst +++ b/docs/narr/traversal.rst @@ -355,7 +355,7 @@ Here's what happens: - :mod:`traversal` traverses "foo", and attempts to find "bar", which it finds. -- :mod:`traversal` traverses bar, and attempts to find "baz", which it does +- :mod:`traversal` traverses "bar", and attempts to find "baz", which it does not find (the "bar" resource raises a :exc:`KeyError` when asked for "baz"). |