Merge https://github.com/Pylons/pyramid

1 files changed, 43 insertions, 5 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 67562fbd6..71982e78b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.0a10 (2011-01-18)
+===================
 
 Bug Fixes
 ---------
@@ -13,9 +13,25 @@ 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/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
+  package="pyramid.includes"/>``) now must include the ``pyramid_zcml``
+  package instead (e.g. ``<include package="pyramid_zcml"/>``).
 
 - The ``pyramid.view.action`` decorator has been removed from the Pyramid
   core.  Handlers are now a feature of the ``pyramid_handlers`` package.  It
@@ -29,6 +45,14 @@ Backwards Incompatibilities
   templates were removed.  Use ``pyramid_sqla`` (available from PyPI) as a
   generic replacement for Pylons-esque development.
 
+- The ``make_app`` function has been removed from the ``pyramid.router``
+  module.  It continues life within the ``pyramid_zcml`` package.  This
+  leaves the ``pyramid.router`` module without any API functions.
+
+- The ``configure_zcml`` setting within the deployment settings (within
+  ``**settings`` passed to a Pyramid ``main`` function) has ceased to have any
+  meaning.
+
 Features
 --------
 
@@ -51,6 +75,11 @@ Features
   ``config.include('some.module.somefunc')`` as long as the include function
   within ``some.module`` is named ``includeme``.
 
+- The ``bfg2pyramid`` script now converts ZCML include tags that have
+  ``repoze.bfg.includes`` as a package attribute to the value
+  ``pyramid_zcml``.  For example, ``<include package="repoze.bfg.includes">``
+  will be converted to ``<include package="pyramid_zcml">``.
+
 Paster Templates
 ----------------
 
@@ -58,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
 -------------
 
@@ -72,6 +104,12 @@ Documentation
 - Document the ``request.override_renderer`` attribute within the narrative
   "Renderers" chapter in a section named "Overriding A Renderer at Runtime".
 
+- The "Declarative Configuration" narrative chapter has been removed (it was
+  moved to the ``pyramid_zcml`` package).
+
+- Most references to ZCML in narrative chapters have been removed or
+  redirected to ``pyramid_zcml`` locations.
+
 Deprecations
 ------------