From a1287cf4e15d469163ec6465ea5f6ce200c20543 Mon Sep 17 00:00:00 2001
From: Todd Willey <todd@ansolabs.com>
Date: Wed, 27 Oct 2010 17:31:46 -0400
Subject: cleanup rrd doc generation.

---
 doc/source/auth.rst    | 26 +++++++++++++++++++-----
 doc/source/compute.rst | 54 ++++++++++++++++++++++----------------------------
 doc/source/conf.py     |  2 +-
 nova/auth/fakeldap.py  |  1 -
 nova/auth/manager.py   |  3 +--
 5 files changed, 47 insertions(+), 39 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 -----------------------------------------------------
diff --git a/nova/auth/fakeldap.py b/nova/auth/fakeldap.py
index cf3a84a5d..1a49b73fe 100644
--- a/nova/auth/fakeldap.py
+++ b/nova/auth/fakeldap.py
@@ -79,7 +79,6 @@ def _match_query(query, attrs):
 
     &, |, and ! are supported in the query. No syntax checking is performed,
     so malformed querys will not work correctly.
-
     """
     # cut off the parentheses
     inner = query[1:-1]
diff --git a/nova/auth/manager.py b/nova/auth/manager.py
index 001a96875..7b2b68161 100644
--- a/nova/auth/manager.py
+++ b/nova/auth/manager.py
@@ -84,12 +84,11 @@ class AuthBase(object):
 
     @classmethod
     def safe_id(cls, obj):
-        """Safe get object id
+        """Safely get object id.
 
         This method will return the id of the object if the object
         is of this class, otherwise it will return the original object.
         This allows methods to accept objects or ids as paramaters.
-
         """
         if isinstance(obj, cls):
             return obj.id
-- 
cgit