[e] (0) Tweak the wording per chair decision.

Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=12490 Affected topics: HTML git-svn-id: http://svn.whatwg.org/webapps@6956 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Jan 31, 2012 · a38c0ba · a38c0ba
1 parent d243048
commit a38c0ba
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 18 deletions.
diff --git a/complete.html b/complete.html
@@ -14538,14 +14538,20 @@ <h4 id=the-link-element><span class=secno>4.2.4 </span>The <dfn><code>link</code
 
   <div class=impl>
 
-  <p>HTTP <code title="">Link:</code> headers, if supported, must be
-  assumed to come before any links in the document, in the order that
-  they were given in the HTTP entity header. (URLs in these headers
-  are to be processed and resolved according to the rules given in the
-  relevant specification; the rules of <em>this</em> specification
-  don't apply.) <a href=#refsHTTP>[HTTP]</a> <a href=#refsWEBLINK>[WEBLINK]</a></p> <!-- WEBLINK is ref for Link:
+  <!--!--><!-- s/header fields/headers/ for consistency with the rest of the spec -->
+
+  <p>HTTP <code title=http-link>Link:</code> header fields, if
+  supported, must be assumed to come before any links in the document,
+  in the order that they were given in the HTTP message. These header
+  fields are to be processed according to the rules given in the
+  relevant specifications. <a href=#refsHTTP>[HTTP]</a> <a href=#refsWEBLINK>[WEBLINK]</a></p> <!-- WEBLINK is ref for Link:
   header -->
 
+  <p class=note>Registration of relation types in HTTP Link: header
+  fields is distinct from <a href=#linkTypes>HTML link types</a>,
+  and thus their semantics can be different from same-named HTML
+  types.</p>
+
   <p>The IDL attributes <dfn id=dom-link-href title=dom-link-href><code>href</code></dfn>, <dfn id=dom-link-rel title=dom-link-rel><code>rel</code></dfn>, <dfn id=dom-link-media title=dom-link-media><code>media</code></dfn>, <dfn id=dom-link-hreflang title=dom-link-hreflang><code>hreflang</code></dfn>, <dfn id=dom-link-type title=dom-link-type><code>type</code></dfn>, and <dfn id=dom-link-sizes title=dom-link-sizes><code>sizes</code></dfn> each must
   <a href=#reflect>reflect</a> the respective content attributes of the same
   name.</p>

diff --git a/index b/index
@@ -14538,14 +14538,20 @@ gave me some of the songs they wrote. I love sharing my music.&lt;/p&gt;
 
   <div class=impl>
 
-  <p>HTTP <code title="">Link:</code> headers, if supported, must be
-  assumed to come before any links in the document, in the order that
-  they were given in the HTTP entity header. (URLs in these headers
-  are to be processed and resolved according to the rules given in the
-  relevant specification; the rules of <em>this</em> specification
-  don't apply.) <a href=#refsHTTP>[HTTP]</a> <a href=#refsWEBLINK>[WEBLINK]</a></p> <!-- WEBLINK is ref for Link:
+  <!--!--><!-- s/header fields/headers/ for consistency with the rest of the spec -->
+
+  <p>HTTP <code title=http-link>Link:</code> header fields, if
+  supported, must be assumed to come before any links in the document,
+  in the order that they were given in the HTTP message. These header
+  fields are to be processed according to the rules given in the
+  relevant specifications. <a href=#refsHTTP>[HTTP]</a> <a href=#refsWEBLINK>[WEBLINK]</a></p> <!-- WEBLINK is ref for Link:
   header -->
 
+  <p class=note>Registration of relation types in HTTP Link: header
+  fields is distinct from <a href=#linkTypes>HTML link types</a>,
+  and thus their semantics can be different from same-named HTML
+  types.</p>
+
   <p>The IDL attributes <dfn id=dom-link-href title=dom-link-href><code>href</code></dfn>, <dfn id=dom-link-rel title=dom-link-rel><code>rel</code></dfn>, <dfn id=dom-link-media title=dom-link-media><code>media</code></dfn>, <dfn id=dom-link-hreflang title=dom-link-hreflang><code>hreflang</code></dfn>, <dfn id=dom-link-type title=dom-link-type><code>type</code></dfn>, and <dfn id=dom-link-sizes title=dom-link-sizes><code>sizes</code></dfn> each must
   <a href=#reflect>reflect</a> the respective content attributes of the same
   name.</p>

diff --git a/source b/source
@@ -15411,15 +15411,21 @@ gave me some of the songs they wrote. I love sharing my music.&lt;/p>
 
   <div class="impl">
 
-  <p>HTTP <code title="">Link:</code> headers, if supported, must be
-  assumed to come before any links in the document, in the order that
-  they were given in the HTTP entity header. (URLs in these headers
-  are to be processed and resolved according to the rules given in the
-  relevant specification; the rules of <em>this</em> specification
-  don't apply.) <a href="#refsHTTP">[HTTP]</a> <a
+  <!--!--><!-- s/header fields/headers/ for consistency with the rest of the spec -->
+
+  <p>HTTP <code title="http-link">Link:</code> header fields, if
+  supported, must be assumed to come before any links in the document,
+  in the order that they were given in the HTTP message. These header
+  fields are to be processed according to the rules given in the
+  relevant specifications. <a href="#refsHTTP">[HTTP]</a> <a
   href="#refsWEBLINK">[WEBLINK]</a></p> <!-- WEBLINK is ref for Link:
   header -->
 
+  <p class="note">Registration of relation types in HTTP Link: header
+  fields is distinct from <a href="#linkTypes">HTML link types</a>,
+  and thus their semantics can be different from same-named HTML
+  types.</p>
+
   <p>The IDL attributes <dfn
   title="dom-link-href"><code>href</code></dfn>, <dfn
   title="dom-link-rel"><code>rel</code></dfn>, <dfn