summaryrefslogtreecommitdiff
path: root/docs/api
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-07-16 20:03:08 -0400
committerChris McDonough <chrism@plope.com>2011-07-16 20:03:08 -0400
commitc3ceaf474c68a0b12f126b4cb57448b26792b697 (patch)
tree733577de0bda50a101153262da91a907ccd36166 /docs/api
parentd50edc5807539da66e266a7ed7810f770cee969a (diff)
parent69452f63ab2efa39c9273646959341287ba5ee15 (diff)
downloadpyramid-c3ceaf474c68a0b12f126b4cb57448b26792b697.tar.gz
pyramid-c3ceaf474c68a0b12f126b4cb57448b26792b697.tar.bz2
pyramid-c3ceaf474c68a0b12f126b4cb57448b26792b697.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/api')
-rw-r--r--docs/api/scripting.rst2
1 files changed, 0 insertions, 2 deletions
diff --git a/docs/api/scripting.rst b/docs/api/scripting.rst
index 79136a98b..51bd3c7a0 100644
--- a/docs/api/scripting.rst
+++ b/docs/api/scripting.rst
@@ -9,5 +9,3 @@
.. autofunction:: prepare
- .. autofunction:: make_request
-