diff options
| author | Steve Piercy <web@stevepiercy.com> | 2017-05-12 01:27:20 -0700 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2017-05-12 01:27:20 -0700 |
| commit | dede5366e8b2ce5982806f4306cdaaa6c8e178ca (patch) | |
| tree | 5a9d27d5f518d1abc5e89c5a5a00b6d409781671 /docs/conf.py | |
| parent | 0b92dfed800117595ef00fb2847c5db9970f4cac (diff) | |
| parent | 4e27dd4c452a67d38a07eb79939dcbfcc6e82ab0 (diff) | |
| download | pyramid-dede5366e8b2ce5982806f4306cdaaa6c8e178ca.tar.gz pyramid-dede5366e8b2ce5982806f4306cdaaa6c8e178ca.tar.bz2 pyramid-dede5366e8b2ce5982806f4306cdaaa6c8e178ca.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'docs/conf.py')
| -rw-r--r-- | docs/conf.py | 2 |
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), |