diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2011-12-16 11:13:39 -0800 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2011-12-16 11:13:39 -0800 |
| commit | 5f6bcd74fd3a17911a06ffb09827b90c47ae573f (patch) | |
| tree | e5deebd220d3e06189869bce84978a2c4eed80e3 | |
| parent | bd84b2bb5db0a1ecdde8517a03458a82700de05d (diff) | |
| parent | 9d7795638da94a52e474f36e188ee8c2f80f6701 (diff) | |
| download | rails-5f6bcd74fd3a17911a06ffb09827b90c47ae573f.tar.gz rails-5f6bcd74fd3a17911a06ffb09827b90c47ae573f.tar.bz2 rails-5f6bcd74fd3a17911a06ffb09827b90c47ae573f.zip | |
Merge pull request #3780 from marcbowes/master
Fix favicon_link_tag help text
| -rw-r--r-- | actionpack/lib/action_view/helpers/asset_tag_helper.rb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb index 7d01e5ddb8..653e12c7d8 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -228,23 +228,19 @@ module ActionView ) end - # Web browsers cache favicons. If you just throw a <tt>favicon.ico</tt> into the document - # root of your application and it changes later, clients that have it in their cache - # won't see the update. Using this helper prevents that because it appends an asset ID: - # # <%= favicon_link_tag %> # # generates # - # <link href="/favicon.ico?4649789979" rel="shortcut icon" type="image/vnd.microsoft.icon" /> + # <link href="/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" /> # # You may specify a different file in the first argument: # - # <%= favicon_link_tag 'favicon.ico' %> + # <%= favicon_link_tag '/myicon.ico' %> # # That's passed to +path_to_image+ as is, so it gives # - # <link href="/images/favicon.ico?4649789979" rel="shortcut icon" type="image/vnd.microsoft.icon" /> + # <link href="/myicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" /> # # The helper accepts an additional options hash where you can override "rel" and "type". # |