summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt4
-rw-r--r--README.rst3
-rw-r--r--docs/conf.py2
-rw-r--r--setup.py2
4 files changed, 5 insertions, 6 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index b06a972ef..443f9ca4c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.2a5 (2011-09-04)
+==================
Bug Fixes
---------
diff --git a/README.rst b/README.rst
index 895c5bb07..4d427a13d 100644
--- a/README.rst
+++ b/README.rst
@@ -5,8 +5,7 @@ Pyramid is a small, fast, down-to-earth, open source Python web application
development framework. It makes real-world web application development and
deployment more fun, more predictable, and more productive.
-Pyramid is the newest web framework produced by the `Pylons Project
-<http://pylonsproject.org/>`_.
+Pyramid is produced by the `Pylons Project <http://pylonsproject.org/>`_.
Support and Documentation
-------------------------
diff --git a/docs/conf.py b/docs/conf.py
index e350ca21f..735159aa4 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.2a4'
+version = '1.2a5'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index 18260b992..bc5b47020 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.2a4',
+ version='1.2a5',
description=('The Pyramid web application development framework, a '
'Pylons project'),
long_description=README + '\n\n' + CHANGES,