diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2017-05-20 12:58:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-20 12:58:17 +0100 |
| commit | 1c2dd9cb66ceda3c8febfed4f3f2cb39ae92bd4a (patch) | |
| tree | 7654d48e1a2367194083a9a7f06e98d23a9cfd97 /guides | |
| parent | e4ce81c2342e5e907bd0d2adba3071ca43159788 (diff) | |
| parent | 062e5f2b068fbce74102d7301b58a3cd7c5da883 (diff) | |
| download | rails-1c2dd9cb66ceda3c8febfed4f3f2cb39ae92bd4a.tar.gz rails-1c2dd9cb66ceda3c8febfed4f3f2cb39ae92bd4a.tar.bz2 rails-1c2dd9cb66ceda3c8febfed4f3f2cb39ae92bd4a.zip | |
Merge pull request #29158 from ffmike/add-json-feed
Add :json type to auto_discovery_link_tag
Diffstat (limited to 'guides')
| -rw-r--r-- | guides/source/action_view_overview.md | 2 | ||||
| -rw-r--r-- | guides/source/layouts_and_rendering.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/action_view_overview.md b/guides/source/action_view_overview.md index c835adeab6..10412128cc 100644 --- a/guides/source/action_view_overview.md +++ b/guides/source/action_view_overview.md @@ -419,7 +419,7 @@ image_tag("rails.png") # => <img src="http://assets.example.com/images/rails.png #### auto_discovery_link_tag -Returns a link tag that browsers and feed readers can use to auto-detect an RSS or Atom feed. +Returns a link tag that browsers and feed readers can use to auto-detect an RSS, Atom, or JSON feed. ```ruby auto_discovery_link_tag(:rss, "http://www.example.com/feed.rss", { title: "RSS Feed" }) # => diff --git a/guides/source/layouts_and_rendering.md b/guides/source/layouts_and_rendering.md index 48bb3147f3..caa3d21d23 100644 --- a/guides/source/layouts_and_rendering.md +++ b/guides/source/layouts_and_rendering.md @@ -768,7 +768,7 @@ WARNING: The asset tag helpers do _not_ verify the existence of the assets at th #### Linking to Feeds with the `auto_discovery_link_tag` -The `auto_discovery_link_tag` helper builds HTML that most browsers and feed readers can use to detect the presence of RSS or Atom feeds. It takes the type of the link (`:rss` or `:atom`), a hash of options that are passed through to url_for, and a hash of options for the tag: +The `auto_discovery_link_tag` helper builds HTML that most browsers and feed readers can use to detect the presence of RSS, Atom, or JSON feeds. It takes the type of the link (`:rss`, `:atom`, or `:json`), a hash of options that are passed through to url_for, and a hash of options for the tag: ```erb <%= auto_discovery_link_tag(:rss, {action: "feed"}, |