diff --git a/doc/source/architecture.rst b/doc/source/architecture.rst
index 9be6e572d..75e73638c 100644
--- a/doc/source/architecture.rst
+++ b/doc/source/architecture.rst
@@ -51,3 +51,21 @@ database setup (using a separate database from the one used for metering)
 will be critical in all cases of production deployment.
 
 .. _Autoscaling with Heat and Ceilometer: http://techs.enovance.com/5991/autoscaling-with-heat-and-ceilometer
+
+Alarm Rules
+===========
+
+.. list-plugins:: aodh.alarm.rule
+   :detailed:
+
+Alarm Evaluators
+================
+
+.. list-plugins:: aodh.evaluator
+   :detailed:
+
+Alarm Notifiers
+===============
+
+.. list-plugins:: aodh.notifier
+   :detailed:
diff --git a/doc/source/conf.py b/doc/source/conf.py
index febcc0078..501519e52 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -46,7 +46,8 @@ extensions = [
     'sphinx.ext.viewcode',
     'sphinxcontrib.pecanwsme.rest',
     'oslosphinx',
-    'sphinxcontrib.docbookrestapi.setup'
+    'sphinxcontrib.docbookrestapi.setup',
+    'stevedore.sphinxext',
 ]
 
 wsme_protocols = ['restjson', 'restxml']
diff --git a/doc/source/install/index.rst b/doc/source/install/index.rst
index 77ed7ebe8..b7ee6beca 100644
--- a/doc/source/install/index.rst
+++ b/doc/source/install/index.rst
@@ -24,4 +24,5 @@
 
    development
    manual
+   storage
    mod_wsgi
diff --git a/doc/source/install/storage.rst b/doc/source/install/storage.rst
new file mode 100644
index 000000000..d35a03f56
--- /dev/null
+++ b/doc/source/install/storage.rst
@@ -0,0 +1,6 @@
+=================
+ Storage Drivers
+=================
+
+.. list-plugins:: aodh.storage
+   :detailed: