summaryrefslogtreecommitdiff
path: root/docs/index.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-12-26 15:57:28 -0500
committerChris McDonough <chrism@plope.com>2010-12-26 15:57:28 -0500
commit88b9ee766bf53ae1c46b8a1889674fea08053622 (patch)
treef4f1cfada960bbaeabe47b70782717ef71854653 /docs/index.rst
parent74abc0fa8c4f63db0f2fef238e9ef8af16f3c8d3 (diff)
downloadpyramid-88b9ee766bf53ae1c46b8a1889674fea08053622.tar.gz
pyramid-88b9ee766bf53ae1c46b8a1889674fea08053622.tar.bz2
pyramid-88b9ee766bf53ae1c46b8a1889674fea08053622.zip
- Merge "Static Assets" chapter into the "Assets" chapter.
Diffstat (limited to 'docs/index.rst')
-rw-r--r--docs/index.rst3
1 files changed, 1 insertions, 2 deletions
diff --git a/docs/index.rst b/docs/index.rst
index 3830a83f9..23ffb3b1b 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -45,7 +45,7 @@ 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
@@ -61,7 +61,6 @@ Narrative documentation in chapter form explaining how to use
narr/advconfig
narr/declarative
narr/extending
- narr/assets
narr/router
narr/threadlocals
narr/zca