From 7c5ab22f8fabb544ffbbfa4c56470f2e1717946e Mon Sep 17 00:00:00 2001
From: Stephen Finucane <sfinucan@redhat.com>
Date: Wed, 22 Mar 2017 13:24:52 +0000
Subject: [PATCH] Use Sphinx 1.5 warning-is-error

With pbr 2.0 and Sphinx 1.5, the setting for treat sphinx warnings as
errors is setting warning-is-error in build_sphinx section. Migrate
the setting from the old warnerrors one.

Change-Id: If31f68a80ab9e490dbf1457c274ac9f0c78239c4
---
 setup.cfg | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index a493d50f..048ca821 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,9 +22,6 @@ classifier =
 packages =
     oslo_service
 
-[pbr]
-warnerrors = true
-
 [entry_points]
 oslo.config.opts =
     oslo.service.periodic_task = oslo_service.periodic_task:list_opts
@@ -33,9 +30,9 @@ oslo.config.opts =
     oslo.service.wsgi = oslo_service.wsgi:list_opts
 
 [build_sphinx]
+warning-is-error = 1
 source-dir = doc/source
 build-dir = doc/build
-all_files = 1
 
 [upload_sphinx]
 upload-dir = doc/build/html