Merge branch 'master' of git://github.com/Pylons/pyramid

1 files changed, 14 insertions, 6 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 266353b6e..aa2b0bcbd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -76,6 +76,12 @@ Features (delta from BFG 1.3.X)
   ``webob.Response`` (old code need not change to use this facade, it's
   existence is mostly for vanity and documentation-generation purposes).
 
+- All preexisting paster templates (except ``zodb``) now use "imperative"
+  configuration (``starter``, ``routesalchemy``, ``alchemy``).
+
+- A new paster template named ``pyramid_starter_zcml`` exists, which uses
+  declarative configuration.
+
 Documentation (delta from BFG 1.3)
 -----------------------------------
 
@@ -169,9 +175,11 @@ Backwards Incompatibilities (with BFG 1.3.X)
   ``pyramid.authentication.AuthTktAuthenticationPolicy`` constructor now
   defaults to ``auth_tkt`` (it used to default to ``repoze.bfg.auth_tkt``).
 
-- All preexisting paster templates (except ``zodb``) now use "imperative"
-  configuration (``starter``, ``routesalchemy``, ``alchemy``).
-
-- A new paster template named ``pyramid_starter_zcml`` exists, which uses
-  declarative configuration.
-
+- The ``request_type`` argument to the ``view`` ZCML directive, the
+  ``pyramid.configuration.Configurator.add_view`` method, or the
+  ``pyramid.view.view_config`` decorator (nee ``bfg_view``) is no longer
+  permitted to be one of the strings ``GET``, ``HEAD``, ``PUT``, ``POST`` or
+  ``DELETE``, and now must always be an interface.  Accepting the
+  method-strings as ``request_type`` was a backwards compatibility strategy
+  servicing repoze.bfg 1.0 applications.  Use the ``request_method``
+  parameter instead to specify that a view a string request-method predicate.