summaryrefslogtreecommitdiff
path: root/docs/whatsnew-1.2.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2018-12-31 23:31:17 -0800
committerSteve Piercy <web@stevepiercy.com>2018-12-31 23:31:17 -0800
commitc52a261e56fd10ccc979a687dc2249d1b06f1a9d (patch)
tree620a74035e6dfa1edd9fabc827b82f2b83ca3693 /docs/whatsnew-1.2.rst
parentf3d6b2206f523697a028d07dc0aca9381b595e40 (diff)
parentb488f6671800f99299a239fa07e06f221c127b3e (diff)
downloadpyramid-c52a261e56fd10ccc979a687dc2249d1b06f1a9d.tar.gz
pyramid-c52a261e56fd10ccc979a687dc2249d1b06f1a9d.tar.bz2
pyramid-c52a261e56fd10ccc979a687dc2249d1b06f1a9d.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'docs/whatsnew-1.2.rst')
-rw-r--r--docs/whatsnew-1.2.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/whatsnew-1.2.rst b/docs/whatsnew-1.2.rst
index 9ff933ace..8572f04f5 100644
--- a/docs/whatsnew-1.2.rst
+++ b/docs/whatsnew-1.2.rst
@@ -63,7 +63,7 @@ Scaffolding Changes
at all; configuration in the ``production.ini`` file which used to require
its ``error_catcher`` :term:`middleware` has been removed. Configuring
error catching / email sending is now the domain of the ``pyramid_exclog``
- package (see http://docs.pylonsproject.org/projects/pyramid_exclog/dev/).
+ package (see https://docs.pylonsproject.org/projects/pyramid_exclog/en/latest/).
- All scaffolds now send the ``cache_max_age`` parameter to the
``add_static_view`` method.