summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2017-05-01 21:54:55 -0500
committerMichael Merickel <michael@merickel.org>2017-05-01 21:54:55 -0500
commit7850884719c94c0721748b5458504cb8a9d242c8 (patch)
tree2c7a9eabd7c47af8db38e8ee6b5868b91ee5c109
parent8f3c93cbaf0c1ee9aa6810d9229a0290ea63e41e (diff)
downloadpyramid-7850884719c94c0721748b5458504cb8a9d242c8.tar.gz
pyramid-7850884719c94c0721748b5458504cb8a9d242c8.tar.bz2
pyramid-7850884719c94c0721748b5458504cb8a9d242c8.zip
add changelog for #2993
-rw-r--r--CHANGES.txt6
-rw-r--r--docs/whatsnew-1.9.rst6
2 files changed, 12 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index a6cac805f..70a2ff922 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -113,3 +113,9 @@ Deprecations
See https://github.com/Pylons/pyramid/pull/2854 and
https://github.com/Pylons/pyramid/pull/3019
+
+Documentation Changes
+---------------------
+
+- Added the execution policy to the routing diagram in the Request Processing
+ chatper. See https://github.com/Pylons/pyramid/pull/2993
diff --git a/docs/whatsnew-1.9.rst b/docs/whatsnew-1.9.rst
index dd5ab894d..e57ed254d 100644
--- a/docs/whatsnew-1.9.rst
+++ b/docs/whatsnew-1.9.rst
@@ -47,3 +47,9 @@ Deprecations
See https://github.com/Pylons/pyramid/pull/2854 and
https://github.com/Pylons/pyramid/pull/3019
+
+Documentation Enhancements
+--------------------------
+
+- Added the :term:`execution policy` to the routing diagram in
+ :ref:`router_chapter`. See https://github.com/Pylons/pyramid/pull/2993