[cgiowt] (1) Make the rules for <meta> processing for charset='' vs c…

…ontent='' attributes consistent. Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=11412 git-svn-id: http://svn.whatwg.org/webapps@5765 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Jan 11, 2011 · 63baa39 · 63baa39
1 parent 3fd32bc
commit 63baa39
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/complete.html b/complete.html
@@ -80498,9 +80498,10 @@ <h5 id=the-before-head-insertion-mode><span class=secno>12.2.5.6 </span>The "<df
     <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>
 

diff --git a/index b/index
@@ -76472,9 +76472,10 @@ document.body.appendChild(text);
     <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>
 

diff --git a/source b/source
@@ -91232,10 +91232,11 @@ document.body.appendChild(text);
     <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>