deprecate Configurator, add Config

1 files changed, 19 insertions, 0 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 6f8ec355b..dddfecaf7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,22 @@
+Twophase branch
+===============
+
+- ``pyramid.configuration.Config`` was added.  It has the same API as the old
+  ``Configurator`` which it means to replace, except by default it is a
+  *non-autocommitting* configurator.  It also has a new API method named
+  ``with_context`` (a classmethod).
+
+- ``pyramid.configuration.Configurator`` is now deprecated.  Use
+  ``pyramid.configuration.Config`` passing its constructor
+  ``autocommit=True`` instead.  The ``pyramid.configuration.Configurator``
+  alias will live for a long time, as every application uses it.
+
+- The ``pyramid.testing.setUp`` function now accepts an ``autocommit``
+  keyword argument, which defaults to ``True``.  If it is passed ``False``,
+  the Config object returned by ``setUp`` will be a non-autocommiting Config
+  object.
+
+
 Next release
 ============