Merge "Use oslosphinx for docs site"

This commit is contained in:
Jenkins 2015-02-16 22:05:41 +00:00 committed by Gerrit Code Review
commit ed0ac6d617
2 changed files with 2 additions and 1 deletions

View File

@ -4,7 +4,7 @@ import os
# Add any Sphinx extension module names here, as strings. They can be # Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones. # ones.
extensions = [] extensions = ['oslosphinx']
# 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

@ -9,3 +9,4 @@ testrepository>=0.0.18
# Doc requirements # Doc requirements
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
oslosphinx>=2.2.0 # Apache-2.0