Merge pull request #878 from tshepang/less-is-more

no need for a separate API file

2 files changed, 4 insertions, 44 deletions

diff --git a/docs/api.rst b/docs/api.rst
deleted file mode 100644
index 9e540b49b..000000000
--- a/docs/api.rst
+++ /dev/null
@@ -1,41 +0,0 @@
-API Documentation
-=================
-
-Comprehensive reference material for every public API exposed by
-:app:`Pyramid` is available within this chapter.  The API
-documentation is organized alphabetically by module name.
-
-.. toctree::
-   :maxdepth: 1
-
-   api/authorization
-   api/authentication
-   api/compat
-   api/config
-   api/decorator
-   api/events
-   api/exceptions
-   api/httpexceptions
-   api/i18n
-   api/interfaces
-   api/location
-   api/paster
-   api/path
-   api/registry
-   api/renderers
-   api/request
-   api/response
-   api/scaffolds
-   api/scripting
-   api/security
-   api/session
-   api/settings
-   api/static
-   api/testing
-   api/threadlocal
-   api/traversal
-   api/tweens
-   api/url
-   api/view
-   api/wsgi
-
diff --git a/docs/index.rst b/docs/index.rst
index d4b7ed492..6e2568a21 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -112,12 +112,13 @@ platforms.
 API Documentation
 ==================
 
-Documentation for every :app:`Pyramid` API.
+Comprehensive reference material for every public API exposed by :app:`Pyramid`:
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
+   :glob:
 
-   api
+   api/*
 
 Change History
 ==============