From ff588ab5baf400c243daeff82e7ca2fd27d87143 Mon Sep 17 00:00:00 2001
From: Todd Willey <todd@ansolabs.com>
Date: Mon, 1 Nov 2010 21:13:51 -0400
Subject: Exceptions docs.

---
 doc/source/development.guide.rst |  4 ++--
 doc/source/exceptions.rst        | 27 +++++++++++++++++++++++++++
 doc/source/nova.rst              |  9 +--------
 3 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 doc/source/exceptions.rst

(limited to 'doc/source')

diff --git a/doc/source/development.guide.rst b/doc/source/development.guide.rst
index 8addc7813..7322545de 100644
--- a/doc/source/development.guide.rst
+++ b/doc/source/development.guide.rst
@@ -22,8 +22,7 @@ Nova is written in python.
 
 ::
 
-    TODO(todd): * API
-                * Exceptions
+    TODO(todd):
                 * Nova libraries (utils, etc)
                 * Building packages
 
@@ -40,6 +39,7 @@ Contents
    network      
    auth  
    api
+   exceptions
    fakes
 
 
diff --git a/doc/source/exceptions.rst b/doc/source/exceptions.rst
new file mode 100644
index 000000000..aaf5b2c1a
--- /dev/null
+++ b/doc/source/exceptions.rst
@@ -0,0 +1,27 @@
+..
+      Copyright 2010 United States Government as represented by the
+      Administrator of the National Aeronautics and Space Administration. 
+      All Rights Reserved.
+
+      Licensed under the Apache License, Version 2.0 (the "License"); you may
+      not use this file except in compliance with the License. You may obtain
+      a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+      License for the specific language governing permissions and limitations
+      under the License.
+
+Exceptions Programming Guide
+============================
+
+The :mod:`nova.excepton` Module
+-------------------------------
+
+.. automodule:: nova.exception
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/doc/source/nova.rst b/doc/source/nova.rst
index 4b9c44a5f..a5573cb41 100644
--- a/doc/source/nova.rst
+++ b/doc/source/nova.rst
@@ -34,14 +34,6 @@ The :mod:`adminclient` Module
     :undoc-members:
     :show-inheritance:
 
-The :mod:`datastore` Module
----------------------------
-
-.. automodule:: nova.datastore
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 The :mod:`exception` Module
 ---------------------------
 
@@ -49,6 +41,7 @@ The :mod:`exception` Module
     :members:
     :undoc-members:
     :show-inheritance:
+    :noindex:
     
 The :mod:`flags` Module
 ---------------------------
-- 
cgit