summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-28 11:12:04 -0500
committerChris McDonough <chrism@plope.com>2011-01-28 11:12:04 -0500
commitc61cd1070614fd88f217359ddca448773266edd8 (patch)
tree0baf14088c785823109687257599c5a86bb4fe5e
parentb6ceaf60f307ad3204d125e28ddb15a454f9c103 (diff)
downloadpyramid-c61cd1070614fd88f217359ddca448773266edd8.tar.gz
pyramid-c61cd1070614fd88f217359ddca448773266edd8.tar.bz2
pyramid-c61cd1070614fd88f217359ddca448773266edd8.zip
prep for 1.0b3
-rw-r--r--CHANGES.txt6
-rw-r--r--docs/conf.py2
-rw-r--r--setup.py2
3 files changed, 6 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 68e83ea08..b26f54e6d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.0b3 (2011-01-28)
+==================
Bug Fixes
---------
@@ -17,6 +17,8 @@ Documentation
- Beef up documentation related to ``set_default_permission``: explicitly
mention that default permissions also protect exception views.
+- Paster templates and tutorials now use tabs instead of spaces in their HTML
+ templates.
1.0b2 (2011-01-24)
==================
diff --git a/docs/conf.py b/docs/conf.py
index fe28bacdf..d623a6323 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.0b2'
+version = '1.0b3'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index d15937a22..1f3fa25d8 100644
--- a/setup.py
+++ b/setup.py
@@ -53,7 +53,7 @@ if sys.version_info[:2] < (2, 6):
install_requires.append('simplejson')
setup(name='pyramid',
- version='1.0b2',
+ version='1.0b3',
description='The Pyramid web application framework, a Pylons project',
long_description=README + '\n\n' + CHANGES,
classifiers=[