diff options
| author | Xavier Noria <fxn@hashref.com> | 2012-02-28 01:09:31 -0800 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2012-02-28 01:09:31 -0800 |
| commit | 43faccf45fed33a5e529d0a156f958b9d8b785b7 (patch) | |
| tree | 5c39885d6e8ebb8b33849f5a93bcf28e240d9240 | |
| parent | d17e44edde24def1e90999abfc6a343a65196271 (diff) | |
| parent | e87f1aa0216be1874af165b57fbacbf32ea08f22 (diff) | |
| download | rails-43faccf45fed33a5e529d0a156f958b9d8b785b7.tar.gz rails-43faccf45fed33a5e529d0a156f958b9d8b785b7.tar.bz2 rails-43faccf45fed33a5e529d0a156f958b9d8b785b7.zip | |
Merge pull request #5199 from gabehollombe/master
The language for describing how to configure ActionController::Base.asset_host could be clearer
| -rw-r--r-- | actionpack/lib/action_view/helpers/asset_tag_helper.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb index 662adbe183..6dd52d8186 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -24,9 +24,10 @@ module ActionView # server by setting ActionController::Base.asset_host in the application # configuration, typically in <tt>config/environments/production.rb</tt>. # For example, you'd define <tt>assets.example.com</tt> to be your asset - # host this way: + # host this way, inside the <tt>configure</tt> block of your environment-specific + # configuration files or <tt>config/application.rb</tt>: # - # ActionController::Base.asset_host = "assets.example.com" + # config.action_controller.asset_host = "assets.example.com" # # Helpers take that into account: # |