summaryrefslogtreecommitdiff
path: root/docs/conf.py
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-11-21 02:22:17 -0800
committerGitHub <noreply@github.com>2016-11-21 02:22:17 -0800
commitafce2883d7e98b76734383d3a6b6acd8ae1a4586 (patch)
treedfb4bb0fe0632badef595dabb5e3faf4e458a876 /docs/conf.py
parent8abaf3c453c7f21c171e50212c502e71d77aed89 (diff)
parent90db2bc106822be4ba3ca92a51a932f17d5ce4f7 (diff)
downloadpyramid-afce2883d7e98b76734383d3a6b6acd8ae1a4586.tar.gz
pyramid-afce2883d7e98b76734383d3a6b6acd8ae1a4586.tar.bz2
pyramid-afce2883d7e98b76734383d3a6b6acd8ae1a4586.zip
Merge pull request #2828 from stevepiercy/style-guide
More style guide updates
Diffstat (limited to 'docs/conf.py')
-rw-r--r--docs/conf.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/conf.py b/docs/conf.py
index c3a7170fc..ace921247 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -68,6 +68,7 @@ intersphinx_mapping = {
'pylonswebframework': ('http://docs.pylonsproject.org/projects/pylons-webframework/en/latest/', None),
'python': ('https://docs.python.org/3', None),
'pytest': ('http://pytest.org/latest/', None),
+ 'sphinx': ('http://www.sphinx-doc.org/en/latest', None),
'sqla': ('http://docs.sqlalchemy.org/en/latest', None),
'tm': ('http://docs.pylonsproject.org/projects/pyramid-tm/en/latest/', None),
'toolbar': ('http://docs.pylonsproject.org/projects/pyramid-debugtoolbar/en/latest', None),