summaryrefslogtreecommitdiff
path: root/docs/conf.py
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-11-21 02:09:01 -0800
committerSteve Piercy <web@stevepiercy.com>2016-11-21 02:09:01 -0800
commit90db2bc106822be4ba3ca92a51a932f17d5ce4f7 (patch)
treedfb4bb0fe0632badef595dabb5e3faf4e458a876 /docs/conf.py
parentff8acd6f545ca55f9c9588ee77aee559d68ab194 (diff)
downloadpyramid-90db2bc106822be4ba3ca92a51a932f17d5ce4f7.tar.gz
pyramid-90db2bc106822be4ba3ca92a51a932f17d5ce4f7.tar.bz2
pyramid-90db2bc106822be4ba3ca92a51a932f17d5ce4f7.zip
add code block options
- add literal includes - add displaying long commands - add sphinx to intersphinx - garden
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),