Merge "Revert "Added olso sphinx, and enabled it for building docs""

This commit is contained in:
Jenkins 2014-06-28 18:01:41 +00:00 committed by Gerrit Code Review
commit feec94d268
2 changed files with 1 additions and 2 deletions

View File

@ -25,7 +25,7 @@ import sys, os
# Add any Sphinx extension module names here, as strings. They can be extensions # Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode', 'sphinxcontrib.httpdomain', 'oslosphinx'] extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode', 'sphinxcontrib.httpdomain']
# Add any paths that contain templates here, relative to this directory. # Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates'] templates_path = ['_templates']

View File

@ -26,4 +26,3 @@ dnspython>=1.9.4
posix_ipc posix_ipc
oslotest oslotest
oslo.db>=0.2.0 # Apache-2.0 oslo.db>=0.2.0 # Apache-2.0
oslosphinx