summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2017-05-12 01:26:39 -0700
committerGitHub <noreply@github.com>2017-05-12 01:26:39 -0700
commit4e27dd4c452a67d38a07eb79939dcbfcc6e82ab0 (patch)
tree4ac0c59d17dd9723a47403009a379b2503e5f759
parent607367ace939488f787d918c60275a90d5505dbd (diff)
parentf46c7944b70e2204529216655bfdfac1b72e646b (diff)
downloadpyramid-4e27dd4c452a67d38a07eb79939dcbfcc6e82ab0.tar.gz
pyramid-4e27dd4c452a67d38a07eb79939dcbfcc6e82ab0.tar.bz2
pyramid-4e27dd4c452a67d38a07eb79939dcbfcc6e82ab0.zip
Merge pull request #3035 from Pylons/pytest-url-fix-master
Pytest changed their URL structure
-rw-r--r--docs/conf.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/conf.py b/docs/conf.py
index f09ae325b..e63019c63 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': ('http://pytest.org/latest/', None),
+ 'pytest': ('https://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),