summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2017-01-15 21:38:47 -0600
committerMichael Merickel <michael@merickel.org>2017-01-15 21:38:47 -0600
commite82f3d1f30eae5f6b8b0c490cc404e973f512d2f (patch)
tree1f6e3a9dbce19e2043fee6d6921b5b8289f6f7f4
parent17ee4dc30b9576b516ee3a5fd9db0c5f21fe9126 (diff)
downloadpyramid-e82f3d1f30eae5f6b8b0c490cc404e973f512d2f.tar.gz
pyramid-e82f3d1f30eae5f6b8b0c490cc404e973f512d2f.tar.bz2
pyramid-e82f3d1f30eae5f6b8b0c490cc404e973f512d2f.zip
changelog cleanups
-rw-r--r--CHANGES.txt16
-rw-r--r--docs/whatsnew-1.8.rst8
2 files changed, 16 insertions, 8 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 3b849a49b..261d45a13 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,16 @@ Documentation Changes
- Improve registry documentation to discuss uses as a component registry
and as a dictionary. See https://github.com/Pylons/pyramid/pull/2893
+- Quick Ttutorial and most other remaining documentation updated to use
+ cookiecutters instead of pcreate and scaffolds.
+ See https://github.com/Pylons/pyramid/pull/2889
+
+- Fix unittests in wiki2 to work without different dependencies between
+ py2 and py3. See https://github.com/Pylons/pyramid/pull/2899
+
+- Update Windows documentation to track newer Python 3 improvements to the
+ installer. See https://github.com/Pylons/pyramid/pull/2900
+
1.8a1 (2016-12-25)
==================
@@ -268,7 +278,5 @@ Documentation Changes
- Improve output of p* script descriptions for help.
See https://github.com/Pylons/pyramid/pull/2886
-- Quick Tour, Quick Tutorial, and most files throughout the documentation have
- been updated to use cookiecutters instead of pcreate and scaffolds.
- See https://github.com/Pylons/pyramid/pull/2888 and
- https://github.com/Pylons/pyramid/pull/2889
+- Quick Tour updated to use cookiecutters instead of pcreate and scaffolds.
+ See https://github.com/Pylons/pyramid/pull/2888
diff --git a/docs/whatsnew-1.8.rst b/docs/whatsnew-1.8.rst
index 908c17ec4..ece26f8d1 100644
--- a/docs/whatsnew-1.8.rst
+++ b/docs/whatsnew-1.8.rst
@@ -73,6 +73,10 @@ Minor Feature Additions
exception - the pipeline can be optimized at config-time.
See https://github.com/Pylons/pyramid/pull/2660
+- ``pcreate`` learned about ``--package-name`` to allow you to create a new
+ project in an existing folder with a different package name than the project
+ name. See https://github.com/Pylons/pyramid/pull/2783
+
- ``pserve`` should now work with ``gevent`` and other workers that need
to monkeypatch the process, assuming the server and / or the app do so
as soon as possible before importing the rest of pyramid.
@@ -129,10 +133,6 @@ Backwards Incompatibilities
encoding via ``Accept-Encoding`` request headers.
See https://github.com/Pylons/pyramid/pull/2810
-- ``pcreate`` learned about ``--package-name`` to allow you to create a new
- project in an existing folder with a different package name than the project
- name. See https://github.com/Pylons/pyramid/pull/2783
-
- ``pcreate`` is now interactive by default. You will be prompted if a file
already exists with different content. Previously if there were similar
files it would silently skip them unless you specified ``--interactive``