updated sphinx docs to reflect the current state of cherrypy

4 files changed, 35 insertions, 186 deletions

diff --git a/docs/pkg/cherrypy.lib.rst b/docs/pkg/cherrypy.lib.rst
index b43db26a..c8dc6d9b 100644
--- a/docs/pkg/cherrypy.lib.rst
+++ b/docs/pkg/cherrypy.lib.rst
@@ -76,14 +76,6 @@ cherrypy.lib.gctools module
     :undoc-members:
     :show-inheritance:
 
-cherrypy.lib.http module
-------------------------
-
-.. automodule:: cherrypy.lib.http
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 cherrypy.lib.httpauth module
 ----------------------------
 
@@ -116,6 +108,14 @@ cherrypy.lib.lockfile module
     :undoc-members:
     :show-inheritance:
 
+cherrypy.lib.locking module
+---------------------------
+
+.. automodule:: cherrypy.lib.locking
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 cherrypy.lib.profiler module
 ----------------------------
 
diff --git a/docs/pkg/cherrypy.rst b/docs/pkg/cherrypy.rst
index 8d5eb7ba..38599fa1 100644
--- a/docs/pkg/cherrypy.rst
+++ b/docs/pkg/cherrypy.rst
@@ -11,127 +11,14 @@ Subpackages
     cherrypy.scaffold
     cherrypy.test
     cherrypy.tutorial
-    cherrypy.wsgiserver
 
 Submodules
 ----------
 
-cherrypy._cpchecker module
---------------------------
+cherrypy.daemon module
+----------------------
 
-.. automodule:: cherrypy._cpchecker
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-cherrypy._cpcompat module
--------------------------
-
-.. automodule:: cherrypy._cpcompat
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-cherrypy._cpconfig module
--------------------------
-
-.. automodule:: cherrypy._cpconfig
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-cherrypy._cpdispatch module
----------------------------
-
-.. automodule:: cherrypy._cpdispatch
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-cherrypy._cperror module
-------------------------
-
-.. automodule:: cherrypy._cperror
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-cherrypy._cplogging module
---------------------------
-
-.. automodule:: cherrypy._cplogging
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-cherrypy._cpmodpy module
-------------------------
-
-.. automodule:: cherrypy._cpmodpy
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-cherrypy._cpnative_server module
---------------------------------
-
-.. automodule:: cherrypy._cpnative_server
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-cherrypy._cpreqbody module
---------------------------
-
-.. automodule:: cherrypy._cpreqbody
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-cherrypy._cprequest module
---------------------------
-
-.. automodule:: cherrypy._cprequest
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-cherrypy._cpserver module
--------------------------
-
-.. automodule:: cherrypy._cpserver
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-cherrypy._cptools module
-------------------------
-
-.. automodule:: cherrypy._cptools
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-cherrypy._cptree module
------------------------
-
-.. automodule:: cherrypy._cptree
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-cherrypy._cpwsgi module
------------------------
-
-.. automodule:: cherrypy._cpwsgi
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-cherrypy._cpwsgi_server module
-------------------------------
-
-.. automodule:: cherrypy._cpwsgi_server
+.. automodule:: cherrypy.daemon
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/docs/pkg/cherrypy.test.rst b/docs/pkg/cherrypy.test.rst
index 88f1d68a..0d5e22f3 100644
--- a/docs/pkg/cherrypy.test.rst
+++ b/docs/pkg/cherrypy.test.rst
@@ -4,22 +4,6 @@ cherrypy.test package
 Submodules
 ----------
 
-cherrypy.test._test_decorators module
--------------------------------------
-
-.. automodule:: cherrypy.test._test_decorators
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-cherrypy.test._test_states_demo module
---------------------------------------
-
-.. automodule:: cherrypy.test._test_states_demo
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 cherrypy.test.benchmark module
 ------------------------------
 
@@ -212,6 +196,14 @@ cherrypy.test.test_httplib module
     :undoc-members:
     :show-inheritance:
 
+cherrypy.test.test_iterator module
+----------------------------------
+
+.. automodule:: cherrypy.test.test_iterator
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 cherrypy.test.test_json module
 ------------------------------
 
@@ -252,6 +244,14 @@ cherrypy.test.test_objectmapping module
     :undoc-members:
     :show-inheritance:
 
+cherrypy.test.test_params module
+--------------------------------
+
+.. automodule:: cherrypy.test.test_params
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 cherrypy.test.test_proxy module
 -------------------------------
 
@@ -348,6 +348,14 @@ cherrypy.test.test_wsgi_ns module
     :undoc-members:
     :show-inheritance:
 
+cherrypy.test.test_wsgi_unix_socket module
+------------------------------------------
+
+.. automodule:: cherrypy.test.test_wsgi_unix_socket
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 cherrypy.test.test_wsgi_vhost module
 ------------------------------------
 
diff --git a/docs/pkg/cherrypy.wsgiserver.rst b/docs/pkg/cherrypy.wsgiserver.rst
deleted file mode 100644
index 9e91f631..00000000
--- a/docs/pkg/cherrypy.wsgiserver.rst
+++ /dev/null
@@ -1,46 +0,0 @@
-cherrypy.wsgiserver package
-===========================
-
-Submodules
-----------
-
-cherrypy.wsgiserver.ssl_builtin module
---------------------------------------
-
-.. automodule:: cherrypy.wsgiserver.ssl_builtin
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-cherrypy.wsgiserver.ssl_pyopenssl module
-----------------------------------------
-
-.. automodule:: cherrypy.wsgiserver.ssl_pyopenssl
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-cherrypy.wsgiserver.wsgiserver2 module
---------------------------------------
-
-.. automodule:: cherrypy.wsgiserver.wsgiserver2
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-cherrypy.wsgiserver.wsgiserver3 module
---------------------------------------
-
-.. automodule:: cherrypy.wsgiserver.wsgiserver3
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: cherrypy.wsgiserver
-    :members:
-    :undoc-members:
-    :show-inheritance: