diff options
| author | John Anderson <sontek@gmail.com> | 2015-01-20 18:34:27 -0800 |
|---|---|---|
| committer | John Anderson <sontek@gmail.com> | 2015-01-20 18:34:27 -0800 |
| commit | 8724ab8301c9d5808d781bab0af1df56909c9236 (patch) | |
| tree | 34fa963e424bae500e6bc010a7d2012c3d9bc89d /docs/narr/hooks.rst | |
| parent | ae7bcd7cabc53e0b500c6a79f30606e67217ad1d (diff) | |
| parent | 6c867a84ed7d7a1307811fba0cf1e1575b9dbefb (diff) | |
| download | pyramid-8724ab8301c9d5808d781bab0af1df56909c9236.tar.gz pyramid-8724ab8301c9d5808d781bab0af1df56909c9236.tar.bz2 pyramid-8724ab8301c9d5808d781bab0af1df56909c9236.zip | |
Merge branch 'master' of https://github.com/Pylons/pyramid into support_more_features_in_routes
Conflicts:
CHANGES.txt
Diffstat (limited to 'docs/narr/hooks.rst')
| -rw-r--r-- | docs/narr/hooks.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst index e250c2d7e..5bba0d143 100644 --- a/docs/narr/hooks.rst +++ b/docs/narr/hooks.rst @@ -777,7 +777,7 @@ If you want to implement your own Response object instead of using the :class:`pyramid.response.Response` object in any capacity at all, you'll have to make sure the object implements every attribute and method outlined in :class:`pyramid.interfaces.IResponse` and you'll have to ensure that it uses -``zope.interface.implementer(IResponse)`` as a class decoratoror. +``zope.interface.implementer(IResponse)`` as a class decorator. .. code-block:: python :linenos: |