summaryrefslogtreecommitdiff
path: root/docs/api.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-18 12:27:56 -0500
committerChris McDonough <chrism@plope.com>2011-01-18 12:27:56 -0500
commit8b4146009da0b612e8e001e68cd5f6f63d361c53 (patch)
tree5de4e743b2c007c0d5202db7be883d21cfe2bc88 /docs/api.rst
parent566004501e8a28c0ba8f8c882ca5ea0742e5d285 (diff)
parentc9c3c487bcaedeca97bb6463a00188b0dc01203a (diff)
downloadpyramid-8b4146009da0b612e8e001e68cd5f6f63d361c53.tar.gz
pyramid-8b4146009da0b612e8e001e68cd5f6f63d361c53.tar.bz2
pyramid-8b4146009da0b612e8e001e68cd5f6f63d361c53.zip
Merge branch 'zcmlless'
Diffstat (limited to 'docs/api.rst')
-rw-r--r--docs/api.rst1
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/api.rst b/docs/api.rst
index b650c8ded..be7942502 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -24,7 +24,6 @@ documentation is organized alphabetically by module name.
api/renderers
api/request
api/response
- api/router
api/scripting
api/security
api/session