summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2017-05-01 23:05:53 -0500
committerMichael Merickel <michael@merickel.org>2017-05-01 23:05:53 -0500
commitfbfd8191cee8536078cc01cd2256378ba0711f22 (patch)
tree1899b6c119c2443671ec5b4e8c98f78cde4e36a8
parentc273cd0471afe365d9bd8a793a81897a9e713aab (diff)
downloadpyramid-fbfd8191cee8536078cc01cd2256378ba0711f22.tar.gz
pyramid-fbfd8191cee8536078cc01cd2256378ba0711f22.tar.bz2
pyramid-fbfd8191cee8536078cc01cd2256378ba0711f22.zip
fix url syntax yet again
-rw-r--r--CHANGES.txt2
-rw-r--r--docs/conf.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 0513fd3c9..2378ec883 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,7 +11,7 @@ Major Features
For now, Pyramid is still shipping with integrated support for the
PasteDeploy INI format by depending on the
- `plaster_pastedeploy <https://github.com/Pylons/plaster_pastedeploy`_
+ `plaster_pastedeploy <https://github.com/Pylons/plaster_pastedeploy>`_
binding library. This may change in the future.
See https://github.com/Pylons/pyramid/pull/2985
diff --git a/docs/conf.py b/docs/conf.py
index df58064e5..f09ae325b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -67,6 +67,7 @@ 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),