html5/spec Overview.html,1.4198,1.4199

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

Modified Files:
	Overview.html 
Log Message:
Allow UAs to provide encoding override UI. (whatwg r5270)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.4198
retrieving revision 1.4199
diff -u -d -r1.4198 -r1.4199
--- Overview.html	10 Aug 2010 06:51:10 -0000	1.4198
+++ Overview.html	10 Aug 2010 06:53:52 -0000	1.4199
@@ -52692,7 +52692,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>
 

Received on Tuesday, 10 August 2010 06:53:58 UTC