diff options
| author | Chris McDonough <chrism@plope.com> | 2015-07-29 10:56:42 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2015-07-29 10:56:42 -0400 |
| commit | acef960041ed25aa335feafacc7061ffd6d58b5e (patch) | |
| tree | 8158d65c72f9c20360367df35e7cbf1fac7bda2e | |
| parent | 8447260de970629be01de821e43e9ea33e4405a0 (diff) | |
| parent | 0a73c0f39e30fcdf92ac6fa1cb58fb6d75b7859a (diff) | |
| download | pyramid-acef960041ed25aa335feafacc7061ffd6d58b5e.tar.gz pyramid-acef960041ed25aa335feafacc7061ffd6d58b5e.tar.bz2 pyramid-acef960041ed25aa335feafacc7061ffd6d58b5e.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
| -rw-r--r-- | docs/narr/assets.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/assets.rst b/docs/narr/assets.rst index fc02b3f7d..1beabe8de 100644 --- a/docs/narr/assets.rst +++ b/docs/narr/assets.rst @@ -390,7 +390,7 @@ in the asset's URL: When the asset changes, so will its md5 checksum, and therefore so will its URL. Supplying the ``cachebust`` argument also causes the static view to set headers instructing clients to cache the asset for ten years, unless the -``max_cache_age`` argument is also passed, in which case that value is used. +``cache_max_age`` argument is also passed, in which case that value is used. .. note:: |