Merge branch 'feature.instance-properties' of git://github.com/mmerickel/pyramid into mmerickel-feature.instance-properties

1 files changed, 19 insertions, 5 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index f02925585..b2f37355b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -64,13 +64,17 @@ Features
   HEAD is a variant of GET that omits the body, and WebOb has special support
   to return an empty body when a HEAD is used.
 
-- ``config.set_request_property`` now causes less code to be executed at
-  request construction time.
-
-- Don't add a ``?`` to URLs generated by request.resource_url if the
+- ``config.set_request_method`` has been introduced to support extending
+  request objects with arbitrary callables. This method expands on the
+  previous ``config.set_request_property`` by supporting methods as well as
+  properties. This method now causes less code to be executed at
+  request construction time than ``config.set_request_property`` in
+  version 1.3.
+
+- Don't add a ``?`` to URLs generated by ``request.resource_url`` if the
   ``query`` argument is provided but empty.
 
-- Don't add a ``?`` to URLs generated by request.route_url if the
+- Don't add a ``?`` to URLs generated by ``request.route_url`` if the
   ``_query`` argument is provided but empty.
 
 - The static view machinery now raises (rather than returns) ``HTTPNotFound``
@@ -100,3 +104,13 @@ Features
 
       config = Configurator()
       config.add_permission('view')
+
+Deprecations
+------------
+
+- The documentation for
+  ``pyramid.config.Configurator.set_request_property`` has been removed.
+  The method remains usable but the more featureful
+  ``pyramid.config.Configurator.set_request_method`` should be used in its
+  place. It has all of the same capabilities but can also extend the
+  request object with methods.