merged and fixed conflicts

doc/source/auth.rst

@@ -127,7 +127,7 @@ CloudAudit queries may spawn long-running processes (similar to launching instan
 RBAC of CloudAudit API calls is critical, since detailed system information is a system vulnerability.
 
 Type declarations
----------------------
+-----------------
 *	Data declarations – Volumes and Objects
 *	System declarations – Instances
 
@@ -198,14 +198,30 @@ The :mod:`signer` Module
     :undoc-members:
     :show-inheritance:
 
-The :mod:`auth` Module
------------------------
+The :mod:`manager` Module
+-------------------------
 
 .. automodule:: nova.auth.manager
     :members:
     :undoc-members:
     :show-inheritance:
 
+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
 --------------------------------
 
@@ -223,7 +239,7 @@ The :mod:`access_unittest` Module
     :show-inheritance:
 
 The :mod:`ec2` Module
-------------------------
+---------------------
 
 .. automodule:: nova.api.ec2
     :members:

doc/source/compute.rst

@@ -15,33 +15,35 @@
       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:`manager` Module
+-------------------------
+
+.. automodule:: nova.compute.manager
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 The :mod:`disk` Module
 ----------------------
 
@@ -50,45 +52,37 @@ The :mod:`disk` Module
     :undoc-members:
     :show-inheritance:
 
-The :mod:`exception` Module
----------------------------
+The :mod:`instance_types` Module
+--------------------------------
 
-.. automodule:: nova.compute.exception
+.. automodule:: nova.compute.instance_types
     :members:
     :undoc-members:
     :show-inheritance:
 
-The :mod:`model` Module
+The :mod:`power_state` Module
+-----------------------------
+
+.. automodule:: nova.compute.power_state
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+The :mod:`monitor` Module
 -------------------------
 
-.. automodule:: nova.compute.model
-    :members:
-    :undoc-members:
-    :show-inheritance:
-    
-The :mod:`network` Module
--------------------------
-
-.. automodule:: nova.compute.network
+.. automodule:: nova.compute.monitor
     :members:
     :undoc-members:
     :show-inheritance:
 
-The :mod:`node` Module
-----------------------
-
-.. automodule:: nova.compute.node
-    :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:

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('../../'), os.path.abspath('../../bin')])
+sys.path.insert(0, os.path.abspath('../../'))
 
 
 # -- General configuration -----------------------------------------------------

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]

nova/auth/manager.py

@@ -84,7 +84,7 @@ 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.