diff options
| author | Chris McDonough <chrism@plope.com> | 2011-01-18 12:27:56 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-01-18 12:27:56 -0500 |
| commit | 8b4146009da0b612e8e001e68cd5f6f63d361c53 (patch) | |
| tree | 5de4e743b2c007c0d5202db7be883d21cfe2bc88 /docs/api | |
| parent | 566004501e8a28c0ba8f8c882ca5ea0742e5d285 (diff) | |
| parent | c9c3c487bcaedeca97bb6463a00188b0dc01203a (diff) | |
| download | pyramid-8b4146009da0b612e8e001e68cd5f6f63d361c53.tar.gz pyramid-8b4146009da0b612e8e001e68cd5f6f63d361c53.tar.bz2 pyramid-8b4146009da0b612e8e001e68cd5f6f63d361c53.zip | |
Merge branch 'zcmlless'
Diffstat (limited to 'docs/api')
| -rw-r--r-- | docs/api/config.rst | 2 | ||||
| -rw-r--r-- | docs/api/router.rst | 8 |
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) |