summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt6
-rw-r--r--docs/conf.py2
-rw-r--r--setup.py2
3 files changed, 5 insertions, 5 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index b0e117545..6bea699dd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.2b3 (2010-01-24)
+==================
Bug Fixes
---------
@@ -8,7 +8,7 @@ Bug Fixes
default to finding route-related views even if a non-route-related
view registration has been made with a more specific context. The
default used to be to find views with a more specific context first.
- Use the ``use_global_views`` argument to the route configuration to
+ Use the new ``use_global_views`` argument to the route definition to
get back the older behavior.
Features
diff --git a/docs/conf.py b/docs/conf.py
index b2c88480f..033b051cc 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -53,7 +53,7 @@ copyright = '2008-2010, Agendaless Consulting'
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.2b2'
+version = '1.2b3'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index 1a0eaa4ae..7647526a4 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
#
##############################################################################
-__version__ = '1.2b2'
+__version__ = '1.2b3'
import os
import sys