summaryrefslogtreecommitdiff
path: root/docs/api
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-08-06 20:35:44 -0400
committerChris McDonough <chrism@plope.com>2011-08-06 20:35:44 -0400
commit6c3f78b0a5563a642b98f7a0eb01d1854c45e6b0 (patch)
tree57c0fb799ed585a8c2c5af609a297fdeccc62d8f /docs/api
parent37699448a389c2712f262c574e5115aaab27adda (diff)
parent18a99ae15e7f36cd21da6e2d2e70d61d1733bf30 (diff)
downloadpyramid-6c3f78b0a5563a642b98f7a0eb01d1854c45e6b0.tar.gz
pyramid-6c3f78b0a5563a642b98f7a0eb01d1854c45e6b0.tar.bz2
pyramid-6c3f78b0a5563a642b98f7a0eb01d1854c45e6b0.zip
Merge branch 'handlerchanges'
Diffstat (limited to 'docs/api')
-rw-r--r--docs/api/config.rst2
-rw-r--r--docs/api/tweens.rst8
2 files changed, 9 insertions, 1 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst
index 21e2b828d..1a9bb6ba4 100644
--- a/docs/api/config.rst
+++ b/docs/api/config.rst
@@ -78,7 +78,7 @@
.. automethod:: set_view_mapper
- .. automethod:: add_request_handler
+ .. automethod:: add_tween
.. automethod:: testing_securitypolicy
diff --git a/docs/api/tweens.rst b/docs/api/tweens.rst
new file mode 100644
index 000000000..5fc15cb00
--- /dev/null
+++ b/docs/api/tweens.rst
@@ -0,0 +1,8 @@
+.. _tweens_module:
+
+:mod:`pyramid.tweens`
+---------------------
+
+.. automodule:: pyramid.tweens
+
+ .. autofunction:: excview_tween_factory