diff options
| author | Chris McDonough <chrism@plope.com> | 2011-01-08 15:40:56 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-01-08 15:40:56 -0500 |
| commit | 592ca3043bdf090b36d8557203bd8445cb5b36df (patch) | |
| tree | c9be4994552c7779fa26b35b26916cfd55c10dd8 /docs | |
| parent | 5f8e02714d1f059b0ef91525300e8fe2fac4aa97 (diff) | |
| parent | 5d23bd01db7ba99975a2f6c7205c2f1cd838ee52 (diff) | |
| download | pyramid-592ca3043bdf090b36d8557203bd8445cb5b36df.tar.gz pyramid-592ca3043bdf090b36d8557203bd8445cb5b36df.tar.bz2 pyramid-592ca3043bdf090b36d8557203bd8445cb5b36df.zip | |
Merge branch '1.0a8' of https://github.com/tomlikestorock/pyramid into tomlikestorock-1.0a8
Diffstat (limited to 'docs')
| -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``. |