- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Sun, 04 Apr 2010 07:07:30 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec-author-view In directory hutz:/tmp/cvs-serv15003 Modified Files: Overview.html links.html spec.html Log Message: Define rel=alternate for feeds as something conforming. (whatwg r4964) [updated by splitter] Index: Overview.html =================================================================== RCS file: /sources/public/html5/spec-author-view/Overview.html,v retrieving revision 1.829 retrieving revision 1.830 diff -u -d -r1.829 -r1.830 --- Overview.html 4 Apr 2010 06:37:55 -0000 1.829 +++ Overview.html 4 Apr 2010 07:07:27 -0000 1.830 @@ -307,7 +307,7 @@ </dl><p>This specification is available in the following formats: <a href="spec.html">single page HTML</a>, <a href="Overview.html">multipage HTML</a>. -This is revision 1.3985. +This is revision 1.3986. </p> <p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a> © 2010 <a href="http://www.w3.org/"><abbr title="World Wide Index: links.html =================================================================== RCS file: /sources/public/html5/spec-author-view/links.html,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- links.html 2 Apr 2010 21:51:45 -0000 1.34 +++ links.html 4 Apr 2010 07:07:27 -0000 1.35 @@ -452,39 +452,83 @@ * http://microformats.org/wiki/rel-enclosure --><h5 id="link-type-alternate"><span class="secno">4.12.2.1 </span>Link type "<dfn title="rel-alternate"><code>alternate</code></dfn>"</h5><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p><p>The <code title="rel-alternate"><a href="#link-type-alternate">alternate</a></code> keyword may be used with <code><a href="semantics.html#the-link-element">link</a></code>, <code><a href="text-level-semantics.html#the-a-element">a</a></code>, and <code><a href="the-map-element.html#the-area-element">area</a></code> - elements. For <code><a href="semantics.html#the-link-element">link</a></code> elements, if the <code title="attr-link-rel"><a href="semantics.html#attr-link-rel">rel</a></code> attribute does not also contain the - keyword <code title="rel-stylesheet"><a href="#link-type-stylesheet">stylesheet</a></code>, it creates a - <a href="semantics.html#hyperlink-link" title="hyperlink link">hyperlink</a>; but if it - <em>does</em> also contain the keyword <code title="rel-stylesheet"><a href="#link-type-stylesheet">stylesheet</a></code>, the <code title="rel-alternate"><a href="#link-type-alternate">alternate</a></code> keyword instead modifies the - meaning of the <code title="rel-stylesheet"><a href="#link-type-stylesheet">stylesheet</a></code> - keyword in the way described for that keyword, and the rest of this - subsection doesn't apply.</p><p>The <code title="rel-alternate"><a href="#link-type-alternate">alternate</a></code> keyword - indicates that the referenced document is an alternate - representation of the current document.</p><p>The nature of the referenced document is given by the <code title="attr-hyperlink-media"><a href="#attr-hyperlink-media">media</a></code>, <code title="attr-hyperlink-hreflang"><a href="#attr-hyperlink-hreflang">hreflang</a></code>, and <code title="attr-hyperlink-type"><a href="#attr-hyperlink-type">type</a></code> attributes.</p><p>If the <code title="rel-alternate"><a href="#link-type-alternate">alternate</a></code> keyword is - used with the <code title="attr-hyperlink-media"><a href="#attr-hyperlink-media">media</a></code> - attribute, it indicates that the referenced document is intended for - use with the media specified.</p><p>If the <code title="rel-alternate"><a href="#link-type-alternate">alternate</a></code> keyword is - used with the <code title="attr-hyperlink-hreflang"><a href="#attr-hyperlink-hreflang">hreflang</a></code> - attribute, and that attribute's value differs from the <a href="infrastructure.html#root-element">root - element</a>'s <a href="#language">language</a>, it indicates that the - referenced document is a translation.</p><p>If the <code title="rel-alternate"><a href="#link-type-alternate">alternate</a></code> keyword is - used with the <code title="attr-hyperlink-type"><a href="#attr-hyperlink-type">type</a></code> - attribute, it indicates that the referenced document is a - reformulation of the current document in the specified format.</p><p>The <code title="attr-hyperlink-media"><a href="#attr-hyperlink-media">media</a></code>, <code title="attr-hyperlink-hreflang"><a href="#attr-hyperlink-hreflang">hreflang</a></code>, and <code title="attr-hyperlink-type"><a href="#attr-hyperlink-type">type</a></code> attributes can be combined - when specified with the <code title="rel-alternate"><a href="#link-type-alternate">alternate</a></code> - keyword.</p><div class="example"> + elements.</p><p>The meaning of this keyword depends on the values of the other + attributes.</p><dl class="switch"><dt>If the element is a <code><a href="semantics.html#the-link-element">link</a></code> element and the <code title="attr-link-rel"><a href="semantics.html#attr-link-rel">rel</a></code> attribute also contains the + keyword <code title="rel-stylesheet"><a href="#link-type-stylesheet">stylesheet</a></code></dt> - <p>For example, the following link is a French translation that - uses the PDF format:</p> + <dd> - <pre><link rel=alternate type=application/pdf hreflang=fr href=manual-fr></pre> + <p>The <code title="rel-alternate"><a href="#link-type-alternate">alternate</a></code> keyword + modifies the meaning of the <code title="rel-stylesheet"><a href="#link-type-stylesheet">stylesheet</a></code> keyword in the way + described for that keyword. The <code title="rel-alternate"><a href="#link-type-alternate">alternate</a></code> keyword does not create a + link of its own.</p> - </div><p>The <code title="rel-alternate"><a href="#link-type-alternate">alternate</a></code> link - relationship is transitive — that is, if a document links to - two other documents with the link type "<code title="rel-alternate"><a href="#link-type-alternate">alternate</a></code>", then, in addition to - implying that those documents are alternative representations of the - first document, it is also implying that those two documents are - alternative representations of each other.</p><h5 id="link-type-archives"><span class="secno">4.12.2.2 </span>Link type "<dfn title="rel-archives"><code>archives</code></dfn>"</h5><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p><p>The <code title="rel-archives"><a href="#link-type-archives">archives</a></code> keyword may be + </dd> + + + <dt>The <code title="rel-alternate"><a href="#link-type-alternate">alternate</a></code> keyword is + used with the <code title="attr-hyperlink-type"><a href="#attr-hyperlink-type">type</a></code> + attribute set to the value <code title="">application/rss+xml</code> or the value <code title="">application/atom+xml</code></dt> + + <dd> + + <p>The link is a <a href="semantics.html#hyperlink-link" title="hyperlink link">hyperlink</a> + referencing a syndication feed (though not necessarily syndicating + exactly the same content as the current page).</p> + + + + </dd> + + + <dt>Otherwise</dt> + + <dd> + + <p>The link is a <a href="semantics.html#hyperlink-link" title="hyperlink link">hyperlink</a> + referencing an alternate representation of the current + document.</p> + + <p>The nature of the referenced document is given by the <code title="attr-hyperlink-media"><a href="#attr-hyperlink-media">media</a></code>, <code title="attr-hyperlink-hreflang"><a href="#attr-hyperlink-hreflang">hreflang</a></code>, and <code title="attr-hyperlink-type"><a href="#attr-hyperlink-type">type</a></code> attributes.</p> + + <p>If the <code title="rel-alternate"><a href="#link-type-alternate">alternate</a></code> keyword is + used with the <code title="attr-hyperlink-media"><a href="#attr-hyperlink-media">media</a></code> + attribute, it indicates that the referenced document is intended for + use with the media specified.</p> + + <p>If the <code title="rel-alternate"><a href="#link-type-alternate">alternate</a></code> keyword is + used with the <code title="attr-hyperlink-hreflang"><a href="#attr-hyperlink-hreflang">hreflang</a></code> + attribute, and that attribute's value differs from the <a href="infrastructure.html#root-element">root + element</a>'s <a href="#language">language</a>, it indicates that the + referenced document is a translation.</p> + + <p>If the <code title="rel-alternate"><a href="#link-type-alternate">alternate</a></code> keyword is + used with the <code title="attr-hyperlink-type"><a href="#attr-hyperlink-type">type</a></code> + attribute, it indicates that the referenced document is a + reformulation of the current document in the specified format.</p> + + <p>The <code title="attr-hyperlink-media"><a href="#attr-hyperlink-media">media</a></code>, <code title="attr-hyperlink-hreflang"><a href="#attr-hyperlink-hreflang">hreflang</a></code>, and <code title="attr-hyperlink-type"><a href="#attr-hyperlink-type">type</a></code> attributes can be combined + when specified with the <code title="rel-alternate"><a href="#link-type-alternate">alternate</a></code> + keyword.</p> + + <div class="example"> + + <p>For example, the following link is a French translation that + uses the PDF format:</p> + + <pre><link rel=alternate type=application/pdf hreflang=fr href=manual-fr></pre> + + </div> + + <p>This relationship is transitive — that is, if a document + links to two other documents with the link type "<code title="rel-alternate"><a href="#link-type-alternate">alternate</a></code>", then, in addition to + implying that those documents are alternative representations of + the first document, it is also implying that those two documents + are alternative representations of each other.</p> + + </dd> + + </dl><h5 id="link-type-archives"><span class="secno">4.12.2.2 </span>Link type "<dfn title="rel-archives"><code>archives</code></dfn>"</h5><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p><p>The <code title="rel-archives"><a href="#link-type-archives">archives</a></code> keyword may be used with <code><a href="semantics.html#the-link-element">link</a></code>, <code><a href="text-level-semantics.html#the-a-element">a</a></code>, and <code><a href="the-map-element.html#the-area-element">area</a></code> elements. For <code><a href="semantics.html#the-link-element">link</a></code> elements, it creates a <a href="semantics.html#hyperlink-link" title="hyperlink link">hyperlink</a>.</p><p>The <code title="rel-archives"><a href="#link-type-archives">archives</a></code> keyword indicates that the referenced document describes a collection of records, Index: spec.html =================================================================== RCS file: /sources/public/html5/spec-author-view/spec.html,v retrieving revision 1.837 retrieving revision 1.838 diff -u -d -r1.837 -r1.838 --- spec.html 4 Apr 2010 06:37:55 -0000 1.837 +++ spec.html 4 Apr 2010 07:07:27 -0000 1.838 @@ -305,7 +305,7 @@ </dl><p>This specification is available in the following formats: <a href=spec.html>single page HTML</a>, <a href=Overview.html>multipage HTML</a>. -This is revision 1.3985. +This is revision 1.3986. </p> <p class=copyright><a href=http://www.w3.org/Consortium/Legal/ipr-notice#Copyright>Copyright</a> © 2010 <a href=http://www.w3.org/><abbr title="World Wide @@ -21723,39 +21723,83 @@ * http://microformats.org/wiki/rel-enclosure --><h5 id=link-type-alternate><span class=secno>4.12.2.1 </span>Link type "<dfn title=rel-alternate><code>alternate</code></dfn>"</h5><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p><p>The <code title=rel-alternate><a href=#link-type-alternate>alternate</a></code> keyword may be used with <code><a href=#the-link-element>link</a></code>, <code><a href=#the-a-element>a</a></code>, and <code><a href=#the-area-element>area</a></code> - elements. For <code><a href=#the-link-element>link</a></code> elements, if the <code title=attr-link-rel><a href=#attr-link-rel>rel</a></code> attribute does not also contain the - keyword <code title=rel-stylesheet><a href=#link-type-stylesheet>stylesheet</a></code>, it creates a - <a href=#hyperlink-link title="hyperlink link">hyperlink</a>; but if it - <em>does</em> also contain the keyword <code title=rel-stylesheet><a href=#link-type-stylesheet>stylesheet</a></code>, the <code title=rel-alternate><a href=#link-type-alternate>alternate</a></code> keyword instead modifies the - meaning of the <code title=rel-stylesheet><a href=#link-type-stylesheet>stylesheet</a></code> - keyword in the way described for that keyword, and the rest of this - subsection doesn't apply.</p><p>The <code title=rel-alternate><a href=#link-type-alternate>alternate</a></code> keyword - indicates that the referenced document is an alternate - representation of the current document.</p><p>The nature of the referenced document is given by the <code title=attr-hyperlink-media><a href=#attr-hyperlink-media>media</a></code>, <code title=attr-hyperlink-hreflang><a href=#attr-hyperlink-hreflang>hreflang</a></code>, and <code title=attr-hyperlink-type><a href=#attr-hyperlink-type>type</a></code> attributes.</p><p>If the <code title=rel-alternate><a href=#link-type-alternate>alternate</a></code> keyword is - used with the <code title=attr-hyperlink-media><a href=#attr-hyperlink-media>media</a></code> - attribute, it indicates that the referenced document is intended for - use with the media specified.</p><p>If the <code title=rel-alternate><a href=#link-type-alternate>alternate</a></code> keyword is - used with the <code title=attr-hyperlink-hreflang><a href=#attr-hyperlink-hreflang>hreflang</a></code> - attribute, and that attribute's value differs from the <a href=#root-element>root - element</a>'s <a href=#language>language</a>, it indicates that the - referenced document is a translation.</p><p>If the <code title=rel-alternate><a href=#link-type-alternate>alternate</a></code> keyword is - used with the <code title=attr-hyperlink-type><a href=#attr-hyperlink-type>type</a></code> - attribute, it indicates that the referenced document is a - reformulation of the current document in the specified format.</p><p>The <code title=attr-hyperlink-media><a href=#attr-hyperlink-media>media</a></code>, <code title=attr-hyperlink-hreflang><a href=#attr-hyperlink-hreflang>hreflang</a></code>, and <code title=attr-hyperlink-type><a href=#attr-hyperlink-type>type</a></code> attributes can be combined - when specified with the <code title=rel-alternate><a href=#link-type-alternate>alternate</a></code> - keyword.</p><div class=example> + elements.</p><p>The meaning of this keyword depends on the values of the other + attributes.</p><dl class=switch><dt>If the element is a <code><a href=#the-link-element>link</a></code> element and the <code title=attr-link-rel><a href=#attr-link-rel>rel</a></code> attribute also contains the + keyword <code title=rel-stylesheet><a href=#link-type-stylesheet>stylesheet</a></code></dt> - <p>For example, the following link is a French translation that - uses the PDF format:</p> + <dd> - <pre><link rel=alternate type=application/pdf hreflang=fr href=manual-fr></pre> + <p>The <code title=rel-alternate><a href=#link-type-alternate>alternate</a></code> keyword + modifies the meaning of the <code title=rel-stylesheet><a href=#link-type-stylesheet>stylesheet</a></code> keyword in the way + described for that keyword. The <code title=rel-alternate><a href=#link-type-alternate>alternate</a></code> keyword does not create a + link of its own.</p> - </div><p>The <code title=rel-alternate><a href=#link-type-alternate>alternate</a></code> link - relationship is transitive — that is, if a document links to - two other documents with the link type "<code title=rel-alternate><a href=#link-type-alternate>alternate</a></code>", then, in addition to - implying that those documents are alternative representations of the - first document, it is also implying that those two documents are - alternative representations of each other.</p><h5 id=link-type-archives><span class=secno>4.12.2.2 </span>Link type "<dfn title=rel-archives><code>archives</code></dfn>"</h5><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p><p>The <code title=rel-archives><a href=#link-type-archives>archives</a></code> keyword may be + </dd> + + + <dt>The <code title=rel-alternate><a href=#link-type-alternate>alternate</a></code> keyword is + used with the <code title=attr-hyperlink-type><a href=#attr-hyperlink-type>type</a></code> + attribute set to the value <code title="">application/rss+xml</code> or the value <code title="">application/atom+xml</code></dt> + + <dd> + + <p>The link is a <a href=#hyperlink-link title="hyperlink link">hyperlink</a> + referencing a syndication feed (though not necessarily syndicating + exactly the same content as the current page).</p> + + + + </dd> + + + <dt>Otherwise</dt> + + <dd> + + <p>The link is a <a href=#hyperlink-link title="hyperlink link">hyperlink</a> + referencing an alternate representation of the current + document.</p> + + <p>The nature of the referenced document is given by the <code title=attr-hyperlink-media><a href=#attr-hyperlink-media>media</a></code>, <code title=attr-hyperlink-hreflang><a href=#attr-hyperlink-hreflang>hreflang</a></code>, and <code title=attr-hyperlink-type><a href=#attr-hyperlink-type>type</a></code> attributes.</p> + + <p>If the <code title=rel-alternate><a href=#link-type-alternate>alternate</a></code> keyword is + used with the <code title=attr-hyperlink-media><a href=#attr-hyperlink-media>media</a></code> + attribute, it indicates that the referenced document is intended for + use with the media specified.</p> + + <p>If the <code title=rel-alternate><a href=#link-type-alternate>alternate</a></code> keyword is + used with the <code title=attr-hyperlink-hreflang><a href=#attr-hyperlink-hreflang>hreflang</a></code> + attribute, and that attribute's value differs from the <a href=#root-element>root + element</a>'s <a href=#language>language</a>, it indicates that the + referenced document is a translation.</p> + + <p>If the <code title=rel-alternate><a href=#link-type-alternate>alternate</a></code> keyword is + used with the <code title=attr-hyperlink-type><a href=#attr-hyperlink-type>type</a></code> + attribute, it indicates that the referenced document is a + reformulation of the current document in the specified format.</p> + + <p>The <code title=attr-hyperlink-media><a href=#attr-hyperlink-media>media</a></code>, <code title=attr-hyperlink-hreflang><a href=#attr-hyperlink-hreflang>hreflang</a></code>, and <code title=attr-hyperlink-type><a href=#attr-hyperlink-type>type</a></code> attributes can be combined + when specified with the <code title=rel-alternate><a href=#link-type-alternate>alternate</a></code> + keyword.</p> + + <div class=example> + + <p>For example, the following link is a French translation that + uses the PDF format:</p> + + <pre><link rel=alternate type=application/pdf hreflang=fr href=manual-fr></pre> + + </div> + + <p>This relationship is transitive — that is, if a document + links to two other documents with the link type "<code title=rel-alternate><a href=#link-type-alternate>alternate</a></code>", then, in addition to + implying that those documents are alternative representations of + the first document, it is also implying that those two documents + are alternative representations of each other.</p> + + </dd> + + </dl><h5 id=link-type-archives><span class=secno>4.12.2.2 </span>Link type "<dfn title=rel-archives><code>archives</code></dfn>"</h5><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p><p>The <code title=rel-archives><a href=#link-type-archives>archives</a></code> keyword may be used with <code><a href=#the-link-element>link</a></code>, <code><a href=#the-a-element>a</a></code>, and <code><a href=#the-area-element>area</a></code> elements. For <code><a href=#the-link-element>link</a></code> elements, it creates a <a href=#hyperlink-link title="hyperlink link">hyperlink</a>.</p><p>The <code title=rel-archives><a href=#link-type-archives>archives</a></code> keyword indicates that the referenced document describes a collection of records,
Received on Sunday, 4 April 2010 07:07:31 UTC