Merge branch '1.3-branch'

1 files changed, 42 insertions, 0 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index c979c4dc1..63c84d0f8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,12 +4,42 @@ Next release
 Features
 --------
 
+- Added a ``prequest`` script (along the lines of ``paster request``).  It is
+  documented in the "Command-Line Pyramid" chapter in the section entitled
+  "Invoking a Request".
+
+Bug Fixes
+---------
+
+- Normalized exit values and ``-h`` output for all ``p*`` scripts
+  (``pviews``, ``proutes``, etc).
+
+Documentation
+-------------
+
+- Added a section named "Making Your Script into a Console Script" in the
+  "Command-Line Pyramid" chapter.
+
+1.3a2 (2011-12-14)
+==================
+
+Features
+--------
+
 - New API: ``pyramid.view.view_defaults``. If you use a class as a view, you
   can use the new ``view_defaults`` class decorator on the class to provide
   defaults to the view configuration information used by every
   ``@view_config`` decorator that decorates a method of that class.  It also
   works against view configurations involving a class made imperatively.
 
+- Added a backwards compatibility knob to ``pcreate`` to emulate ``paster
+  create`` handling for the ``--list-templates`` option.
+
+- Changed scaffolding machinery around a bit to make it easier for people who
+  want to have extension scaffolds that can work across Pyramid 1.0.X, 1.1.X,
+  1.2.X and 1.3.X.  See the new "Creating Pyramid Scaffolds" chapter in the
+  narrative documentation for more info.
+
 Documentation
 -------------
 
@@ -18,6 +48,18 @@ Documentation
 
 - Added API docs for ``view_defaults`` class decorator.
 
+- Added an API docs chapter for ``pyramid.scaffolds``.
+
+- Added a narrative docs chapter named "Creating Pyramid Scaffolds".
+
+Backwards Incompatibilities
+---------------------------
+
+- The ``template_renderer`` method of ``pyramid.scaffolds.PyramidScaffold``
+  was renamed to ``render_template``.  If you were overriding it, you're a
+  bad person, because it wasn't an API before now.  But we're nice so we're
+  letting you know.
+
 1.3a1 (2011-12-09)
 ==================