diff options
| author | Steve Piercy <web@stevepiercy.com> | 2017-05-12 21:24:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-12 21:24:15 -0700 |
| commit | 5f3b95cf3e1b3005007e739d0e008b21cff2babf (patch) | |
| tree | c69983404d7b9b8db62640809e6b81c5e46677b4 /docs/conf.py | |
| parent | b5444950d84c507f26764a16021db6e01d0461e3 (diff) | |
| parent | a7d60de001ba14023d20d701d9697ad7d8de1dd4 (diff) | |
| download | pyramid-5f3b95cf3e1b3005007e739d0e008b21cff2babf.tar.gz pyramid-5f3b95cf3e1b3005007e739d0e008b21cff2babf.tar.bz2 pyramid-5f3b95cf3e1b3005007e739d0e008b21cff2babf.zip | |
Merge branch 'master' into change-to-localhost
Diffstat (limited to 'docs/conf.py')
| -rw-r--r-- | docs/conf.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/conf.py b/docs/conf.py index df58064e5..e63019c63 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -67,9 +67,10 @@ intersphinx_mapping = { 'cookiecutter': ('https://cookiecutter.readthedocs.io/en/latest/', None), 'deform': ('http://docs.pylonsproject.org/projects/deform/en/latest', None), 'jinja2': ('http://docs.pylonsproject.org/projects/pyramid-jinja2/en/latest/', None), + '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), |