summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2014-04-08 17:20:32 -0400
committerChris McDonough <chrism@plope.com>2014-04-08 17:20:32 -0400
commit610b85ab54452568728fc6390e6cd18670036ba2 (patch)
treecbb2691826fbe47bb8c6fca791c6c31604326d80
parentaef68bf93127265134ebf63dca0403cf9c1955a8 (diff)
downloadpyramid-610b85ab54452568728fc6390e6cd18670036ba2.tar.gz
pyramid-610b85ab54452568728fc6390e6cd18670036ba2.tar.bz2
pyramid-610b85ab54452568728fc6390e6cd18670036ba2.zip
fix typo and update whatsnew
-rw-r--r--CHANGES.txt2
-rw-r--r--docs/whatsnew-1.5.rst3
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 0e452d011..2e3996b3e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,7 @@
Unreleased
==========
-- Avoid crash in ``pserve --reload`` under Py3k, when iterating over posiibly
+- Avoid crash in ``pserve --reload`` under Py3k, when iterating over possibly
mutated ``sys.modules``.
- ``UnencryptedCookieSessionFactoryConfig`` failed if the secret contained
diff --git a/docs/whatsnew-1.5.rst b/docs/whatsnew-1.5.rst
index 2f73af661..65e8393f8 100644
--- a/docs/whatsnew-1.5.rst
+++ b/docs/whatsnew-1.5.rst
@@ -511,6 +511,9 @@ Scaffolding Enhancements
- All scaffolds have a new HTML + CSS theme.
+- Updated docs and scaffolds to keep in step with new 2.0 release of
+ ``Lingua``. This included removing all ``setup.cfg`` files from scaffolds
+ and documentation environments.
Dependency Changes
------------------