diff options
| author | Chris McDonough <chrism@plope.com> | 2011-01-08 15:41:22 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-01-08 15:41:22 -0500 |
| commit | d27cd5f81cb5ef6f89e9c5480e06d75905c12cc6 (patch) | |
| tree | c9be4994552c7779fa26b35b26916cfd55c10dd8 | |
| parent | 5f8e02714d1f059b0ef91525300e8fe2fac4aa97 (diff) | |
| parent | 592ca3043bdf090b36d8557203bd8445cb5b36df (diff) | |
| download | pyramid-d27cd5f81cb5ef6f89e9c5480e06d75905c12cc6.tar.gz pyramid-d27cd5f81cb5ef6f89e9c5480e06d75905c12cc6.tar.bz2 pyramid-d27cd5f81cb5ef6f89e9c5480e06d75905c12cc6.zip | |
Merge branch 'tomlikestorock-1.0a8'
| -rw-r--r-- | docs/narr/resources.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/resources.rst b/docs/narr/resources.rst index cf13f8c8d..c97b4c676 100644 --- a/docs/narr/resources.rst +++ b/docs/narr/resources.rst @@ -186,7 +186,7 @@ you will reach the filesystem root directory. objects "by hand". Instead, as necessary, during traversal :app:`Pyramid` will wrap each resource (even the root resource) in a ``LocationProxy`` which will dynamically assign a ``__name__`` and a ``__parent__`` to the - traversed resrouce (based on the last traversed resource and the name + traversed resource (based on the last traversed resource and the name supplied to ``__getitem__``). The root resource will have a ``__name__`` attribute of ``None`` and a ``__parent__`` attribute of ``None``. |