Merge "Removed docbook requirements from documentation"

2014-08-20 11:14:28 +00:00
parent cf8b0c4885 2b0f1a3b02
commit 59c3d9bd1a
2 changed files with 0 additions and 2 deletions
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -31,7 +31,6 @@ extensions = [
    'sphinx.ext.intersphinx',
    'sphinx.ext.viewcode',
    'wsmeext.sphinxext',
-    'sphinxcontrib.docbookrestapi.setup',
    'sphinxcontrib.pecanwsme.rest',
    'sphinxcontrib.httpdomain',
    'oslosphinx',
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,7 +6,6 @@ mock>=1.0
 sphinx>=1.1.2,!=1.2.0,<1.3
 oslosphinx
 oslotest
-sphinxcontrib-docbookrestapi
 sphinxcontrib-httpdomain
 sphinxcontrib-pecanwsme>=0.8
 docutils==0.9.1