summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2017-06-20 14:42:19 -0700
committerGitHub <noreply@github.com>2017-06-20 14:42:19 -0700
commitefc3780c3038ce66e1560c40bb77eef10a8658cc (patch)
tree10bde7d8cbb3415b9b09f2b9fa3e48882eb3e9b0
parent068010176a6bb4ea98a0598600dc5f571a2a0502 (diff)
parent0707974715d0795384f75ea2de55ffc424219ac0 (diff)
downloadpyramid-efc3780c3038ce66e1560c40bb77eef10a8658cc.tar.gz
pyramid-efc3780c3038ce66e1560c40bb77eef10a8658cc.tar.bz2
pyramid-efc3780c3038ce66e1560c40bb77eef10a8658cc.zip
Merge pull request #3099 from stevepiercy/master
update intersphinx for pytest and repoze.who
-rw-r--r--docs/conf.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/conf.py b/docs/conf.py
index e63019c63..6158164ed 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -70,7 +70,7 @@ intersphinx_mapping = {
'plaster': ('http://docs.pylonsproject.org/projects/plaster/en/latest/', None),
'pylonswebframework': ('http://docs.pylonsproject.org/projects/pylons-webframework/en/latest/', None),
'python': ('https://docs.python.org/3', None),
- 'pytest': ('https://pytest.org/en/latest/', None),
+ 'pytest': ('https://docs.pytest.org/en/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),
@@ -80,7 +80,7 @@ intersphinx_mapping = {
'venusian': ('http://docs.pylonsproject.org/projects/venusian/en/latest', None),
'webob': ('http://docs.webob.org/en/latest', None),
'webtest': ('http://webtest.pythonpaste.org/en/latest', None),
- 'who': ('http://repozewho.readthedocs.org/en/latest', None),
+ 'who': ('http://repozewho.readthedocs.io/en/latest', None),
'zcml': ('http://docs.pylonsproject.org/projects/pyramid-zcml/en/latest', None),
'zcomponent': ('http://zopecomponent.readthedocs.io/en/latest/', None),
'zinterface': ('http://zopeinterface.readthedocs.io/en/latest/', None),