diff --git a/.travis.yml b/.travis.yml
index 1a34411663e..df9578c8a35 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,9 +10,6 @@ install:
   - pip install -r requirements-dev.txt
   - pip install coveralls
   - python setup.py develop
-script: nosetests -s -v --with-coverage --cover-package=c7n tests
+script: make sphinx && nosetests -s -v --with-coverage --cover-package=c7n tests
 after_success:
   coveralls
-
-
-
diff --git a/c7n/actions.py b/c7n/actions.py
index 1eda1285ec5..9e32adee761 100644
--- a/c7n/actions.py
+++ b/c7n/actions.py
@@ -311,14 +311,16 @@ def send_sqs(self, message):
 class AutoTagUser(EventAction):
     """Tag a resource with the user who created/modified it.
 
-    policies:
-      - name: ec2-auto-tag-owner
-        resource: ec2
-        filters:
-         - tag:Owner: absent
-        actions:
-         - type: auto-tag-creator
-           tag: OwnerContact
+    .. code-block:: yaml
+
+      policies:
+        - name: ec2-auto-tag-owner
+          resource: ec2
+          filters:
+           - tag:Owner: absent
+          actions:
+           - type: auto-tag-creator
+             tag: OwnerContact
 
     There's a number of caveats to usage, resources which don't
     include tagging as part of their api, may have some delay before
diff --git a/c7n/filters/metrics.py b/c7n/filters/metrics.py
index a8772c33975..fba09bcaafd 100644
--- a/c7n/filters/metrics.py
+++ b/c7n/filters/metrics.py
@@ -31,7 +31,7 @@ class MetricsFilter(Filter):
     - GetMetricStatistics - http://goo.gl/w8mMEY
     - Supported Metrics - http://goo.gl/n0E0L7
 
-    usage:: yaml
+    .. code-block:: yaml
 
       - name: ec2-underutilized
         resource: ec2
diff --git a/c7n/resources/ebs.py b/c7n/resources/ebs.py
index 60ade598909..5e326583e50 100644
--- a/c7n/resources/ebs.py
+++ b/c7n/resources/ebs.py
@@ -497,8 +497,7 @@ class EncryptInstanceVolumes(BaseAction):
     - Requires instance restart
     - Not suitable for autoscale groups.
 
-    Multistep process
-    -----------------
+    Multistep process:
 
     - Stop instance (if running)
     - For each volume
@@ -517,7 +516,7 @@ class EncryptInstanceVolumes(BaseAction):
 
     :example:
 
-        .. code-base: yaml
+        .. code-block:: yaml
 
             policies:
               - name: encrypt-unencrypted-ebs
diff --git a/c7n/utils.py b/c7n/utils.py
index b9b6de8c605..6173acbdcf8 100644
--- a/c7n/utils.py
+++ b/c7n/utils.py
@@ -89,7 +89,7 @@ def type_schema(
                  inherits issues with additionalProperties and type enums.
      - aliases: additional names this type maybe called
      - required: list of required properties, by default 'type' is required
-     - **props: additional key value properties
+     - props: additional key value properties
     """
     if aliases:
         type_names = [type_name]
diff --git a/docs/Makefile.sphinx b/docs/Makefile.sphinx
index 0be7daf378b..b487da6dba4 100644
--- a/docs/Makefile.sphinx
+++ b/docs/Makefile.sphinx
@@ -3,7 +3,7 @@
 
 # You can set these variables from the command line.
 SRCDIR        = docs/source
-SPHINXOPTS    =
+SPHINXOPTS    = -W
 SPHINXBUILD   = sphinx-build
 PAPER         =
 BUILDDIR      = $(SRCDIR)/../build
diff --git a/docs/source/_static/c1_labs.png b/docs/source/_static/c1_labs.png
deleted file mode 100644
index 6df4c905dfd..00000000000
Binary files a/docs/source/_static/c1_labs.png and /dev/null differ
diff --git a/docs/source/c1_labs.ico b/docs/source/c1_labs.ico
new file mode 100644
index 00000000000..b8bc08cc8c3
Binary files /dev/null and b/docs/source/c1_labs.ico differ
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 94618da6e16..a585b8a61b0 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -137,7 +137,7 @@
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-html_favicon = 'c1_labs.png'
+html_favicon = 'c1_labs.ico'
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 682fda097fa..329e3b8aa00 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -50,6 +50,13 @@ Navigate below and get started with Cloud Custodian!
    developer   
 
 
+.. toctree::
+   :maxdepth: 2
+   :caption: API Reference
+
+   generated/modules
+
+
 Indices and tables
 ==================