aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides/source/asset_pipeline.textile
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2011-09-11 17:41:39 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2011-09-11 17:41:39 +0530
commit95fdaf965a89e14840bfce79ed8aa6f4a9db08d8 (patch)
tree9cd6f063cb165f33b4f45c16c17610cecf3b5cb6 /railties/guides/source/asset_pipeline.textile
parenta9509284cad9047693f8e5d74248ad307ab5b23d (diff)
parent715b0996ca9ec8b7e8db614e1aa339b0cfa77a7d (diff)
downloadrails-95fdaf965a89e14840bfce79ed8aa6f4a9db08d8.tar.gz
rails-95fdaf965a89e14840bfce79ed8aa6f4a9db08d8.tar.bz2
rails-95fdaf965a89e14840bfce79ed8aa6f4a9db08d8.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'railties/guides/source/asset_pipeline.textile')
-rw-r--r--railties/guides/source/asset_pipeline.textile6
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/guides/source/asset_pipeline.textile b/railties/guides/source/asset_pipeline.textile
index bad1c08747..211b02b94b 100644
--- a/railties/guides/source/asset_pipeline.textile
+++ b/railties/guides/source/asset_pipeline.textile
@@ -282,7 +282,7 @@ When debug mode is off Sprockets will concatenate and run the necessary preproce
<script src='/assets/application.js'></script>
</html>
-Assets are compiled and cached on the first request after the server is started. Sprockets sets a +must-validate+ Cache-Control HTTP header to reduce request overhead on subsequent requests -- on these the browser gets a 304 (not-modified) response.
+Assets are compiled and cached on the first request after the server is started. Sprockets sets a +must-revalidate+ Cache-Control HTTP header to reduce request overhead on subsequent requests -- on these the browser gets a 304 (not-modified) response.
If any of the files in the manifest have changed between requests, the server responds with a new compiled file.
@@ -415,12 +415,12 @@ For Apache:
RewriteCond %{REQUEST_FILENAME}.gz -s
RewriteRule ^(.+) $1.gz [L]
</LocationMatch>
-
+
# without these, Content-Type will be "application/x-gzip"
<FilesMatch "^/assets/.*\.css.gz$">
ForceType text/css
</FilesMatch>
-
+
<FilesMatch "^/assets/.*\.js.gz$">
ForceType text/javascript
</FilesMatch>