summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-09-14 05:30:53 +0000
committerChris McDonough <chrism@agendaless.com>2009-09-14 05:30:53 +0000
commit7dbf3ffc6e3d27dbebe3b32ff6d4c97f6a81de92 (patch)
tree8c7bd3d6ceed8c51fbc9e7872f35045c75a6e494
parent7ee81e3c436b717a1011863a351f173a2af3184f (diff)
downloadpyramid-7dbf3ffc6e3d27dbebe3b32ff6d4c97f6a81de92.tar.gz
pyramid-7dbf3ffc6e3d27dbebe3b32ff6d4c97f6a81de92.tar.bz2
pyramid-7dbf3ffc6e3d27dbebe3b32ff6d4c97f6a81de92.zip
Prep for 1.1a2.
-rw-r--r--CHANGES.txt7
-rw-r--r--docs/conf.py4
-rw-r--r--setup.py2
3 files changed, 7 insertions, 6 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 65ed57635..26c180d9d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.1a2 (2009-09-14)
+==================
- A ZCML ``view`` directive (and the associated ``bfg_view``
decorator) can now accept an "attr" value. If an "attr" value is
@@ -13,7 +13,8 @@ Next release
decorator) can now accept a "template" value. If a "template" value
is supplied, and the view callable returns a dictionary, the
associated template is rendered with the dictionary as keyword
- arguments.
+ arguments. See the section named "Views That Have a ``template``"
+ in the "Views" narrative documentation chapter for more information.
1.1a1 (2009-09-06)
==================
diff --git a/docs/conf.py b/docs/conf.py
index 7a725998a..ded797549 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,9 +51,9 @@ copyright = '2008-2009, Agendaless Consulting'
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.1a1'
+version = '1.1a2'
# The full version, including alpha/beta/rc tags.
-release = '1.1a1'
+release = '1.1a2'
# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
diff --git a/setup.py b/setup.py
index 68c69330b..9dc45b174 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
#
##############################################################################
-__version__ = '1.1a1'
+__version__ = '1.1a2'
import os