summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2014-04-27 11:50:29 -0700
committerSteve Piercy <web@stevepiercy.com>2014-04-27 11:50:29 -0700
commitcc1b05c71a2972d816a3deb4cd68f7405190da6e (patch)
treeb78fd71ea348118fb6afd7c7082ace79bd143655
parente36788c38b06d154d04f90530fb25d503748b63f (diff)
parent934d7fe27b92d0e329c0c1a76bdd3e0870e2f09a (diff)
downloadpyramid-cc1b05c71a2972d816a3deb4cd68f7405190da6e.tar.gz
pyramid-cc1b05c71a2972d816a3deb4cd68f7405190da6e.tar.bz2
pyramid-cc1b05c71a2972d816a3deb4cd68f7405190da6e.zip
Merge pull request #1327 from invisibleroads/patch-1
Replaced five minutes with one hour
-rw-r--r--pyramid/static.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pyramid/static.py b/pyramid/static.py
index 63ca58597..aa67568d3 100644
--- a/pyramid/static.py
+++ b/pyramid/static.py
@@ -58,7 +58,7 @@ class static_view(object):
``cache_max_age`` influences the ``Expires`` and ``Max-Age``
response headers returned by the view (default is 3600 seconds or
- five minutes).
+ one hour).
``use_subpath`` influences whether ``request.subpath`` will be used as
``PATH_INFO`` when calling the underlying WSGI application which actually