summaryrefslogtreecommitdiff
path: root/docs/whatsnew-1.2.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-12-01 02:07:34 -0500
committerChris McDonough <chrism@plope.com>2011-12-01 02:07:34 -0500
commit65fb3b371d63f59fa94ec2b5a431894eb78060be (patch)
tree904cd78e577d5d79f5929ef218875a8e76d82c09 /docs/whatsnew-1.2.rst
parent2cab221bedf454629bf2f1e30c0f9d91cf57d455 (diff)
parent5febb767172726740f8adea6d04a19ba1cdb8b64 (diff)
downloadpyramid-65fb3b371d63f59fa94ec2b5a431894eb78060be.tar.gz
pyramid-65fb3b371d63f59fa94ec2b5a431894eb78060be.tar.bz2
pyramid-65fb3b371d63f59fa94ec2b5a431894eb78060be.zip
Merge branch 'master' of github.com:Pylons/pyramid
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 49854a7e7..ea56cf52d 100644
--- a/docs/whatsnew-1.2.rst
+++ b/docs/whatsnew-1.2.rst
@@ -63,7 +63,7 @@ Scaffolding Changes
package at all; configuration in the ``production.ini`` file which used to
require its ``error_catcher`` middleware has been removed. Configuring
error catching / email sending is now the domain of the ``pyramid_exclog``
- package (see https://docs.pylonsproject.org/projects/pyramid_exclog/dev/).
+ package (see http://docs.pylonsproject.org/projects/pyramid_exclog/dev/).
- All scaffolds now send the ``cache_max_age`` parameter to the
``add_static_view`` method.