Fix lack of consistency of naming of confidence flags. (bug 6423) (credit: hs) (whatwg r3122)

Fix lack of consistency of naming of confidence flags. (bug 6423)
(credit: hs) (whatwg r3122)
http://www.w3.org/Bugs/Public/show_bug.cgi?id=6423

Diffs for this change per section: 
http://people.w3.org/mike/diffs/html5/spec/Overview.1.2280.html#concept-encoding-confidence
http://people.w3.org/mike/diffs/html5/spec/Overview.1.2280.html#change-the-encoding

http://people.w3.org/mike/diffs/html5/spec/Overview.diff.html
http://dev.w3.org/cvsweb/html5/spec/Overview.html?r1=1.2279&r2=1.2280&f=h
http://html5.org/tools/web-apps-tracker?from=3121&to=3122

===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.2279
retrieving revision 1.2280
diff -u -d -r1.2279 -r1.2280
--- Overview.html 24 May 2009 05:32:35 -0000 1.2279
+++ Overview.html 24 May 2009 05:42:50 -0000 1.2280
@@ -52896,7 +52896,7 @@
   <dfn id="concept-encoding-confidence" title="concept-encoding-confidence">confidence</dfn>. The
   confidence is either <i>tentative</i>, <i>certain</i>, or
   <i>irrelevant</i>. The encoding used, and whether the confidence in
-  that encoding is <i>tentative</i> or <i>confident</i>, is <a href="#meta-charset-during-parse">used during the parsing</a> to
+  that encoding is <i>tentative</i> or <i>certain</i>, is <a href="#meta-charset-during-parse">used during the parsing</a> to
   determine whether to <a href="#change-the-encoding">change the encoding</a>. If no
   encoding is necessary, e.g. because the parser is operating on a
   stream of Unicode characters and doesn't have to use an encoding at
@@ -53337,7 +53337,7 @@
    <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>confident</i> and abort these steps. This happens when the
+   <i>certain</i> and abort these steps. This happens when the
    encoding information found in the file matches what the
    <a href="#encoding-sniffing-algorithm">encoding sniffing algorithm</a> determined to be the
    encoding, and in the second pass through the parser if the first
@@ -53351,21 +53351,21 @@
    to the new converter for the encoding on the fly. Set the
    <a href="#document-s-character-encoding">document's character encoding</a> and the encoding used to
    convert the input stream to the new encoding, set the <a href="#concept-encoding-confidence" title="concept-encoding-confidence">confidence</a> to
-   <i>confident</i>, and abort these steps.</li>
+   <i>certain</i>, and abort these steps.</li>
 
    <li>Otherwise, <a href="#navigate">navigate</a> to the document again, with
    <a href="#replacement-enabled">replacement enabled</a>, and using the same <a href="#source-browsing-context">source
    browsing context</a>, but this time skip the <a href="#encoding-sniffing-algorithm">encoding
    sniffing algorithm</a> and instead just set the encoding to the
    new encoding and the <a href="#concept-encoding-confidence" title="concept-encoding-confidence">confidence</a> to
-   <i>confident</i>. Whenever possible, this should be done without
+   <i>certain</i>. Whenever possible, this should be done without
    actually contacting the network layer (the bytes should be
    re-parsed from memory), even if, e.g., the document is marked as
    not being cacheable. If this is not possible and contacting the
    network layer would involve repeating a request that uses a method
    other than HTTP GET (<a href="#concept-http-equivalent-get" title="concept-http-equivalent-get">or
    equivalent</a> for non-HTTP URLs), then instead set the <a href="#concept-encoding-confidence" title="concept-encoding-confidence">confidence</a> to
-   <i>confident</i> and ignore the new encoding. The resource will be
+   <i>certain</i> and ignore the new encoding. The resource will be
    misinterpreted. User agents may notify the user of the situation,
    to aid in application development.</li>

Received on Sunday, 24 May 2009 05:45:02 UTC