html5/spec association-of-controls-and-forms.html,1.18,1.19 parsing.html,1.12,1.13 spec.html,1.1124,1.1125 syntax.html,1.1004,1.1005

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

Modified Files:
	association-of-controls-and-forms.html parsing.html spec.html 
	syntax.html 
Log Message:
Allow UAs to provide encoding override UI. (whatwg r5270)

[updated by splitter]


Index: association-of-controls-and-forms.html
===================================================================
RCS file: /sources/public/html5/spec/association-of-controls-and-forms.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- association-of-controls-and-forms.html	10 Aug 2010 06:46:48 -0000	1.18
+++ association-of-controls-and-forms.html	10 Aug 2010 06:56:43 -0000	1.19
@@ -429,7 +429,7 @@
    outer form "a".</p>
 
    <p>This happens as follows: First, the "e" node gets associated
-   with "c" in the <a href="parsing.html#html-parser">HTML parser</a>. Theh, the <code title="dom-innerHTML"><a href="apis-in-html-documents.html#dom-innerhtml">innerHTML</a></code> algorithm moves the nodes
+   with "c" in the <a href="parsing.html#html-parser">HTML parser</a>. Then, the <code title="dom-innerHTML"><a href="apis-in-html-documents.html#dom-innerhtml">innerHTML</a></code> algorithm moves the nodes
    from the temporary document to the "b" element. At this point, the
    nodes see their ancestor chain change, and thus all the "magic"
    associations done by the parser are reset to normal ancestor

Index: parsing.html
===================================================================
RCS file: /sources/public/html5/spec/parsing.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- parsing.html	10 Aug 2010 01:26:43 -0000	1.12
+++ parsing.html	10 Aug 2010 06:56:43 -0000	1.13
@@ -407,7 +407,8 @@
 
   <p>In the common case, the data handled by the tokenization stage
   comes from the network, but <a href="apis-in-html-documents.html#dynamic-markup-insertion" title="dynamic markup
-  insertion">it can also come from script</a>, e.g. using the <code title="dom-document-write"><a href="apis-in-html-documents.html#dom-document-write">document.write()</a></code> API.</p>
+  insertion">it can also come from script</a> running in the user
+  agent, e.g. using the <code title="dom-document-write"><a href="apis-in-html-documents.html#dom-document-write">document.write()</a></code> API.</p>
 
   <p><img alt="" src="http://dev.w3.org/html5/spec/images/parsing-model-overview.png"></p>
 
@@ -482,7 +483,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.</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.</p></li>
 

Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.1124
retrieving revision 1.1125
diff -u -d -r1.1124 -r1.1125
--- spec.html	10 Aug 2010 06:46:49 -0000	1.1124
+++ spec.html	10 Aug 2010 06:56:43 -0000	1.1125
@@ -334,7 +334,7 @@
     <a href="Overview.html">single page HTML</a>,
     <a href="spec.html">multipage HTML</a>,
     <a href="author/">author edition</a>.
-This is revision 1.4197.
+This is revision 1.4199.
    </p> 
      <p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a>
    &#169; 2010 <a href="http://www.w3.org/"><abbr title="World Wide

Index: syntax.html
===================================================================
RCS file: /sources/public/html5/spec/syntax.html,v
retrieving revision 1.1004
retrieving revision 1.1005
diff -u -d -r1.1004 -r1.1005
--- syntax.html	10 Aug 2010 06:46:49 -0000	1.1004
+++ syntax.html	10 Aug 2010 06:56:43 -0000	1.1005
@@ -883,13 +883,12 @@
   TABULATION, U+000A LINE FEED (LF), U+000C FORM FEED (FF), U+000D
   CARRIAGE RETURN (CR), U+0020 SPACE, U+003E GREATER-THAN SIGN (&gt;), or
   U+002F SOLIDUS (/).</p><h4 id="text-0"><span class="secno">8.1.3 </span>Text</h4><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p><p><dfn id="syntax-text" title="syntax-text">Text</dfn> is allowed inside elements,
-  attributes, and comments. Text must consist of Unicode characters.
-  Text must not contain U+0000 characters. Text must not contain
-  permanently undefined Unicode characters (noncharacters). Text must
-  not contain control characters other than <a href="common-microsyntaxes.html#space-character" title="space
-  character">space characters</a>. Extra constraints are placed on
-  what is and what is not allowed in text based on where the text is
-  to be put, as described in the other sections.</p><h5 id="newlines"><span class="secno">8.1.3.1 </span>Newlines</h5><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p><p><dfn id="syntax-newlines" title="syntax-newlines">Newlines</dfn> in HTML may be
+  attribute values, and comments. Text must consist of Unicode
+  characters. Text must not contain U+0000 characters. Text must not
+  contain permanently undefined Unicode characters (noncharacters).
+  Text must not contain control characters other than <a href="common-microsyntaxes.html#space-character" title="space character">space characters</a>. Extra constraints
+  are placed on what is and what is not allowed in text based on where
+  the text is to be put, as described in the other sections.</p><h5 id="newlines"><span class="secno">8.1.3.1 </span>Newlines</h5><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p><p><dfn id="syntax-newlines" title="syntax-newlines">Newlines</dfn> in HTML may be
   represented either as U+000D CARRIAGE RETURN (CR) characters, U+000A
   LINE FEED (LF) characters, or pairs of U+000D CARRIAGE RETURN (CR),
   U+000A LINE FEED (LF) characters in that order.</p><p>Where <a href="#syntax-charref" title="syntax-charref">character references</a>

Received on Tuesday, 10 August 2010 06:56:48 UTC