diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-12-09 11:30:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-12-09 11:30:00 +0000 |
| commit | effcc8d13844d777ac70d59094f640cfacd67129 (patch) | |
| tree | 96e504e8b83875b01925bf190683edd6015f93e8 | |
| parent | 42914c7899dc1e858feef7986ba930d78f93a8c0 (diff) | |
| parent | 1b45419b3ee6c0ae05356b12dfea58667b5bd7a8 (diff) | |
| download | tooz-effcc8d13844d777ac70d59094f640cfacd67129.tar.gz | |
Merge "Switch to using oslosphinx"
| -rw-r--r-- | doc/source/conf.py | 5 | ||||
| -rw-r--r-- | test-requirements.txt | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py index cbdc2ff..16edd3f 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -30,6 +30,7 @@ extensions = [ 'sphinx.ext.todo', 'sphinx.ext.graphviz', 'sphinx.ext.extlinks', + 'oslosphinx', ] # Add any paths that contain templates here, relative to this directory. @@ -46,7 +47,7 @@ master_doc = 'index' # General information about the project. project = u'tooz' -copyright = u'%s, eNovance' % datetime.date.today().year +copyright = u'%s, OpenStack Foundation' % datetime.date.today().year # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -235,7 +236,7 @@ latex_documents = [ # dir menu entry, description, category) texinfo_documents = [ ('index', 'tooz', u'tooz Documentation', - u'eNovance', 'tooz', 'One line description of project.', + u'OpenStack Foundation', 'tooz', 'One line description of project.', 'Miscellaneous'), ] diff --git a/test-requirements.txt b/test-requirements.txt index 83873b4..835a7e3 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,6 +4,7 @@ flake8>=2.1.0 discover mock>=1.0 # only needed on < python 3.3 sphinx>=1.1.2,<1.2 +oslosphinx>=2.2.0 # Apache-2.0 python-subunit testrepository>=0.0.17 testtools>=0.9.32 |