diff options
| author | Steve Piercy <web@stevepiercy.com> | 2016-12-19 20:58:42 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-19 20:58:42 -0800 |
| commit | d96e05ee8fd5c06ef4f2eddac6b1d24ed6d23eca (patch) | |
| tree | 3724cc871489184d50efecd9d284f7616ff529ef | |
| parent | 9edad55a25c6508d10e6b553c71923a4af0acbd7 (diff) | |
| parent | 8dbefbdc7a5ecb426d03aa1fbdbaa05eac0c07e2 (diff) | |
| download | pyramid-d96e05ee8fd5c06ef4f2eddac6b1d24ed6d23eca.tar.gz pyramid-d96e05ee8fd5c06ef4f2eddac6b1d24ed6d23eca.tar.bz2 pyramid-d96e05ee8fd5c06ef4f2eddac6b1d24ed6d23eca.zip | |
Merge pull request #2876 from stevepiercy/master
Correct change log entry
| -rw-r--r-- | CHANGES.txt | 2 | ||||
| -rw-r--r-- | docs/whatsnew-1.8.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index c7d40a37a..ac3989d35 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -180,7 +180,7 @@ Deprecations Documentation Changes --------------------- -- Replace Typographical Conventions with an enhanced Style Guide. +- Update Typographical Conventions and add a Style Guide. https://github.com/Pylons/pyramid/pull/2838 - Add `pyramid_nacl_session diff --git a/docs/whatsnew-1.8.rst b/docs/whatsnew-1.8.rst index 1a5938327..20261e704 100644 --- a/docs/whatsnew-1.8.rst +++ b/docs/whatsnew-1.8.rst @@ -158,7 +158,7 @@ Scaffolding Enhancements Documentation Enhancements -------------------------- -- Replace Typographical Conventions with an enhanced Style Guide. +- Update Typographical Conventions and add a Style Guide. https://github.com/Pylons/pyramid/pull/2838 - Add `pyramid_nacl_session |