summaryrefslogtreecommitdiff
path: root/docs/api
diff options
context:
space:
mode:
authorCasey Duncan <casey.duncan@gmail.com>2011-01-18 23:05:54 -0700
committerCasey Duncan <casey.duncan@gmail.com>2011-01-18 23:05:54 -0700
commitb0240d3d5a39a504d5a5155a23a6d6a431b457ef (patch)
treeb0c3b4f5dd8a0ec1c01912bfeff769d1329a9c97 /docs/api
parent278b302270823336d770761aaac22d854e348ea6 (diff)
parent48bccbe4ff7351d823a471005effea1afc06bb4f (diff)
downloadpyramid-b0240d3d5a39a504d5a5155a23a6d6a431b457ef.tar.gz
pyramid-b0240d3d5a39a504d5a5155a23a6d6a431b457ef.tar.bz2
pyramid-b0240d3d5a39a504d5a5155a23a6d6a431b457ef.zip
Merge https://github.com/Pylons/pyramid
Diffstat (limited to 'docs/api')
-rw-r--r--docs/api/config.rst2
-rw-r--r--docs/api/router.rst8
2 files changed, 0 insertions, 10 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst
index b4f85c248..05bcb8146 100644
--- a/docs/api/config.rst
+++ b/docs/api/config.rst
@@ -52,8 +52,6 @@
.. automethod:: derive_view
- .. automethod:: load_zcml(spec)
-
.. automethod:: make_wsgi_app()
.. automethod:: override_asset(to_override, override_with)
diff --git a/docs/api/router.rst b/docs/api/router.rst
deleted file mode 100644
index e5ffe97ce..000000000
--- a/docs/api/router.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-.. _router_module:
-
-:mod:`pyramid.router`
----------------------
-
-.. automodule:: pyramid.router
-
-.. autofunction:: pyramid.router.make_app(root_factory, package=None, filename='configure.zcml', settings=None)