summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-12-15 02:24:59 -0500
committerChris McDonough <chrism@plope.com>2010-12-15 02:24:59 -0500
commitec88337c99e84ba17a45a1f6695f6174da4a9172 (patch)
treeb21b0d1257cce7f858a8258b47de37d78c5bbfa7
parentd35d6541de892df3a91208adeb42b2e40322ea50 (diff)
downloadpyramid-ec88337c99e84ba17a45a1f6695f6174da4a9172.tar.gz
pyramid-ec88337c99e84ba17a45a1f6695f6174da4a9172.tar.bz2
pyramid-ec88337c99e84ba17a45a1f6695f6174da4a9172.zip
prep for 1.0a5
-rw-r--r--CHANGES.txt8
-rw-r--r--docs/conf.py2
-rw-r--r--setup.py2
3 files changed, 8 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index be2bd2b5f..a12b8bcd8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.0a5 (2010-12-14)
+==================
Features
--------
@@ -69,6 +69,10 @@ Bug Fixes
Documentation
-------------
+- Merged many wording, readability, and correctness changes to narrative
+ documentation chapters from https://github.com/caseman/pyramid (up to and
+ including "Models" narrative chapter).
+
- "Sample Applications" section of docs changed to note existence of Cluegun,
Shootout and Virginia sample applications, ported from their repoze.bfg
origin packages.
diff --git a/docs/conf.py b/docs/conf.py
index 6ef9ff67b..11727f16b 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.0a4'
+version = '1.0a5'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index 75f5b13dd..f66677337 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
#
##############################################################################
-__version__ = '0.0'
+__version__ = '1.0a5'
import os
import platform