summaryrefslogtreecommitdiff
path: root/docs/narr/views.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-08-29 16:06:40 -0400
committerChris McDonough <chrism@plope.com>2012-08-29 16:06:40 -0400
commita7051f17a6f352193b4f4b7f1bcc635dff452001 (patch)
tree33b3a6d6994137b6423f2f4d9ac2dc1a0e3ab717 /docs/narr/views.rst
parent8b55a68adb54783895a91a9e1af800a7f8f22c07 (diff)
parenta9289d95036eb23e973815e529d3db3fea235046 (diff)
downloadpyramid-a7051f17a6f352193b4f4b7f1bcc635dff452001.tar.gz
pyramid-a7051f17a6f352193b4f4b7f1bcc635dff452001.tar.bz2
pyramid-a7051f17a6f352193b4f4b7f1bcc635dff452001.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/views.rst')
-rw-r--r--docs/narr/views.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/views.rst b/docs/narr/views.rst
index f6ee9a8d5..9e41464a6 100644
--- a/docs/narr/views.rst
+++ b/docs/narr/views.rst
@@ -177,7 +177,7 @@ HTTP Exceptions
~~~~~~~~~~~~~~~
All classes documented in the :mod:`pyramid.httpexceptions` module documented
-as inheriting from the :class:`pryamid.httpexceptions.HTTPException` are
+as inheriting from the :class:`pyramid.httpexceptions.HTTPException` are
:term:`http exception` objects. Instances of an HTTP exception object may
either be *returned* or *raised* from within view code. In either case
(return or raise) the instance will be used as as the view's response.