prep for 1.0a10

3 files changed, 17 insertions, 16 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 0cce2e28e..71982e78b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.0a10 (2011-01-18)
+===================
 
 Bug Fixes
 ---------
@@ -13,16 +13,20 @@ Backwards Incompatibilities
 - The ``add_handler`` method of a Configurator has been removed from the
   Pyramid core.  Handlers are now a feature of the ``pyramid_handlers``
   package, which can be downloaded from PyPI.  Documentation for the package
-  should be available via http://pylonsproject.org, which describes how to
-  get this method back after depending upon ``pyramid_handlers`` as an
-  ``install_requires`` dependency.
+  should be available via
+  http://pylonsproject.org/projects/pyramid_handlers/dev, which describes how
+  to add a configuration statement to your ``main`` block to reobtain this
+  method.  You will also need to add an ``install_requires`` dependency upon
+  ``pyramid_handlers`` to your ``setup.py`` file.
 
 - The ``load_zcml`` method of a Configurator has been removed from the
   Pyramid core.  Loading ZCML is now a feature of the ``pyramid_zcml``
   package, which can be downloaded from PyPI.  Documentation for the package
-  should be available via http://pylonsproject.org, which describes how to
-  get this method back after depending upon ``pyramid_zcml`` as an
-  ``install_requires`` dependency.
+  should be available via
+  http://pylonsproject.org/projects/pyramid_zcml/dev, which describes how
+  to add a configuration statement to your ``main`` block to reobtain this
+  method.  You will also need to add an ``install_requires`` dependency upon
+  ``pyramid_zcml`` to your ``setup.py`` file.
 
 - The ``pyramid.includes`` subpackage has been removed.  ZCML files which use
   include the package ``pyramid.includes`` (e.g. ``<include
@@ -49,9 +53,6 @@ Backwards Incompatibilities
   ``**settings`` passed to a Pyramid ``main`` function) has ceased to have any
   meaning.
 
-- The ``starter_zcml`` paster template has been moved to the ``pyramid_zcml``
-  package.
-
 Features
 --------
 
@@ -86,6 +87,9 @@ Paster Templates
   ``pyramid.testing.tearDown`` rather than creating a Configurator "by hand"
   within their ``tests.py`` module, as per decision in features above.
 
+- The ``starter_zcml`` paster template has been moved to the ``pyramid_zcml``
+  package.
+
 Documentation
 -------------
 
diff --git a/docs/conf.py b/docs/conf.py
index aa7cb7d1e..dce4ef879 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -77,7 +77,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '1.0a9'
+version = '1.0a10'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/setup.py b/setup.py
index 587e1bb1f..6aefeb482 100644
--- a/setup.py
+++ b/setup.py
@@ -12,8 +12,6 @@
 #
 ##############################################################################
 
-__version__ = '0.0'
-
 import os
 import platform
 import sys
@@ -54,7 +52,7 @@ if sys.version_info[:2] < (2, 6):
     install_requires.append('simplejson')
     
 setup(name='pyramid',
-      version=__version__,
+      version='1.0a10',
       description='The Pyramid web application framework, a Pylons project',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[
@@ -79,7 +77,6 @@ setup(name='pyramid',
       entry_points = """\
         [paste.paster_create_template]
         pyramid_starter=pyramid.paster:StarterProjectTemplate
-        pyramid_starter_zcml=pyramid.paster:StarterZCMLProjectTemplate
         pyramid_zodb=pyramid.paster:ZODBProjectTemplate
         pyramid_routesalchemy=pyramid.paster:RoutesAlchemyProjectTemplate
         pyramid_alchemy=pyramid.paster:AlchemyProjectTemplate