Skip to content
This repository
Browse code

copy edit the assets guide[ci skip]

  • Loading branch information...
commit 741cb5b12b87f0405d421c82f04cd86eba6c613b 1 parent d569bfe
Vijay Dev authored June 22, 2012

Showing 1 changed file with 6 additions and 17 deletions. Show diff stats Hide diff stats

  1. 23  guides/source/asset_pipeline.textile
23  guides/source/asset_pipeline.textile
Source Rendered
@@ -651,25 +651,18 @@ WARNING: If you are upgrading an existing application and intend to use this opt
651 651
 
652 652
 h3. Assets Cache Store
653 653
 
654  
-If you will not configure assets cache store, your application's cache store will be used to cache assets in development and production.
655  
-
656  
-You always can access your application's cache by calling +Rails.cache+.
657  
-
658  
-Default assets cache store can be changed to something else, like memory store:
  654
+Sprockets uses the default Rails cache store will be used to cache assets in development and production. This can be changed by setting +config.assets.cache_store+.
659 655
 
660 656
 <ruby>
661 657
 config.assets.cache_store = :memory_store
662 658
 </ruby>
663 659
 
664  
-All the assets cache store parameters should be passed in the same way like for application's cache store.
  660
+The options accepted by the assets cache store are the same as the application's cache store.
665 661
 
666 662
 <ruby>
667 663
 config.assets.cache_store = :memory_store, { :size => 32.megabytes }
668 664
 </ruby>
669 665
 
670  
-Any appropriate application cache store adapter can be used for assets cache store.
671  
-You can read more about application's cache stores and their options in the "Caching with Rails Guide":./caching_with_rails.html#cache-stores.
672  
-
673 666
 h3. Adding Assets to Your Gems
674 667
 
675 668
 Assets can also come from external sources in the form of gems.
@@ -682,11 +675,9 @@ TODO: Registering gems on "Tilt":https://github.com/rtomayko/tilt enabling Sproc
682 675
 
683 676
 h3. Upgrading from Old Versions of Rails
684 677
 
685  
-There are three issues when upgrading. The first is moving the files from +public/+ to the new locations. See "Asset Organization":#asset-organization above for guidance on the correct locations for different file types.
  678
+There are a few issues when upgrading. The first is moving the files from +public/+ to the new locations. See "Asset Organization":#asset-organization above for guidance on the correct locations for different file types.
686 679
 
687  
-The second is avoiding duplicate javascript files. If you use jquery or jquery_ujs in your manifest file, there are two changes you must make.
688  
-# You must be careful not to copy over your old javascript files which are included in the manifest file, or they will conflict.
689  
-# You must remove references to these in your layout files (since application.js will include them now).
  680
+Next will be avoiding duplicate JavaScript files. Since jQuery is the default JavaScript library from Rails 3.1 onwards, you don't need to copy +jquery.js+ into +app/assets+ and it will be included automatically.
690 681
 
691 682
 The third is updating the various environment files with the correct default options. The following changes reflect the defaults in version 3.1.0.
692 683
 
@@ -744,8 +735,8 @@ The following should also be added to +Gemfile+:
744 735
 # Gems used only for assets and not required
745 736
 # in production environments by default.
746 737
 group :assets do
747  
-  gem 'sass-rails',   "~> 3.1.0"
748  
-  gem 'coffee-rails', "~> 3.1.0"
  738
+  gem 'sass-rails',   "~> 3.2.3"
  739
+  gem 'coffee-rails', "~> 3.2.1"
749 740
   gem 'uglifier'
750 741
 end
751 742
 </plain>
@@ -768,5 +759,3 @@ Instead of the old Rails 3.0 version:
768 759
 # you've limited to :test, :development, or :production.
769 760
 Bundler.require(:default, Rails.env) if defined?(Bundler)
770 761
 </ruby>
771  
-
772  
-

0 notes on commit 741cb5b

Please sign in to comment.
Something went wrong with that request. Please try again.