summaryrefslogtreecommitdiff
path: root/doc/source
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-01-18 07:45:26 +0000
committerGerrit Code Review <review@openstack.org>2015-01-18 07:45:26 +0000
commitd0069876390825309ac0920ecc1fdd57336507f7 (patch)
treebd4727ec4f8eabebc30251b09f50d2f7cadb3fab /doc/source
parent1b9b9ed9059333fdbf84ba5e9d1ec72795c74fb6 (diff)
parenta15dd80dd29e56a6ba195c5414532fcbb1d40a29 (diff)
downloadpython-keystoneclient-d0069876390825309ac0920ecc1fdd57336507f7.tar.gz
Merge "Fix up types within API documentation"
Diffstat (limited to 'doc/source')
-rw-r--r--doc/source/conf.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 30d0259..f256fd4 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -42,6 +42,7 @@ sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__),
extensions = ['sphinx.ext.autodoc',
'sphinx.ext.todo',
'sphinx.ext.coverage',
+ 'sphinx.ext.intersphinx',
'oslosphinx',
# NOTE(blk-u): Uncomment the [pbr] section in setup.cfg and
# remove this Sphinx extension when
@@ -232,3 +233,8 @@ latex_documents = [
# If false, no module index is generated.
#latex_use_modindex = True
+
+intersphinx_mapping = {
+ 'python': ('http://docs.python.org/', None),
+ 'osloconfig': ('http://docs.openstack.org/developer/oslo.config/', None),
+}