summaryrefslogtreecommitdiff
path: root/docs/whatsnew-1.7.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-12-13 12:54:42 -0800
committerGitHub <noreply@github.com>2016-12-13 12:54:42 -0800
commit884bcdc628e7144abf8e1cd1cde1ed3019e7e699 (patch)
tree98869f62e927311cb52bb8c2fde3a01fd8a4f45d /docs/whatsnew-1.7.rst
parent760cf2c1c6b0e5e098528d9229809a46c0a9d24d (diff)
parent6421f4c7559205e125a1c7218f711d6f6ecaf85c (diff)
downloadpyramid-884bcdc628e7144abf8e1cd1cde1ed3019e7e699.tar.gz
pyramid-884bcdc628e7144abf8e1cd1cde1ed3019e7e699.tar.bz2
pyramid-884bcdc628e7144abf8e1cd1cde1ed3019e7e699.zip
Merge branch 'master' 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