prep for 1.0a4

3 files changed, 10 insertions, 9 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index aee0fae2f..84b103e65 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.0a4 (2010-11-21)
+==================
 
 Features
 --------
@@ -8,10 +8,11 @@ Features
   in the pattern, instead of immediately following a ``/``.
 
 - URL Dispatch now uses the form ``{marker}`` to denote a replace marker in
-  the route pattern instead of ``:marker``. The old syntax is still backwards
-  compatible and accepted. The new format allows a regular expression for that
-  marker location to be used instead of the default ``[^/]+``, for example
-  ``{marker:\d+}`` is now valid to require the marker to be digits.
+  the route pattern instead of ``:marker``. The old colon-style marker syntax
+  is still accepted for backwards compatibility. The new format allows a
+  regular expression for that marker location to be used instead of the
+  default ``[^/]+``, for example ``{marker:\d+}`` is now valid to require the
+  marker to be digits.
 
 - Add a ``pyramid.url.route_path`` API, allowing folks to generate relative
   URLs.  Calling ``route_path`` is the same as calling
@@ -62,7 +63,7 @@ Bug Fixes
   ASCII string rather than being passed along to downstream code as a
   convenience to the user and to prevent puzzling second-order failures from
   cropping up (all failures will occur within ``pyramid.traversal.traverse``
-  rather than later down the line as the result of calling
+  rather than later down the line as the result of calling e.g.
   ``traversal_path``).
 
 Backwards Incompatibilities
diff --git a/docs/conf.py b/docs/conf.py
index 81096da3b..e520c9d82 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -76,7 +76,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '1.0a3'
+version = '1.0a4'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/setup.py b/setup.py
index c1939f73c..29f4ddce6 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
 #
 ##############################################################################
 
-__version__ = '0.0'
+__version__ = '1.0a4'
 
 import os
 import platform