summaryrefslogtreecommitdiff
path: root/docs/narr/viewconfig.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-02-24 14:52:17 -0500
committerChris McDonough <chrism@plope.com>2012-02-24 14:52:17 -0500
commit905bcaaec5f71f9b2df4204ed91c1628f854e0ff (patch)
treeb4838a2baf1a1ca9d40173a76da6c40315e0fa2a /docs/narr/viewconfig.rst
parentf5b9e9c6708e4176231c45f5e478d56bba4b42e6 (diff)
parent3a8cee594c3e42dd23cde72310c71aa816e3a966 (diff)
downloadpyramid-905bcaaec5f71f9b2df4204ed91c1628f854e0ff.tar.gz
pyramid-905bcaaec5f71f9b2df4204ed91c1628f854e0ff.tar.bz2
pyramid-905bcaaec5f71f9b2df4204ed91c1628f854e0ff.zip
Merge branch 'master' into 1.3-branch
Diffstat (limited to 'docs/narr/viewconfig.rst')
-rw-r--r--docs/narr/viewconfig.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst
index 763c0e131..23b4fde68 100644
--- a/docs/narr/viewconfig.rst
+++ b/docs/narr/viewconfig.rst
@@ -900,7 +900,7 @@ When a non-``None`` ``http_cache`` argument is passed to a view
configuration, Pyramid will set ``Expires`` and ``Cache-Control`` response
headers in the resulting response, causing browsers to cache the response
data for some time. See ``http_cache`` in :ref:`nonpredicate_view_args` for
-the its allowable values and what they mean.
+the allowable values and what they mean.
Sometimes it's undesirable to have these headers set as the result of
returning a response from a view, even though you'd like to decorate the view