summaryrefslogtreecommitdiff
path: root/docs/index.rst
diff options
context:
space:
mode:
authorCasey Duncan <casey.duncan@gmail.com>2010-12-27 09:28:50 -0700
committerCasey Duncan <casey.duncan@gmail.com>2010-12-27 09:28:50 -0700
commit6f7b6c0221f8c120a22b630eea26905744d2b6b4 (patch)
tree6c8e1ae3affba81ec0c26eb183c4f424b577a1d5 /docs/index.rst
parent6d0ff23fc3094f3f40d93d020bbc80ecdfceb825 (diff)
parente8db031e8cd22affb65254539ae210f64d37f36e (diff)
downloadpyramid-6f7b6c0221f8c120a22b630eea26905744d2b6b4.tar.gz
pyramid-6f7b6c0221f8c120a22b630eea26905744d2b6b4.tar.bz2
pyramid-6f7b6c0221f8c120a22b630eea26905744d2b6b4.zip
Merge https://github.com/Pylons/pyramid
Diffstat (limited to 'docs/index.rst')
-rw-r--r--docs/index.rst6
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/index.rst b/docs/index.rst
index 4f484b0f9..23ffb3b1b 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -45,9 +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
@@ -56,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