summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-12-24 13:03:16 -0800
committerGitHub <noreply@github.com>2016-12-24 13:03:16 -0800
commit086f760c28497282fa9b4d25cc1cd7d1ab4fde91 (patch)
tree5f2e7cc40c3e2c3b0e2f86af21784adf5607d8b2 /docs
parent4ccf364c4d3b05af458b70f5306e84cac4919299 (diff)
parent85b301a5355e7b9373d9381ee75fc6233915cea1 (diff)
downloadpyramid-086f760c28497282fa9b4d25cc1cd7d1ab4fde91.tar.gz
pyramid-086f760c28497282fa9b4d25cc1cd7d1ab4fde91.tar.bz2
pyramid-086f760c28497282fa9b4d25cc1cd7d1ab4fde91.zip
Merge pull request #2887 from stevepiercy/master
remove Style Guide from changelog and whatsnew
Diffstat (limited to 'docs')
-rw-r--r--docs/whatsnew-1.8.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/whatsnew-1.8.rst b/docs/whatsnew-1.8.rst
index 9f55ad60a..9ec3bb23c 100644
--- a/docs/whatsnew-1.8.rst
+++ b/docs/whatsnew-1.8.rst
@@ -180,7 +180,7 @@ Deprecations
Documentation Enhancements
--------------------------
-- Update Typographical Conventions and add a Style Guide.
+- Update Typographical Conventions.
https://github.com/Pylons/pyramid/pull/2838
- Add `pyramid_nacl_session