From a66ae929a79a54f95a3786d9b95393a4fb8a8fc4 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Thu, 8 Sep 2011 17:45:20 -0400
Subject: Prep for 1.2b2; Closes #267

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

diff --git a/CHANGES.txt b/CHANGES.txt
index f7650f273..c62f0a34b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,21 @@
+1.2b2 (2011-09-08)
+==================
+
+Bug Fixes
+---------
+
+- The 1.2b1 tarball was a brownbag (particularly for Windows users) because
+  it contained filenames with stray quotation marks in inappropriate places.
+  We depend on ``setuptools-git`` to produce release tarballs, and when it
+  was run to produce the 1.2b1 tarball, it didn't yet cope well with files
+  present in git repositories with high-order characters in their filenames.
+
+Documentation
+-------------
+
+- Minor tweaks to the "Introduction" narrative chapter example app and
+  wording.
+
 1.2b1 (2011-09-08)
 ==================
 
diff --git a/docs/conf.py b/docs/conf.py
index cfbf6339f..4dad10a8c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -93,7 +93,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '1.2b1'
+version = '1.2b2'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/setup.py b/setup.py
index 83e0a8c6b..3254a8bda 100644
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@ if sys.version_info[:2] < (2, 6):
     install_requires.append('simplejson')
     
 setup(name='pyramid',
-      version='1.2b1',
+      version='1.2b2',
       description=('The Pyramid web application development framework, a '
                    'Pylons project'),
       long_description=README + '\n\n' +  CHANGES,
-- 
cgit v1.2.3