diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-02-09 23:44:17 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-02-09 23:44:17 +0530 |
| commit | e6c98b83cbf4eab8944601754cc8d0e627b55d6f (patch) | |
| tree | dfab846ff415e071f9368d9d5fa1036d2c8cb1c6 /actionpack/lib/action_view | |
| parent | a8c150e0df0cba1cd766e6fe3828926d9f3eb7f3 (diff) | |
| parent | b0a39d9feb412777e4f3a0199f07713ef4e343c9 (diff) | |
| download | rails-e6c98b83cbf4eab8944601754cc8d0e627b55d6f.tar.gz rails-e6c98b83cbf4eab8944601754cc8d0e627b55d6f.tar.bz2 rails-e6c98b83cbf4eab8944601754cc8d0e627b55d6f.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
activerecord/lib/active_record/relation/query_methods.rb
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/helpers/asset_tag_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb index c035dde51e..662adbe183 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -198,7 +198,7 @@ module ActionView include JavascriptTagHelpers include StylesheetTagHelpers # Returns a link tag that browsers and news readers can use to auto-detect - # an RSS or ATOM feed. The +type+ can either be <tt>:rss</tt> (default) or + # an RSS or Atom feed. The +type+ can either be <tt>:rss</tt> (default) or # <tt>:atom</tt>. Control the link options in url_for format using the # +url_options+. You can modify the LINK tag itself in +tag_options+. # |