diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2016-08-21 10:48:53 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2016-08-21 10:48:53 +0000 |
| commit | 3e2be0bf144b85fcd3bd0717f56609074d8182ea (patch) | |
| tree | 7e49c92b118040f63f16e7a5f16da0c2b104cd5b /guides/source/asset_pipeline.md | |
| parent | fae7c462855b8ced95697e8a3c0c400b70305200 (diff) | |
| parent | 18e599940a6070f54c50c4f1e694aaf166cdaf9e (diff) | |
| download | rails-3e2be0bf144b85fcd3bd0717f56609074d8182ea.tar.gz rails-3e2be0bf144b85fcd3bd0717f56609074d8182ea.tar.bz2 rails-3e2be0bf144b85fcd3bd0717f56609074d8182ea.zip | |
Merge branch 'master' of github.com:rails/docrails
Diffstat (limited to 'guides/source/asset_pipeline.md')
| -rw-r--r-- | guides/source/asset_pipeline.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/asset_pipeline.md b/guides/source/asset_pipeline.md index 5c085002ce..701304acde 100644 --- a/guides/source/asset_pipeline.md +++ b/guides/source/asset_pipeline.md @@ -485,7 +485,7 @@ which contains these lines: Rails creates both `app/assets/javascripts/application.js` and `app/assets/stylesheets/application.css` regardless of whether the ---skip-sprockets option is used when creating a new rails application. This is +--skip-sprockets option is used when creating a new Rails application. This is so you can easily add asset pipelining later if you like. The directives that work in JavaScript files also work in stylesheets @@ -1024,7 +1024,7 @@ to tell our CDN (and browser) that the asset is "public", that means any cache can store the request. Also we commonly want to set `max-age` which is how long the cache will store the object before invalidating the cache. The `max-age` value is set to seconds with a maximum possible value of `31536000` which is one -year. You can do this in your rails application by setting +year. You can do this in your Rails application by setting ``` config.public_file_server.headers = { |