html5/spec Overview.html,1.5448,1.5449

Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv21763

Modified Files:
	Overview.html 
Log Message:
When a page interpreted as UTF-8 has a <meta charset> saying UTF-16, the spec used to say to reload even though the encoding didn't change. (whatwg r6814)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.5448
retrieving revision 1.5449
diff -u -d -r1.5448 -r1.5449
--- Overview.html	2 Nov 2011 17:01:11 -0000	1.5448
+++ Overview.html	2 Nov 2011 20:40:26 -0000	1.5449
@@ -56877,7 +56877,16 @@
   failed to find an encoding, or if it found an encoding that was not
   the actual encoding of the file.</p>
 
-  <ol><li>If the new encoding is identical or equivalent to the encoding
+  <ol><li>If the encoding that is already being used to interpret the
+   input stream is <a href="#a-utf-16-encoding">a UTF-16 encoding</a>, then set the <a href="#concept-encoding-confidence" title="concept-encoding-confidence">confidence</a> to
+   <i>certain</i> and abort these steps. The new encoding is ignored;
+   if it was anything but the same encoding, then it would be clearly
+   incorrect.</li>
+
+   <li>If the new encoding is <a href="#a-utf-16-encoding">a UTF-16 encoding</a>, change
+   it to UTF-8.</li>
+
+   <li>If the new encoding is identical or equivalent to the encoding
    that is already being used to interpret the input stream, then set
    the <a href="#concept-encoding-confidence" title="concept-encoding-confidence">confidence</a> to
    <i>certain</i> and abort these steps. This happens when the
@@ -56887,15 +56896,6 @@
    pass found that the encoding sniffing algorithm described in the
    earlier section failed to find the right encoding.</li>
 
-   <li>If the encoding that is already being used to interpret the
-   input stream is <a href="#a-utf-16-encoding">a UTF-16 encoding</a>, then set the <a href="#concept-encoding-confidence" title="concept-encoding-confidence">confidence</a> to
-   <i>certain</i> and abort these steps. The new encoding is ignored;
-   if it was anything but the same encoding, then it would be clearly
-   incorrect.</li>
-
-   <li>If the new encoding is <a href="#a-utf-16-encoding">a UTF-16 encoding</a>, change
-   it to UTF-8.</li>
-
    <li>If all the bytes up to the last byte converted by the current
    decoder have the same Unicode interpretations in both the current
    encoding and the new encoding, and if the user agent supports

Received on Wednesday, 2 November 2011 20:40:37 UTC