summaryrefslogtreecommitdiff
path: root/docs/narr/views.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-08-23 12:33:54 -0400
committerChris McDonough <chrism@plope.com>2012-08-23 12:33:54 -0400
commit0d9dccd259d52be9be2400cfe6ee5b709b812bfc (patch)
treeddb6d0174bab3a49c19e9f678c1c7ce4a43c5a8f /docs/narr/views.rst
parentb9b4657e79e7e1ed1f0c79bf82c3fe19a0ab5687 (diff)
parent75a8ff4ad0ba8eed13592eb5e7a211da3035e209 (diff)
downloadpyramid-0d9dccd259d52be9be2400cfe6ee5b709b812bfc.tar.gz
pyramid-0d9dccd259d52be9be2400cfe6ee5b709b812bfc.tar.bz2
pyramid-0d9dccd259d52be9be2400cfe6ee5b709b812bfc.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.