summaryrefslogtreecommitdiff
path: root/docs/index.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-12-04 19:27:46 -0500
committerChris McDonough <chrism@plope.com>2011-12-04 19:27:46 -0500
commit5d462f0c660f939c773862b0fab81728c9ba62c7 (patch)
tree658df249d53de844c2f422ab04c4c26ee4feb86d /docs/index.rst
parentd5666e630a08c943a22682540aa51174cee6851f (diff)
parenta78b58dd5cf665f7a7aaa18e9e7f6cae3fc7f749 (diff)
downloadpyramid-5d462f0c660f939c773862b0fab81728c9ba62c7.tar.gz
pyramid-5d462f0c660f939c773862b0fab81728c9ba62c7.tar.bz2
pyramid-5d462f0c660f939c773862b0fab81728c9ba62c7.zip
merge feature.introspection branch
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 e4de8b0c8..ceb29d108 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -65,6 +65,7 @@ Narrative documentation in chapter form explaining how to use
narr/configuration
narr/project
narr/startup
+ narr/router
narr/urldispatch
narr/views
narr/renderers
@@ -87,9 +88,10 @@ Narrative documentation in chapter form explaining how to use
narr/security
narr/hybrid
narr/hooks
- narr/advconfig
+ narr/introspector
narr/extending
- narr/router
+ narr/advconfig
+ narr/extconfig
narr/threadlocals
narr/zca