[html5] r5765 - [cgiowt] (1) Make the rules for <meta> processing for charset='' vs content='' a [...]

[whatwg at whatwg.org]

Author: ianh
Date: 2011-01-10 22:07:35 -0800 (Mon, 10 Jan 2011)
New Revision: 5765

Modified:
   complete.html
   index
   source
Log:
[cgiowt] (1) Make the rules for <meta> processing for charset='' vs content='' attributes consistent.
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=11412

Modified: complete.html
===================================================================
--- complete.html	2011-01-11 06:03:32 UTC (rev 5764)
+++ complete.html	2011-01-11 06:07:35 UTC (rev 5765)
@@ -80498,9 +80498,10 @@
     <code title=attr-meta-content><a href=#attr-meta-content>content</a></code> attribute, and
     applying the <a href=#algorithm-for-extracting-an-encoding-from-a-content-type>algorithm for extracting an encoding from a
     Content-Type</a> to that attribute's value returns a supported
-    encoding <var title="">encoding</var>, and the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> is currently
+    <a href=#ascii-compatible-character-encoding>ASCII-compatible character encoding</a> or a UTF-16
+    encoding, and the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> is currently
     <i>tentative</i>, then <a href=#change-the-encoding>change the encoding</a> to the
-    encoding <var title="">encoding</var>.</p>
+    extracted encoding.</p>
 
    </dd>
 

Modified: index
===================================================================
--- index	2011-01-11 06:03:32 UTC (rev 5764)
+++ index	2011-01-11 06:07:35 UTC (rev 5765)
@@ -76472,9 +76472,10 @@
     <code title=attr-meta-content><a href=#attr-meta-content>content</a></code> attribute, and
     applying the <a href=#algorithm-for-extracting-an-encoding-from-a-content-type>algorithm for extracting an encoding from a
     Content-Type</a> to that attribute's value returns a supported
-    encoding <var title="">encoding</var>, and the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> is currently
+    <a href=#ascii-compatible-character-encoding>ASCII-compatible character encoding</a> or a UTF-16
+    encoding, and the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> is currently
     <i>tentative</i>, then <a href=#change-the-encoding>change the encoding</a> to the
-    encoding <var title="">encoding</var>.</p>
+    extracted encoding.</p>
 
    </dd>
 

Modified: source
===================================================================
--- source	2011-01-11 06:03:32 UTC (rev 5764)
+++ source	2011-01-11 06:07:35 UTC (rev 5765)
@@ -91232,10 +91232,11 @@
     <code title="attr-meta-content">content</code> attribute, and
     applying the <span>algorithm for extracting an encoding from a
     Content-Type</span> to that attribute's value returns a supported
-    encoding <var title="">encoding</var>, and the <span
+    <span>ASCII-compatible character encoding</span> or a UTF-16
+    encoding, and the <span
     title="concept-encoding-confidence">confidence</span> is currently
     <i>tentative</i>, then <span>change the encoding</span> to the
-    encoding <var title="">encoding</var>.</p>
+    extracted encoding.</p>
 
    </dd>