summaryrefslogtreecommitdiff
path: root/docs/conf.py
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-04-16 14:07:28 -0700
committerSteve Piercy <web@stevepiercy.com>2016-04-16 14:07:28 -0700
commit401c6513dc53b783b1d2ab7c88dd56e8b8bb188b (patch)
tree7b48852898020853632e6866c20d4c9d157cccea /docs/conf.py
parent3d5dbd2c599fc724ebf105708f75d8768530e855 (diff)
parenta5e89f07e4c97849f0a36069d4272c6e2efe8539 (diff)
downloadpyramid-401c6513dc53b783b1d2ab7c88dd56e8b8bb188b.tar.gz
pyramid-401c6513dc53b783b1d2ab7c88dd56e8b8bb188b.tar.bz2
pyramid-401c6513dc53b783b1d2ab7c88dd56e8b8bb188b.zip
Merge pull request #2505 from stevepiercy/docs/quick-tour-gotcher-nose
Docs/quick tour gotcher nose
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 1600e1f5c..c40f1c875 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -67,6 +67,7 @@ intersphinx_mapping = {
'jinja2': ('http://docs.pylonsproject.org/projects/pyramid-jinja2/en/latest/', None),
'pylonswebframework': ('http://docs.pylonsproject.org/projects/pylons-webframework/en/latest/', None),
'python': ('https://docs.python.org/3', None),
+ 'pytest': ('http://pytest.org/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),