summaryrefslogtreecommitdiff
path: root/docs/whatsnew-1.1.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2013-04-01 07:57:08 -0700
committerMichael Merickel <michael@merickel.org>2013-04-01 07:57:08 -0700
commit75a3d11316fa2ab98afd1d8ac68d2f672b7ac871 (patch)
tree756cb48b8bd607cdfbaa58fba884d31a7c857d7a /docs/whatsnew-1.1.rst
parent710c04d2260827a96e5061930bd3196a4a9aa912 (diff)
parent50218d2d443c8773af3f2312fd0df095f993d4a9 (diff)
downloadpyramid-75a3d11316fa2ab98afd1d8ac68d2f672b7ac871.tar.gz
pyramid-75a3d11316fa2ab98afd1d8ac68d2f672b7ac871.tar.bz2
pyramid-75a3d11316fa2ab98afd1d8ac68d2f672b7ac871.zip
Merge pull request #962 from tshepang/refs
fix some cross-references
Diffstat (limited to 'docs/whatsnew-1.1.rst')
-rw-r--r--docs/whatsnew-1.1.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/whatsnew-1.1.rst b/docs/whatsnew-1.1.rst
index f33fc94ba..25ae54f32 100644
--- a/docs/whatsnew-1.1.rst
+++ b/docs/whatsnew-1.1.rst
@@ -43,7 +43,7 @@ The major feature additions in Pyramid 1.1 are:
The object passed to a view callable as ``request`` is an instance of
:class:`pyramid.request.Request`. ``request.response`` is an instance of
- the class :class:`pyramid.request.Response`. View callables that are
+ the class :class:`pyramid.response.Response`. View callables that are
configured with a :term:`renderer` will return this response object to the
Pyramid router. Therefore, code in a renderer-using view callable can set
response attributes such as ``request.response.content_type`` (before they
@@ -289,7 +289,7 @@ Minor Feature Additions
when you want the static view to behave like the older deprecated version.
- A new api function :func:`pyramid.scripting.prepare` has been added. It is
- a lower-level analogue of :func:`pyramid.paster.boostrap` that accepts a
+ a lower-level analogue of :func:`pyramid.paster.bootstrap` that accepts a
request and a registry instead of a config file argument, and is used for
the same purpose:
@@ -313,7 +313,7 @@ Minor Feature Additions
- New API attribute :attr:`pyramid.config.global_registries` is an iterable
object that contains references to every Pyramid registry loaded into the
- current process via :meth:`pyramid.config.Configurator.make_app`. It also
+ current process via :meth:`pyramid.config.Configurator.make_wsgi_app`. It also
has a ``last`` attribute containing the last registry loaded. This is used
by the scripting machinery, and is available for introspection.