diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2011-09-04 18:58:34 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2011-09-04 18:58:34 +0530 |
| commit | abb09054043c556ae38d2c9d1e9037eceb6dc426 (patch) | |
| tree | aa71edf8e300faa09135ba83331dffb1ab92a5d3 /railties/guides/source/configuring.textile | |
| parent | 74372f7e795dd0e1825dec19dd128b5ae6fb9dfc (diff) | |
| parent | a6bafb327d403361ef652d6749f0609cfc2a5578 (diff) | |
| download | rails-abb09054043c556ae38d2c9d1e9037eceb6dc426.tar.gz rails-abb09054043c556ae38d2c9d1e9037eceb6dc426.tar.bz2 rails-abb09054043c556ae38d2c9d1e9037eceb6dc426.zip | |
Merge docrails, resolving conflicts in the assets guide
Diffstat (limited to 'railties/guides/source/configuring.textile')
| -rw-r--r-- | railties/guides/source/configuring.textile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/railties/guides/source/configuring.textile b/railties/guides/source/configuring.textile index 050fcd823d..ae84bb5b92 100644 --- a/railties/guides/source/configuring.textile +++ b/railties/guides/source/configuring.textile @@ -134,15 +134,15 @@ Rails 3.1, by default, is set up to use the +sprockets+ gem to manage assets wit * +config.assets.prefix+ defines the prefix where assets are served from. Defaults to +/assets+. -* +config.assets.digest+ enables the use of MD5 fingerprints in asset names. Set to +true+ by default in +production.rb+ +* +config.assets.digest+ enables the use of MD5 fingerprints in asset names. Set to +true+ by default in +production.rb+. -* +config.assets.debug+ disables the concatenation and compression of assets. Set to +false+ by default in +development.rb+ +* +config.assets.debug+ disables the concatenation and compression of assets. Set to +false+ by default in +development.rb+. -* +config.assets.manifest+ defines the full path to be used for the asset precompiler's manifest file. Defaults to using +config.assets.prefix+ +* +config.assets.manifest+ defines the full path to be used for the asset precompiler's manifest file. Defaults to using +config.assets.prefix+. * +config.assets.cache_store+ defines the cache store that Sprockets will use. The default is the Rails file store. -* +config.assets.version+ is an option string that is used in MD5 hash generation. This can be changed to force all files to be recompiled. +* +config.assets.version+ is an option string that is used in MD5 hash generation. This can be changed to force all files to be recompiled. * +config.assets.compile+ is a boolean that can be used to turn on live Sprockets compilation in production. |