[html5] r7324 - [giow] (3) Attempt to slightly more closely align with reality. Affected topics: [...]

[whatwg at whatwg.org]

Author: ianh
Date: 2012-09-06 21:02:41 -0700 (Thu, 06 Sep 2012)
New Revision: 7324

Modified:
   complete.html
   index
   source
Log:
[giow] (3) Attempt to slightly more closely align with reality.
Affected topics: HTML Syntax and Parsing

Modified: complete.html
===================================================================
--- complete.html	2012-09-06 15:49:21 UTC (rev 7323)
+++ complete.html	2012-09-07 04:02:41 UTC (rev 7324)
@@ -88178,11 +88178,19 @@
   <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> is
   <i>irrelevant</i>.</p>
 
-  <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>
+  <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.</p>
+
+    <p class=note>Typically, user agents remember such user requests
+    across sessions, and in some cases apply them to documents in
+    <code><a href=#the-iframe-element>iframe</a></code>s as well.</p>
+
+   </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>
@@ -88259,6 +88267,13 @@
 
    </li>
 
+   <li><p>Otherwise, if the <code><a href=#document>Document</a></code> is in a <a href=#nested-browsing-context>nested
+   browsing context</a>, return the encoding of the <a href=#browsing-context-container>browsing
+   context container</a>'s <code><a href=#document>Document</a></code>'s <a href="#document's-character-encoding" title="document's character encoding">character encoding</a>,
+   with the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a>
+   <i>tentative</i>, and abort these steps.</li> <!-- not
+   carefully tested -->
+
    <li><p>Otherwise, if the user agent has information on the likely
    encoding for this page, e.g. based on the encoding of the page when
    it was last visited, then return that encoding, with the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a>

Modified: index
===================================================================
--- index	2012-09-06 15:49:21 UTC (rev 7323)
+++ index	2012-09-07 04:02:41 UTC (rev 7324)
@@ -88178,11 +88178,19 @@
   <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> is
   <i>irrelevant</i>.</p>
 
-  <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>
+  <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.</p>
+
+    <p class=note>Typically, user agents remember such user requests
+    across sessions, and in some cases apply them to documents in
+    <code><a href=#the-iframe-element>iframe</a></code>s as well.</p>
+
+   </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>
@@ -88259,6 +88267,13 @@
 
    </li>
 
+   <li><p>Otherwise, if the <code><a href=#document>Document</a></code> is in a <a href=#nested-browsing-context>nested
+   browsing context</a>, return the encoding of the <a href=#browsing-context-container>browsing
+   context container</a>'s <code><a href=#document>Document</a></code>'s <a href="#document's-character-encoding" title="document's character encoding">character encoding</a>,
+   with the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a>
+   <i>tentative</i>, and abort these steps.</li> <!-- not
+   carefully tested -->
+
    <li><p>Otherwise, if the user agent has information on the likely
    encoding for this page, e.g. based on the encoding of the page when
    it was last visited, then return that encoding, with the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a>

Modified: source
===================================================================
--- source	2012-09-06 15:49:21 UTC (rev 7323)
+++ source	2012-09-07 04:02:41 UTC (rev 7324)
@@ -102306,12 +102306,20 @@
 
   <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 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>
+
+    <p class="note">Typically, user agents remember such user requests
+    across sessions, and in some cases apply them to documents in
+    <code>iframe</code>s as well.</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>
@@ -102401,6 +102409,15 @@
 
    </li>
 
+   <li><p>Otherwise, if the <code>Document</code> is in a <span>nested
+   browsing context</span>, return the encoding of the <span>browsing
+   context container</span>'s <code>Document</code>'s <span
+   title="document's character encoding">character encoding</span>,
+   with the <span
+   title="concept-encoding-confidence">confidence</span>
+   <i>tentative</i>, and abort these steps.</p></li> <!-- not
+   carefully tested -->
+
    <li><p>Otherwise, if the user agent has information on the likely
    encoding for this page, e.g. based on the encoding of the page when
    it was last visited, then return that encoding, with the <span