Merge "Switch over to oslosphinx"

doc/source/conf.py

@@ -23,7 +23,7 @@
 
 # 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.viewcode', 'oslo.sphinx']
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode', 'oslosphinx']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']

test-requirements.txt

@@ -3,4 +3,4 @@ Babel>=1.3
 coverage>=3.6
 mox>=0.5.3
 sphinx>=1.1.2,<1.2
-oslo.sphinx
+oslosphinx