summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-01-29 10:33:39 -0800
committerChris McDonough <chrism@plope.com>2012-01-29 10:33:39 -0800
commit29d3f0af685ea68855e3b37f1dea77279d21ab11 (patch)
treec898d9362b2e85254321279aba21ec4ae1bc5c82 /docs
parentb2558a84011afcfbcdca93bb7940411ea6c5ae5a (diff)
parent7eefb69a6b2dd8a4a68430f60bbd1ef34c1a98d3 (diff)
downloadpyramid-29d3f0af685ea68855e3b37f1dea77279d21ab11.tar.gz
pyramid-29d3f0af685ea68855e3b37f1dea77279d21ab11.tar.bz2
pyramid-29d3f0af685ea68855e3b37f1dea77279d21ab11.zip
Merge pull request #419 from davidjb/patch-1
2 Minor doco fixes
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/viewconfig.rst2
-rw-r--r--docs/narr/views.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst
index 03000629c..d1188eaec 100644
--- a/docs/narr/viewconfig.rst
+++ b/docs/narr/viewconfig.rst
@@ -926,7 +926,7 @@ there's a ``should_cache`` GET or POST variable:
return response
Note that the ``http_cache`` machinery will overwrite or add to caching
-headers you set within the view itself unless you use ``preserve_auto``.
+headers you set within the view itself unless you use ``prevent_auto``.
You can also turn of the effect of ``http_cache`` entirely for the duration
of a Pyramid application lifetime. To do so, set the
diff --git a/docs/narr/views.rst b/docs/narr/views.rst
index a3fd61098..fa34cca61 100644
--- a/docs/narr/views.rst
+++ b/docs/narr/views.rst
@@ -233,7 +233,7 @@ provided within :mod:`pyramid.httpexceptions`.
How Pyramid Uses HTTP Exceptions
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-HTTP exceptions are meant to be used directly by application application
+HTTP exceptions are meant to be used directly by application
developers. However, Pyramid itself will raise two HTTP exceptions at
various points during normal operations:
:exc:`pyramid.httpexceptions.HTTPNotFound` and