Merge branch 'master' into 1.3-branch

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