diff --git a/aodh/notifier/zaqar.py b/aodh/notifier/zaqar.py
index e59df36db..e3a30a9a6 100644
--- a/aodh/notifier/zaqar.py
+++ b/aodh/notifier/zaqar.py
@@ -40,17 +40,17 @@ class ZaqarAlarmNotifier(notifier.AlarmNotifier):
     to an existing Zaqar queue with a pre-signed URL.
 
     To create a new subscription in the service project, use a notification URL
-    of the form:
+    of the form::
 
         zaqar://?topic=example&subscriber=mailto%3A//test%40example.com&ttl=3600
 
-    Multiple subscribers are allowed. ``ttl` is the time to live of the
+    Multiple subscribers are allowed. ``ttl`` is the time to live of the
     subscription. The queue will be created automatically, in the service
     project, with a name based on the topic and the alarm ID.
 
     To use a pre-signed URL for an existing queue, use a notification URL with
     the scheme ``zaqar://`` and the pre-signing data from Zaqar in the query
-    string:
+    string::
 
         zaqar://?queue_name=example&project_id=foo&
                  paths=/messages&methods=POST&expires=1970-01-01T00:00Z&
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 47e7ba6a9..cb324a752 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -321,3 +321,11 @@ epub_copyright = u'2012-2015, OpenStack'
 
 # Allow duplicate toc entries.
 #epub_tocdup = True
+
+# NOTE(dhellmann): pbr used to set this option but now that we are
+# using Sphinx>=1.6.2 it does not so we have to set it ourselves.
+suppress_warnings = [
+    'app.add_directive', 'app.add_role',
+    'app.add_generic_role', 'app.add_node',
+    'image.nonlocal_uri',
+]
diff --git a/doc/source/contributor/architecture.rst b/doc/source/contributor/architecture.rst
index 63bde2ac5..126ff93b8 100644
--- a/doc/source/contributor/architecture.rst
+++ b/doc/source/contributor/architecture.rst
@@ -4,8 +4,6 @@
  System Architecture
 =====================
 
-.. index::
-
 High-Level Architecture
 =======================
 
diff --git a/doc/source/contributor/configuration.rst b/doc/source/contributor/configuration.rst
index 3108ed88a..70de84866 100644
--- a/doc/source/contributor/configuration.rst
+++ b/doc/source/contributor/configuration.rst
@@ -33,4 +33,4 @@ The following is a sample Aodh configuration for adaptation and use. It is
 auto-generated from Aodh when this documentation is built, and can also be
 viewed in `file form <_static/aodh.conf.sample>`_.
 
-.. literalinclude:: _static/aodh.conf.sample
+.. literalinclude:: ../_static/aodh.conf.sample
diff --git a/setup.cfg b/setup.cfg
index 3b0556a82..76a78a869 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -126,6 +126,7 @@ tempest.test_plugins =
 all_files = 1
 build-dir = doc/build
 source-dir = doc/source
+warning-is-error = 1
 
 [pbr]
 warnerrors = true