summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-09-06 00:46:57 -0400
committerChris McDonough <chrism@plope.com>2013-09-06 00:46:57 -0400
commit90b9686a20e6465b9a97ce02e4d10080c0cf271e (patch)
tree1d8213cd4187a9f4c170d02be5db79fcf9de645c /CHANGES.txt
parentf7d60e437bec1d8a63d477732c0058f3e4ebb697 (diff)
parentfbdc3a01842e9067478dbf95ba8cde4e31bbb174 (diff)
downloadpyramid-90b9686a20e6465b9a97ce02e4d10080c0cf271e.tar.gz
pyramid-90b9686a20e6465b9a97ce02e4d10080c0cf271e.tar.bz2
pyramid-90b9686a20e6465b9a97ce02e4d10080c0cf271e.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt9
1 files changed, 4 insertions, 5 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 7d06999d6..6392c7b3b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,11 +10,10 @@ Backwards Incompatibilities
- ``request.response`` will no longer be mutated when using the
``pyramid.renderers.render()`` API. Almost all renderers mutate the
- ``request.response`` response object (for
- example, the JSON renderer sets ``request.response.content_type`` to
- ``application/json``), but this is only necessary when the renderer
- is called by the view execution machinery; it was a bug when it was
- done as a side effect of calling ``pyramid.renderers.render()``.
+ ``request.response`` response object (for example, the JSON renderer sets
+ ``request.response.content_type`` to ``application/json``), but this is
+ only necessary when the renderer is generating a response; it was a bug
+ when it was done as a side effect of calling ``pyramid.renderers.render()``.
1.5a1 (2013-08-30)
==================