summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-09-19 03:30:25 -0400
committerChris McDonough <chrism@plope.com>2012-09-19 03:30:25 -0400
commitc5680bbd7850c917ba1f1f68134ff4c8d3c37246 (patch)
tree9d9cfa7d63a975a048eda4f96ba6c28af4dfd8bb /docs
parent68c00de2f71f95571c1876d024c9ad5d4dfeec2c (diff)
parent0436567f2f4bd92e9769890befc77aae54d5ea36 (diff)
downloadpyramid-c5680bbd7850c917ba1f1f68134ff4c8d3c37246.tar.gz
pyramid-c5680bbd7850c917ba1f1f68134ff4c8d3c37246.tar.bz2
pyramid-c5680bbd7850c917ba1f1f68134ff4c8d3c37246.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs')
-rw-r--r--docs/whatsnew-1.4.rst14
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/whatsnew-1.4.rst b/docs/whatsnew-1.4.rst
index fc25c415e..76320f6e6 100644
--- a/docs/whatsnew-1.4.rst
+++ b/docs/whatsnew-1.4.rst
@@ -94,10 +94,10 @@ Minor Feature Additions
- :meth:`pyramid.config.Configurator.add_request_method` has been introduced
to support extending request objects with arbitrary callables. This method
- expands on the previous
+ expands on the now documentation-deprecated
:meth:`pyramid.config.Configurator.set_request_property` by supporting
- methods as well as properties. This method causes less code to be executed
- at request construction time than
+ methods as well as properties. This method also causes less code to be
+ executed at request construction time than
:meth:`~pyramid.config.Configurator.set_request_property`.
- The static view machinery now raises rather than returns
@@ -133,13 +133,13 @@ Minor Feature Additions
``pyramid.util.InstancePropertyMixin`` class such as ``set_property``.
- Request properties and methods added via
- :meth:`pyramid.config.Configurator.set_request_property` or
- :meth:`pyramid.config.Configurator.add_request_method` are now available to
+ :meth:`pyramid.config.Configurator.add_request_method` or
+ :meth:`pyramid.config.Configurator.set_request_property` are now available to
tweens.
- Request properties and methods added via
- :meth:`pyramid.config.Configurator.set_request_property` or
- :meth:`pyramid.config.Configurator.add_request_method` are now available
+ :meth:`pyramid.config.Configurator.add_request_method` or
+ :meth:`pyramid.config.Configurator.set_request_property` are now available
in the request object returned from :func:`pyramid.paster.bootstrap`.
- ``request.context`` of environment request during