diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-08-21 06:58:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-08-21 06:58:58 +0000 |
| commit | 6987295884f8eca57cb4e04796b91c9755b323e7 (patch) | |
| tree | 0ab56d40d9a4b125e7a726687c2d4e937f2f15ae | |
| parent | e13ac922f95ce0964b9b75b46b6c4f505ec751d1 (diff) | |
| parent | 7736349b1ee7280a3a1727e44818f0b8aa4324e4 (diff) | |
| download | python-glanceclient-6987295884f8eca57cb4e04796b91c9755b323e7.tar.gz | |
Merge "Update theme for docs"
| -rw-r--r-- | doc/source/conf.py | 4 | ||||
| -rw-r--r-- | test-requirements.txt | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py index ca20289..75c301f 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -12,7 +12,7 @@ sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx'] +extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'oslosphinx'] # autodoc generation is a bit aggressive and a nuisance when doing heavy # text edit cycles. @@ -52,7 +52,7 @@ man_pages = [ # The theme to use for HTML and HTML Help pages. Major themes that come with # Sphinx are currently 'default' and 'sphinxdoc'. -html_theme = 'nature' +#html_theme = 'nature' # Output file base name for HTML help builder. htmlhelp_basename = '%sdoc' % project diff --git a/test-requirements.txt b/test-requirements.txt index c514a03..3064763 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,6 +4,7 @@ coverage>=3.6 discover mox3>=0.7.0 mock>=1.0 +oslosphinx sphinx>=1.1.2,!=1.2.0,<1.3 testrepository>=0.0.18 testtools>=0.9.34 |