W3C home > Mailing lists > Public > public-html-commits@w3.org > May 2011

html5/spec semantics.html,1.1051,1.1052 spec.html,1.1464,1.1465

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Wed, 04 May 2011 18:47:05 +0000
To: public-html-commits@w3.org
Message-Id: <E1QHh6H-0001jW-36@lionel-hutz.w3.org>
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv6558

Modified Files:
	semantics.html spec.html 
Log Message:
Try to clarify some requirements for the validator. (whatwg r6061)

[updated by splitter]


Index: semantics.html
===================================================================
RCS file: /sources/public/html5/spec/semantics.html,v
retrieving revision 1.1051
retrieving revision 1.1052
diff -u -d -r1.1051 -r1.1052
--- semantics.html	3 May 2011 22:46:54 -0000	1.1051
+++ semantics.html	4 May 2011 18:47:02 -0000	1.1052
@@ -1282,11 +1282,10 @@
     the character encoding name of the <a href="#character-encoding-declaration">character encoding
     declaration</a>.</p>
 
-    <p>If the document contains a <code><a href="#the-meta-element">meta</a></code> element with an
-    <code title="attr-meta-http-equiv"><a href="#attr-meta-http-equiv">http-equiv</a></code> attribute in
-    the <a href="#attr-meta-http-equiv-content-type" title="attr-meta-http-equiv-content-type">Encoding
-    declaration state</a>, then the document must not contain a
-    <code><a href="#the-meta-element">meta</a></code> element with the <code title="attr-meta-charset"><a href="#attr-meta-charset">charset</a></code> attribute present.</p>
+    <p>A document must not contain both a <code><a href="#the-meta-element">meta</a></code> element
+    with an <code title="attr-meta-http-equiv"><a href="#attr-meta-http-equiv">http-equiv</a></code>
+    attribute in the <a href="#attr-meta-http-equiv-content-type" title="attr-meta-http-equiv-content-type">Encoding declaration
+    state</a> and a <code><a href="#the-meta-element">meta</a></code> element with the <code title="attr-meta-charset"><a href="#attr-meta-charset">charset</a></code> attribute present.</p>
 
     <p>The <a href="#attr-meta-http-equiv-content-type" title="attr-meta-http-equiv-content-type">Encoding
     declaration state</a> may be used in <a href="dom.html#html-documents">HTML
@@ -1594,9 +1593,9 @@
    completely within the first 1024 bytes of the document.</span></li>
    
 
-   <li>There can only be one character encoding declaration in the
-   document.</li> 
-  </ul><p>If an <a href="dom.html#html-documents" title="HTML documents">HTML document</a> does not
+  </ul><p>In addition, due to a number of restrictions on <code><a href="#the-meta-element">meta</a></code>
+  elements, there can only be one <code><a href="#the-meta-element">meta</a></code>-based character
+  encoding declaration per document.</p><p>If an <a href="dom.html#html-documents" title="HTML documents">HTML document</a> does not
   start with a BOM, and if its encoding is not explicitly given by
   <a href="fetching-resources.html#content-type" title="Content-Type">Content-Type metadata</a>, and the
   document is not <a href="the-iframe-element.html#an-iframe-srcdoc-document">an <code>iframe</code> <code title="attr-iframe-srcdoc">srcdoc</code> document</a>, then the

Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.1464
retrieving revision 1.1465
diff -u -d -r1.1464 -r1.1465
--- spec.html	4 May 2011 00:47:37 -0000	1.1464
+++ spec.html	4 May 2011 18:47:02 -0000	1.1465
@@ -344,7 +344,7 @@
 
    <h1>HTML5</h1>
    <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-   <h2 class="no-num no-toc" id="editor-s-draft-3-may-2011">Editor's Draft 3 May 2011</h2>
+   <h2 class="no-num no-toc" id="editor-s-draft-4-may-2011">Editor's Draft 4 May 2011</h2>
    <dl><dt>Latest Published Version:</dt>
     <dd><a href="http://www.w3.org/TR/html5/">http://www.w3.org/TR/html5/</a></dd>
     <dt>Latest Editor's Draft:</dt>
@@ -367,7 +367,7 @@
     <a href="Overview.html">single page HTML</a>,
     <a href="spec.html">multipage HTML</a>,
     <a href="author/">web developer edition</a>.
-This is revision 1.4866.
+This is revision 1.4867.
    </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
@@ -487,7 +487,7 @@
   Group</a> is the W3C working group responsible for this
   specification's progress along the W3C Recommendation
   track.
-  This specification is the 3 May 2011 Editor's Draft.
+  This specification is the 4 May 2011 Editor's Draft.
   </p><!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><p>Work on this specification is also done at the <a href="http://www.whatwg.org/">WHATWG</a>. The W3C HTML working group
   actively pursues convergence with the WHATWG, as required by the <a href="http://www.w3.org/2007/03/HTML-WG-charter">W3C HTML working
   group charter</a>.</p><!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><p>This document was produced by a group operating under the <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5
Received on Wednesday, 4 May 2011 18:47:06 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Wednesday, 4 May 2011 18:47:06 GMT