[html5] r5270 - [giow] (2) Allow UAs to provide encoding override UI.

[whatwg at whatwg.org]

Author: ianh
Date: 2010-08-09 23:53:47 -0700 (Mon, 09 Aug 2010)
New Revision: 5270

Modified:
   complete.html
   index
   source
Log:
[giow] (2) Allow UAs to provide encoding override UI.

Modified: complete.html
===================================================================
--- complete.html	2010-08-10 06:51:05 UTC (rev 5269)
+++ complete.html	2010-08-10 06:53:47 UTC (rev 5270)
@@ -78197,7 +78197,12 @@
   all, then the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> is
   <i>irrelevant</i>.</p>
 
-  <ol><li><p>If the transport layer specifies an encoding, and it is
+  <ol><li><p>If the user has explicitly instructed the user agent to
+   override the document's character encoding with a specific
+   encoding, optionally return that encoding with the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a>
+   <i>certain</i> and abort these steps.</li>
+
+   <li><p>If the transport layer specifies an encoding, and it is
    supported, return that encoding with the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a>
    <i>certain</i>, and abort these steps.</li>
 

Modified: index
===================================================================
--- index	2010-08-10 06:51:05 UTC (rev 5269)
+++ index	2010-08-10 06:53:47 UTC (rev 5270)
@@ -71307,7 +71307,12 @@
   all, then the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> is
   <i>irrelevant</i>.</p>
 
-  <ol><li><p>If the transport layer specifies an encoding, and it is
+  <ol><li><p>If the user has explicitly instructed the user agent to
+   override the document's character encoding with a specific
+   encoding, optionally return that encoding with the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a>
+   <i>certain</i> and abort these steps.</li>
+
+   <li><p>If the transport layer specifies an encoding, and it is
    supported, return that encoding with the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a>
    <i>certain</i>, and abort these steps.</li>
 

Modified: source
===================================================================
--- source	2010-08-10 06:51:05 UTC (rev 5269)
+++ source	2010-08-10 06:53:47 UTC (rev 5270)
@@ -89208,6 +89208,12 @@
 
   <ol>
 
+   <li><p>If the user has explicitly instructed the user agent to
+   override the document's character encoding with a specific
+   encoding, optionally return that encoding with the <span
+   title="concept-encoding-confidence">confidence</span>
+   <i>certain</i> and abort these steps.</p></li>
+
    <li><p>If the transport layer specifies an encoding, and it is
    supported, return that encoding with the <span
    title="concept-encoding-confidence">confidence</span>