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

html5/spec Overview.html,1.4866,1.4867

From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
Date: Wed, 04 May 2011 18:19:07 +0000
To: public-html-commits@w3.org
Message-Id: <E1QHgfD-0000ZZ-AT@lionel-hutz.w3.org>
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv2185

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

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.4866
retrieving revision 1.4867
diff -u -d -r1.4866 -r1.4867
--- Overview.html	3 May 2011 23:49:55 -0000	1.4866
+++ Overview.html	4 May 2011 18:19:02 -0000	1.4867
@@ -340,7 +340,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>
@@ -483,7 +483,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
@@ -11929,11 +11929,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="#html-documents">HTML
@@ -12241,9 +12240,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="#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="#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="#content-type" title="Content-Type">Content-Type metadata</a>, and the
   document is not <a href="#an-iframe-srcdoc-document">an <code>iframe</code> <code title="attr-iframe-srcdoc">srcdoc</code> document</a>, then the
Received on Wednesday, 4 May 2011 18:19:09 GMT

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