summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt8
-rw-r--r--docs/conf.py2
-rw-r--r--setup.py2
3 files changed, 6 insertions, 6 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index bfe846065..52419c5a5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.0a2 (2010-11-09)
+==================
Documentation
-------------
@@ -9,8 +9,8 @@ Documentation
their concrete classes (e.g. ``pyramid.events.NewRequest``) in
documentation about making subscriptions.
-- All references to Pyramid-the-application were changed from :mod:`pyramid`
- to :app:`Pyramid`. A custom role setting was added to ``docs/conf.py`` to
+- All references to Pyramid-the-application were changed from mod-`pyramid`
+ to app-`Pyramid`. A custom role setting was added to ``docs/conf.py`` to
allow for this. (internal)
1.0a1 (2010-11-05)
diff --git a/docs/conf.py b/docs/conf.py
index f513cfbc4..c2ecb1e8d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -73,7 +73,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.0a1'
+version = '1.0a2'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index b220d2914..653167bad 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
#
##############################################################################
-__version__ = '0.0'
+__version__ = '1.0a2'
import os
import platform