summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorTodd Willey <todd@ansolabs.com>2010-10-27 17:31:46 -0400
committerTodd Willey <todd@ansolabs.com>2010-10-27 17:31:46 -0400
commita1287cf4e15d469163ec6465ea5f6ce200c20543 (patch)
tree3d06fe8ab563b6cdd9d56e3483891676efe2c5a1 /doc
parent55a0cfc96b92bd050115244c850f4ad58791c83f (diff)
cleanup rrd doc generation.
Diffstat (limited to 'doc')
-rw-r--r--doc/source/auth.rst26
-rw-r--r--doc/source/compute.rst54
-rw-r--r--doc/source/conf.py2
3 files changed, 46 insertions, 36 deletions
diff --git a/doc/source/auth.rst b/doc/source/auth.rst
index 2b8ad7924..d739e4b8e 100644
--- a/doc/source/auth.rst
+++ b/doc/source/auth.rst
@@ -195,18 +195,34 @@ The :mod:`signer` Module
:undoc-members:
:show-inheritance:
-The :mod:`users` Module
------------------------
+The :mod:`manager` Module
+-------------------------
-.. automodule:: nova.auth.users
+.. automodule:: nova.auth.manager
:members:
:undoc-members:
:show-inheritance:
-The :mod:`users_unittest` Module
+The :mod:`ldapdriver` Module
+----------------------------
+
+.. automodule:: nova.auth.ldapdriver
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+The :mod:`dbdriver` Module
+----------------------------
+
+.. automodule:: nova.auth.dbdriver
+ :members:
+ :undoc-members:
+ :show-inheritance:
+
+The :mod:`auth_unittest` Module
--------------------------------
-.. automodule:: nova.tests.users_unittest
+.. automodule:: nova.tests.auth_unittest
:members:
:undoc-members:
:show-inheritance:
diff --git a/doc/source/compute.rst b/doc/source/compute.rst
index 76957f316..93070fa88 100644
--- a/doc/source/compute.rst
+++ b/doc/source/compute.rst
@@ -15,80 +15,74 @@
License for the specific language governing permissions and limitations
under the License.
-Compute Documentation
-=====================
-
from etherpad todo
------------------
-::
* FIX RST IMPORT ERRORS
* Compute Manager
* public methods
* responsibilities
* Compute Driver
* public methods
- * libvirt implementation
- - kvm/qemu
- - uml
+ * libvirt implementation (kvm/qemu vs uml)
* xen implementation
* hyperv implementation
-legacy docs
------------
+Compute Documentation
+=====================
This page contains the Compute Package documentation.
-The :mod:`disk` Module
-----------------------
+The :mod:`manager` Module
+-------------------------
-.. automodule:: nova.compute.disk
+.. automodule:: nova.compute.manager
:members:
:undoc-members:
:show-inheritance:
-The :mod:`exception` Module
----------------------------
+The :mod:`disk` Module
+----------------------
-.. automodule:: nova.compute.exception
+.. automodule:: nova.compute.disk
:members:
:undoc-members:
:show-inheritance:
-The :mod:`model` Module
--------------------------
+The :mod:`instance_types` Module
+--------------------------------
-.. automodule:: nova.compute.model
+.. automodule:: nova.compute.instance_types
:members:
:undoc-members:
:show-inheritance:
-
-The :mod:`network` Module
--------------------------
-.. automodule:: nova.compute.network
+The :mod:`power_state` Module
+-----------------------------
+
+.. automodule:: nova.compute.power_state
:members:
:undoc-members:
:show-inheritance:
-The :mod:`node` Module
-----------------------
+The :mod:`monitor` Module
+-------------------------
-.. automodule:: nova.compute.node
+.. automodule:: nova.compute.monitor
:members:
:undoc-members:
:show-inheritance:
-
+
RELATED TESTS
----------------
+-------------
-The :mod:`node_unittest` Module
--------------------------------
+The :mod:`compute_unittest` Module
+----------------------------------
-.. automodule:: nova.tests.node_unittest
+.. automodule:: nova.tests.compute_unittest
:members:
:undoc-members:
:show-inheritance:
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 505771ff8..3cf79503a 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -16,7 +16,7 @@ import sys, os
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.append([os.path.abspath('../nova'), os.path.abspath('..'), os.path.abspath('../bin')])
+sys.path.insert(0, '../..')
# -- General configuration -----------------------------------------------------