summaryrefslogtreecommitdiff
path: root/docs/whatsnew-1.7.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-12-13 13:13:47 -0800
committerSteve Piercy <web@stevepiercy.com>2016-12-13 13:13:47 -0800
commit9bbed79e04378d6534c07d73ab801191f0489e88 (patch)
tree6ec01ee3cb5389cd0cbe8234280bf4408123659d /docs/whatsnew-1.7.rst
parent4393f8b8e54e636b5655e0a8d2477e0b15820f68 (diff)
parent884bcdc628e7144abf8e1cd1cde1ed3019e7e699 (diff)
downloadpyramid-9bbed79e04378d6534c07d73ab801191f0489e88.tar.gz
pyramid-9bbed79e04378d6534c07d73ab801191f0489e88.tar.bz2
pyramid-9bbed79e04378d6534c07d73ab801191f0489e88.zip
Merge remote-tracking branch 'upstream/pcreate-to-cookiecutter' into pcreate-to-cookiecutter
Diffstat (limited to 'docs/whatsnew-1.7.rst')
-rw-r--r--docs/whatsnew-1.7.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/whatsnew-1.7.rst b/docs/whatsnew-1.7.rst
index 398b12f01..c5f611f04 100644
--- a/docs/whatsnew-1.7.rst
+++ b/docs/whatsnew-1.7.rst
@@ -126,7 +126,7 @@ Feature Additions
- The :attr:`pyramid.tweens.EXCVIEW` tween will now re-raise the original
exception if no exception view could be found to handle it. This allows
- the exception to be handled upstream by another tween or middelware.
+ the exception to be handled upstream by another tween or middleware.
See https://github.com/Pylons/pyramid/pull/2567
Deprecations