summaryrefslogtreecommitdiff
path: root/docs/narr/viewconfig.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-02-24 14:52:00 -0500
committerChris McDonough <chrism@plope.com>2012-02-24 14:52:00 -0500
commit3a8cee594c3e42dd23cde72310c71aa816e3a966 (patch)
tree708736152f7c25838512de98490bfdd53782b67a /docs/narr/viewconfig.rst
parentf2f67edd97b9525ae6c6a20a09a9afa9189c018e (diff)
parent33f922bb012481424bdcd0b5d063ebf22f20d273 (diff)
downloadpyramid-3a8cee594c3e42dd23cde72310c71aa816e3a966.tar.gz
pyramid-3a8cee594c3e42dd23cde72310c71aa816e3a966.tar.bz2
pyramid-3a8cee594c3e42dd23cde72310c71aa816e3a966.zip
Merge branch 'master' of github.com:Pylons/pyramid
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