From a7e0e601df4e093ebd2fdd7b53bd0bbb9e8d7ce5 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Mon, 10 Dec 2012 15:46:57 -0500
Subject: prep for 1.4b2

---
 CHANGES.txt  | 11 +++++++++--
 docs/conf.py |  2 +-
 setup.py     |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9d3a017ab..e7c6e2b24 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,12 @@
-next release
-============
+1.4b2 (2012-12-10)
+==================
+
+Docs
+----
+
+- Scaffolding is now PEP-8 compliant (at least for a brief shining moment).
+
+- Tutorial improvements.
 
 Backwards Incompatibilities
 ---------------------------
diff --git a/docs/conf.py b/docs/conf.py
index 3dc09d95d..63f3a2790 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -81,7 +81,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '1.4b1'
+version = '1.4b2'
 
 # The full version, including alpha/beta/rc tags.
 release = version
diff --git a/setup.py b/setup.py
index 55da3378d..2183fcbb1 100644
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ testing_extras = tests_require + [
     ]
 
 setup(name='pyramid',
-      version='1.4b1',
+      version='1.4b2',
       description=('The Pyramid web application development framework, a '
                    'Pylons project'),
       long_description=README + '\n\n' +  CHANGES,
-- 
cgit v1.2.3