summaryrefslogtreecommitdiffstats
path: root/doc/source
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2012-07-05 16:27:12 -0500
committerMonty Taylor <mordred@inaugust.com>2012-07-07 16:32:19 -0500
commiteb2de037a387a2f20f50a81c973a2efd48d73494 (patch)
tree242281c4f99bde07f2a72a9ca3e0997a8fd55d87 /doc/source
parent642ec634c3beeb69175d0df12bcec8833e7efae5 (diff)
downloadnova-eb2de037a387a2f20f50a81c973a2efd48d73494.tar.gz
nova-eb2de037a387a2f20f50a81c973a2efd48d73494.tar.xz
nova-eb2de037a387a2f20f50a81c973a2efd48d73494.zip
Update common setup code to latest.
This gets us up to date with common/setup.py and replaces custom nova autodoc generation with the port of that code found in common. Change-Id: I2a1c5d2c0fdcf40dbea50cc123b537adb068cdc2
Diffstat (limited to 'doc/source')
-rw-r--r--doc/source/conf.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 8ced294d2..78feba48e 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -27,11 +27,6 @@ sys.path.insert(0, os.path.abspath('./'))
extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'ext.nova_todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath', 'sphinx.ext.ifconfig','sphinx.ext.graphviz']
-# autodoc generation is a bit aggressive and a nuisance when doing heavy text edit cycles.
-# execute "export SPHINX_DEBUG=1" in your terminal to disable
-if not os.getenv('SPHINX_DEBUG'):
- extensions += ['ext.nova_autodoc']
-
todo_include_todos = True
# Add any paths that contain templates here, relative to this directory.