diff options
| author | Chris McDonough <chrism@plope.com> | 2010-12-28 21:02:36 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-12-28 21:02:36 -0500 |
| commit | fcfc5aebc259fa34d8d2313adde7c2f57bab2e53 (patch) | |
| tree | c52e454f30ca7453da814e57635accc302d61b2b /docs/index.rst | |
| parent | e8f26928bf5c8fb8490a72436718cedf8fe19281 (diff) | |
| parent | 02c43fe07f1ffe0cc27e539618ed8d96014cddee (diff) | |
| download | pyramid-fcfc5aebc259fa34d8d2313adde7c2f57bab2e53.tar.gz pyramid-fcfc5aebc259fa34d8d2313adde7c2f57bab2e53.tar.bz2 pyramid-fcfc5aebc259fa34d8d2313adde7c2f57bab2e53.zip | |
Merge branch 'master' into viewderiver
Diffstat (limited to 'docs/index.rst')
| -rw-r--r-- | docs/index.rst | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/index.rst b/docs/index.rst index fbf9de810..23ffb3b1b 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -45,10 +45,11 @@ Narrative documentation in chapter form explaining how to use narr/renderers narr/templates narr/resources - narr/static + narr/assets narr/webob narr/sessions narr/flash + narr/csrf narr/security narr/hybrid narr/i18n @@ -57,9 +58,9 @@ Narrative documentation in chapter form explaining how to use narr/environment narr/testing narr/hooks + narr/advconfig narr/declarative narr/extending - narr/assets narr/router narr/threadlocals narr/zca |