diff options
| author | Michael Merickel <michael@merickel.org> | 2022-03-12 20:58:08 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-12 20:58:08 -0600 |
| commit | 440db5f87193ad2713869c422c2f162c155d99ee (patch) | |
| tree | f1db3b2688eaaf9526b6181a2c94a375a559a101 /docs/narr | |
| parent | 7897845be73c2b33af8339aebdb2ea2c6aca4e39 (diff) | |
| parent | 0e4a1e3773e383ae756164e2cb5f32592d63e131 (diff) | |
| download | pyramid-440db5f87193ad2713869c422c2f162c155d99ee.tar.gz pyramid-440db5f87193ad2713869c422c2f162c155d99ee.tar.bz2 pyramid-440db5f87193ad2713869c422c2f162c155d99ee.zip | |
Merge pull request #3674 from stevepiercy/master
Fix API documentation links to webob, and rename the objects with the…
Diffstat (limited to 'docs/narr')
| -rw-r--r-- | docs/narr/hooks.rst | 4 | ||||
| -rw-r--r-- | docs/narr/webob.rst | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst index c19d26236..73a0143bf 100644 --- a/docs/narr/hooks.rst +++ b/docs/narr/hooks.rst @@ -852,11 +852,11 @@ callable, if that object asserts that it implements ``zope.interface.implementer(IResponse)``) , an adapter needn't be registered for the object; Pyramid will use it directly. -An IResponse adapter for ``webob.Response`` (as opposed to +An IResponse adapter for ``webob.reponse.Response`` (as opposed to :class:`pyramid.response.Response`) is registered by Pyramid by default at startup time, as by their nature, instances of this class (and instances of subclasses of the class) will natively provide IResponse. The adapter -registered for ``webob.Response`` simply returns the response object. +registered for ``webob.reponse.Response`` simply returns the response object. Instead of using :meth:`pyramid.config.Configurator.add_response_adapter`, you can use the :class:`pyramid.response.response_adapter` decorator: diff --git a/docs/narr/webob.rst b/docs/narr/webob.rst index e0524583f..61b64b480 100644 --- a/docs/narr/webob.rst +++ b/docs/narr/webob.rst @@ -14,10 +14,10 @@ Request and Response Objects :term:`request` and :term:`response` object implementations. The :term:`request` object that is passed to a :app:`Pyramid` :term:`view` is an instance of the :class:`pyramid.request.Request` class, which is a subclass of -:class:`webob.Request`. The :term:`response` returned from a :app:`Pyramid` +:class:`webob.request.Request`. The :term:`response` returned from a :app:`Pyramid` :term:`view` :term:`renderer` is an instance of the :mod:`pyramid.response.Response` class, which is a subclass of the -:class:`webob.Response` class. Users can also return an instance of +:class:`webob.response.Response` class. Users can also return an instance of :class:`pyramid.response.Response` directly from a view as necessary. WebOb is a project separate from :app:`Pyramid` with a separate set of authors @@ -364,7 +364,7 @@ Response The :app:`Pyramid` response object can be imported as :class:`pyramid.response.Response`. This class is a subclass of the -``webob.Response`` class. The subclass does not add or change any +``webob.reponse.Response`` class. The subclass does not add or change any functionality, so the WebOb Response documentation will be completely relevant for this class as well. |