HTML5 Tracker

Short URL: http://html5.org/r/4111

Index: source
===================================================================
--- source	(revision 4110)
+++ source	(revision 4111)
@@ -65525,13 +65525,6 @@
     </tr>
 
     <tr>
-     <td><code title="rel-feed">feed</code></td>
-     <td><span title="hyperlink link">Hyperlink</span></td>
-     <td><span>Hyperlink</span></td>
-     <td>Gives the address of a syndication feed for the current document.</td>
-    </tr>
-
-    <tr>
      <td><code title="rel-first">first</code></td>
      <td><span title="hyperlink link">Hyperlink</span></td>
      <td><span>Hyperlink</span></td>
@@ -65729,12 +65722,42 @@
   <p>If the <code title="rel-alternate">alternate</code> keyword is
   used with the <code title="attr-hyperlink-type">type</code>
   attribute set to the value <code title="">application/rss+xml</code>
-  or the value <code title="">application/atom+xml</code>, then the
-  user agent must treat the link as it would if it had the <code
-  title="rel-feed">feed</code> keyword specified as well.</p>
+  or the value <code title="">application/atom+xml</code>, then it
+  indicates that the referenced document is a syndication feed (though
+  not necessarily syndicating exactly the same content as the current
+  page).</p>
 
+  <div class="impl">
+
+  <p>The first <code>link</code>, <code>a</code>, or <code>area</code>
+  element in the document (in tree order) with the <code
+  title="rel-alternate">alternate</code> keyword used with the <code
+  title="attr-hyperlink-type">type</code> attribute set to the value
+  <code title="">application/rss+xml</code> or the value <code
+  title="">application/atom+xml</code> must be treated as the default
+  syndication feed for the purposes of feed autodiscovery.</p>
+
+  <div class="example">
+   <p>The following <code>link</code> element gives the syndication
+   feed for the current page:</p>
+   <pre>&lt;link rel="alternate" type="application/atom+xml" href="data.xml"></pre>
+   <p>The following extract offers various different syndication
+   feeds:</p>
+   <pre>&lt;p>You can access the planets database using Atom feeds:&lt;/p>
+&lt;ul>
+ &lt;li>&lt;a href="recently-visited-planets.xml" rel="alternate" type="application/atom+xml">Recently Visited Planets&lt;/a>&lt;/li>
+ &lt;li>&lt;a href="known-bad-planets.xml" rel="alternate" type="application/atom+xml">Known Bad Planets&lt;/a>&lt;/li>
+ &lt;li>&lt;a href="unexplored-planets.xml" rel="alternate" type="application/atom+xml">Unexplored Planets&lt;/a>&lt;/li>
+&lt;/ul></pre>
   </div>
 
+  </div>
+
+
+
+
+  </div>
+
   <p>The <code title="rel-alternate">alternate</code> link
   relationship is transitive &mdash; that is, if a document links to
   two other documents with the link type "<code
@@ -65880,50 +65903,6 @@
   that the current document forms a part of.</p>
 
 
-  <h5>Link type "<dfn title="rel-feed"><code>feed</code></dfn>"</h5>
-
-  <p>The <code title="rel-feed">feed</code> keyword may be used with
-  <code>link</code>, <code>a</code>, and <code>area</code>
-  elements. For <code>link</code> elements, it creates a <span
-  title="hyperlink link">hyperlink</span>.</p>
-
-  <p>The <code title="rel-feed">feed</code> keyword indicates that the
-  referenced document is a syndication feed. If the <code
-  title="rel-alternate">alternate</code> link type is also specified,
-  then the feed is specifically the feed for the current document;
-  otherwise, the feed is just a syndication feed, not necessarily
-  associated with a particular Web page.</p>
-
-  <div class="impl">
-
-  <p>The first <code>link</code>, <code>a</code>, or <code>area</code>
-  element in the document (in tree order) that creates a hyperlink
-  with the link type <code title="rel-feed">feed</code> must be
-  treated as the default syndication feed for the purposes of feed
-  autodiscovery.</p>
-
-  <p class="note">The <code title="rel-feed">feed</code> keyword is
-  implied by the <code title="rel-alternate">alternate</code> link
-  type in certain cases (q.v.).</p>
-
-  <div class="example">
-   <p>The following two <code>link</code> elements are equivalent:
-   both give the syndication feed for the current page:</p>
-   <pre>&lt;link rel="alternate" type="application/atom+xml" href="data.xml"></pre>
-   <pre>&lt;link rel="feed alternate" href="data.xml"></pre>
-   <p>The following extract offers various different syndication
-   feeds:</p>
-   <pre> &lt;p>You can access the planets database using Atom feeds:&lt;/p>
- &lt;ul>
-  &lt;li>&lt;a href="recently-visited-planets.xml" rel="feed">Recently Visited Planets&lt;/a>&lt;/li>
-  &lt;li>&lt;a href="known-bad-planets.xml" rel="feed">Known Bad Planets&lt;/a>&lt;/li>
-  &lt;li>&lt;a href="unexplored-planets.xml" rel="feed">Unexplored Planets&lt;/a>&lt;/li>
- &lt;/ul></pre>
-  </div>
-
-  </div>
-
-
   <h5>Link type "<dfn title="rel-help"><code>help</code></dfn>"</h5>
 
   <p>The <code title="rel-help">help</code> keyword may be used with

Previous | Next