summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-11-26 00:16:00 -0800
committerGitHub <noreply@github.com>2016-11-26 00:16:00 -0800
commit08a026807782b05ba9b171803d2cd6876338e0fc (patch)
treede946167a9c3762e4952be31f6c4f203eee6550e /CHANGES.txt
parentc6b5b95223131b38e160ac728586aeef75b803f5 (diff)
parent5f5e757dadae19a0c69069733a139eaf217f3ddd (diff)
downloadpyramid-08a026807782b05ba9b171803d2cd6876338e0fc.tar.gz
pyramid-08a026807782b05ba9b171803d2cd6876338e0fc.tar.bz2
pyramid-08a026807782b05ba9b171803d2cd6876338e0fc.zip
Merge pull request #2839 from stevepiercy/style-guide
Add change note; minor updates to style guide
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 1939ad125..59f77368f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -115,6 +115,9 @@ Deprecations
Documentation Changes
---------------------
+- Replace Typographical Conventions with an enhanced Style Guide.
+ https://github.com/Pylons/pyramid/pull/2838
+
- Add pyramid_nacl_session to session factories.
See https://github.com/Pylons/pyramid/issues/2791