aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2014-06-11 13:53:28 +0200
committerYves Senn <yves.senn@gmail.com>2014-06-11 13:53:28 +0200
commitb3b0110df78afdd729478f2965e278d027f44828 (patch)
tree087ca5abed27eeb0ab93f8594f597b4dde4e894c /guides
parent4aa25d4c76b5487caf2b35e677b72ece595f400f (diff)
parent02ef0313419f50ac09ec782cf042ed7f43d129c7 (diff)
downloadrails-b3b0110df78afdd729478f2965e278d027f44828.tar.gz
rails-b3b0110df78afdd729478f2965e278d027f44828.tar.bz2
rails-b3b0110df78afdd729478f2965e278d027f44828.zip
Merge pull request #15636 from hundredwatt/patch-1
Fix Apache Directives [ci skip]
Diffstat (limited to 'guides')
-rw-r--r--guides/source/asset_pipeline.md6
1 files changed, 4 insertions, 2 deletions
diff --git a/guides/source/asset_pipeline.md b/guides/source/asset_pipeline.md
index c81e9e58e3..de3049237e 100644
--- a/guides/source/asset_pipeline.md
+++ b/guides/source/asset_pipeline.md
@@ -788,9 +788,11 @@ For Apache:
# `mod_expires` to be enabled.
<Location /assets/>
# Use of ETag is discouraged when Last-Modified is present
- Header unset ETag FileETag None
+ Header unset ETag
+ FileETag None
# RFC says only cache for 1 year
- ExpiresActive On ExpiresDefault "access plus 1 year"
+ ExpiresActive On
+ ExpiresDefault "access plus 1 year"
</Location>
```