diff options
| author | Yves Senn <yves.senn@gmail.com> | 2015-04-05 10:55:13 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2015-04-05 10:55:13 +0200 |
| commit | 0eab204c0ec76903fa4b43aecae502f51d5a9c55 (patch) | |
| tree | cb540dc094ec4065e2ccf0d9d878d0925fcf7cf6 | |
| parent | 56e0723c3dd8e8fd0dc48d3731282df14abd3344 (diff) | |
| parent | e2d9e85368d1e049c55057fcf91aa036086c649a (diff) | |
| download | rails-0eab204c0ec76903fa4b43aecae502f51d5a9c55.tar.gz rails-0eab204c0ec76903fa4b43aecae502f51d5a9c55.tar.bz2 rails-0eab204c0ec76903fa4b43aecae502f51d5a9c55.zip | |
Merge pull request #19644 from y-yagi/auto_discovery_link_tag_doc
correct output of auto_discovery_link_tag [ci skip]
| -rw-r--r-- | actionview/lib/action_view/helpers/asset_tag_helper.rb | 2 | ||||
| -rw-r--r-- | guides/source/action_view_overview.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/helpers/asset_tag_helper.rb b/actionview/lib/action_view/helpers/asset_tag_helper.rb index 5c28043f8a..60fc9ee1a2 100644 --- a/actionview/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionview/lib/action_view/helpers/asset_tag_helper.rb @@ -127,7 +127,7 @@ module ActionView # auto_discovery_link_tag(:rss, {controller: "news", action: "feed"}) # # => <link rel="alternate" type="application/rss+xml" title="RSS" href="http://www.currenthost.com/news/feed" /> # auto_discovery_link_tag(:rss, "http://www.example.com/feed.rss", {title: "Example RSS"}) - # # => <link rel="alternate" type="application/rss+xml" title="Example RSS" href="http://www.example.com/feed" /> + # # => <link rel="alternate" type="application/rss+xml" title="Example RSS" href="http://www.example.com/feed.rss" /> def auto_discovery_link_tag(type = :rss, url_options = {}, tag_options = {}) if !(type == :rss || type == :atom) && tag_options[:type].blank? raise ArgumentError.new("You should pass :type tag_option key explicitly, because you have passed #{type} type other than :rss or :atom.") diff --git a/guides/source/action_view_overview.md b/guides/source/action_view_overview.md index 71f3f8882c..02ef32d66e 100644 --- a/guides/source/action_view_overview.md +++ b/guides/source/action_view_overview.md @@ -408,7 +408,7 @@ Returns a link tag that browsers and feed readers can use to auto-detect an RSS ```ruby auto_discovery_link_tag(:rss, "http://www.example.com/feed.rss", { title: "RSS Feed" }) # => - <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="http://www.example.com/feed" /> + <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="http://www.example.com/feed.rss" /> ``` #### image_path |