From 97986ff7951583f449b9a3d3dc480765600da3ab Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug@doughellmann.com>
Date: Thu, 14 Apr 2016 11:24:31 -0400
Subject: [PATCH] invoke sphinx directly instead of through pbr

The pbr feature for invoking sphinx doesn't let us treat warnings as
errors because of a bug in pbr. Switch to invoking sphinx directly,
including removing the setup.cfg instructions for sphinx, so we can use
the flag to treat warnings as errors. Doing this also requires fixing a
few existing warnings, so those changes are included in this patch.

Change-Id: I2aa0d844855d5a18646d0bc3907620544ae71be2
Signed-off-by: Doug Hellmann <doug@doughellmann.com>
---
 doc/source/index.rst           | 1 +
 doc/source/mitaka/index.rst    | 5 +++++
 doc/source/newton/index.rst    | 5 +++++
 doc/source/static/.placeholder | 0
 tox.ini                        | 2 +-
 5 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 doc/source/static/.placeholder

diff --git a/doc/source/index.rst b/doc/source/index.rst
index 9de42d9e3b..5eb0d43117 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -66,6 +66,7 @@ series. You can find the detail of the various release series here:
    bexar/index
    austin/index
    releases/*
+   schedules/*
 
 Series-Independent Releases
 ===========================
diff --git a/doc/source/mitaka/index.rst b/doc/source/mitaka/index.rst
index 70a68231dc..851f507de6 100644
--- a/doc/source/mitaka/index.rst
+++ b/doc/source/mitaka/index.rst
@@ -17,3 +17,8 @@ Documentation:
 
 .. deliverable::
    :series: mitaka
+
+.. toctree::
+   :hidden:
+
+   schedule
diff --git a/doc/source/newton/index.rst b/doc/source/newton/index.rst
index afe9bb1cfd..8e70df8ab7 100644
--- a/doc/source/newton/index.rst
+++ b/doc/source/newton/index.rst
@@ -8,3 +8,8 @@ Release schedule: :doc:`schedule`
 
 .. deliverable::
    :series: newton
+
+.. toctree::
+   :hidden:
+
+   schedule
diff --git a/doc/source/static/.placeholder b/doc/source/static/.placeholder
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tox.ini b/tox.ini
index 9a5065dece..c1e4a59c14 100644
--- a/tox.ini
+++ b/tox.ini
@@ -53,7 +53,7 @@ commands = {toxinidir}/tools/build_tag_history.sh {toxinidir}
 #commands = python setup.py testr --coverage --testr-args='{posargs}'
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+commands = sphinx-build -a -E -W -d doc/build/doctrees -b html doc/source doc/build/html
 deps = .[sphinxext]
 
 [flake8]