diff options
| author | Chris McDonough <chrism@plope.com> | 2010-10-25 21:13:15 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-10-25 21:13:15 -0400 |
| commit | 42df47c8d83924370fddf417fcdb45e5fea342ae (patch) | |
| tree | ef5a24fe0906d7661bc4f9c9136ab8d72a7781eb | |
| parent | c81aada6ac64c67d1ee5cb57f9795d8c8e10de3d (diff) | |
| download | pyramid-42df47c8d83924370fddf417fcdb45e5fea342ae.tar.gz pyramid-42df47c8d83924370fddf417fcdb45e5fea342ae.tar.bz2 pyramid-42df47c8d83924370fddf417fcdb45e5fea342ae.zip | |
docs fixes
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | CHANGES.txt | 2 | ||||
| -rw-r--r-- | docs/api.rst | 1 | ||||
| -rw-r--r-- | docs/api/router.rst | 8 | ||||
| -rw-r--r-- | docs/latexindex.rst | 1 |
5 files changed, 2 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore index 3e5c148a6..2954d54f3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ *.pyc *.pt.py *.txt.py +.coverage env26 diff --git a/CHANGES.txt b/CHANGES.txt index 5fa214281..ef5c89373 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -17,7 +17,7 @@ Backwards Incompatibilities (with BFG 1.3.X) has the name ``pyramid.debug``. - The deprecated API named ``pyramid.router.make_app`` (aka - ``pyramid.configuration.make_app) was removed. + ``pyramid.configuration.make_app``) was removed. - The deprecated API named ``pyramid.request.get_request`` was removed. diff --git a/docs/api.rst b/docs/api.rst index bf7933a65..5bd24d6b2 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -21,7 +21,6 @@ documentation is organized alphabetically by module name. api/paster api/renderers api/request - api/router api/scripting api/security api/settings diff --git a/docs/api/router.rst b/docs/api/router.rst deleted file mode 100644 index a4a4c176a..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) diff --git a/docs/latexindex.rst b/docs/latexindex.rst index 2bc052e7e..0403b60ff 100644 --- a/docs/latexindex.rst +++ b/docs/latexindex.rst @@ -92,7 +92,6 @@ API Reference api/paster api/renderers api/request - api/router api/scripting api/security api/settings |