summaryrefslogtreecommitdiff
path: root/docs/conf.py
diff options
context:
space:
mode:
authorÉric Araujo <earaujo@caravan.coop>2020-01-16 16:11:18 -0500
committerÉric Araujo <earaujo@caravan.coop>2020-01-16 16:11:18 -0500
commitb102650f3ba20d3153ddff005d49f8c33fef8886 (patch)
treeef36934735de9509f6d660782aedd9233382e865 /docs/conf.py
parentd741e9baca9c6aa76158341aae4b4310b3745b7b (diff)
parent9c153e1250e00faa06003c10c3a26886489e6210 (diff)
downloadpyramid-b102650f3ba20d3153ddff005d49f8c33fef8886.tar.gz
pyramid-b102650f3ba20d3153ddff005d49f8c33fef8886.tar.bz2
pyramid-b102650f3ba20d3153ddff005d49f8c33fef8886.zip
merge master
Diffstat (limited to 'docs/conf.py')
-rw-r--r--docs/conf.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 365af5fdb..472485380 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -72,8 +72,10 @@ intersphinx_mapping = {
'sqla': ('https://docs.sqlalchemy.org/en/latest/', None),
'tm': ('https://docs.pylonsproject.org/projects/pyramid-tm/en/latest/', None),
'toolbar': ('https://docs.pylonsproject.org/projects/pyramid-debugtoolbar/en/latest/', None),
+ 'transaction': ('https://transaction.readthedocs.io/en/latest/', None),
'tutorials': ('https://docs.pylonsproject.org/projects/pyramid-tutorials/en/latest/', None),
'venusian': ('https://docs.pylonsproject.org/projects/venusian/en/latest/', None),
+ 'webtest': ('https://docs.pylonsproject.org/projects/webtest/en/latest/', None),
'zcml': (
'https://docs.pylonsproject.org/projects/pyramid-zcml/en/latest/', None),
}