summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-06-21 02:18:55 -0400
committerChris McDonough <chrism@plope.com>2011-06-21 02:18:55 -0400
commit3e5d71ed0fc4c5ae9f2678ca9ebe5a13b37644d2 (patch)
tree0066e1904d5ea81ffd40657c3703450e31295826
parentc724f039d58f2c126594b7a644a0de1b97e17910 (diff)
parent654e3da9d426cdb70426f1eb2a0fce0181934b41 (diff)
downloadpyramid-3e5d71ed0fc4c5ae9f2678ca9ebe5a13b37644d2.tar.gz
pyramid-3e5d71ed0fc4c5ae9f2678ca9ebe5a13b37644d2.tar.bz2
pyramid-3e5d71ed0fc4c5ae9f2678ca9ebe5a13b37644d2.zip
Merge branch 'master' of github.com:Pylons/pyramid
-rw-r--r--docs/whatsnew-1.1.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/whatsnew-1.1.rst b/docs/whatsnew-1.1.rst
index f5a8f88a4..b57657d11 100644
--- a/docs/whatsnew-1.1.rst
+++ b/docs/whatsnew-1.1.rst
@@ -40,8 +40,8 @@ The major feature additions in Pyramid 1.1 are:
- A new paster command named ``paster pviews`` was added. This command
prints a summary of potentially matching views for a given path. See
- documentation the section entitled :ref:`displaying_matching_views` for
- more information.
+ the section entitled :ref:`displaying_matching_views` for more
+ information.
Static Routes
~~~~~~~~~~~~~
@@ -273,10 +273,10 @@ Deprecations and Behavior Differences
- Previously, :class:`pyramid.request.Request` inherited from
:class:`webob.request.Request` and implemented ``__getattr__``,
- ``__setattr__`` and ``__delattr__`` itself in order to overidde "adhoc
+ ``__setattr__`` and ``__delattr__`` itself in order to override "adhoc
attr" WebOb behavior where attributes of the request are stored in the
- environ. Now, :class:`pyramid.request.Request inherits from (the more
- recent) :class:`webob.request.BaseRequest`` instead of
+ environ. Now, :class:`pyramid.request.Request` inherits from (the more
+ recent) :class:`webob.request.BaseRequest` instead of
:class:`webob.request.Request`, which provides the same behavior.
:class:`pyramid.request.Request` no longer implements its own
``__getattr__``, ``__setattr__`` or ``__delattr__`` as a result.