html5/spec Overview.html,1.2030,1.2031

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

Modified Files:
	Overview.html 
Log Message:
Clarify the <meta charset> rules for XML documents. (whatwg r2860)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.2030
retrieving revision 1.2031
diff -u -d -r1.2030 -r1.2031
--- Overview.html	23 Feb 2009 12:14:43 -0000	1.2030
+++ Overview.html	23 Feb 2009 12:26:53 -0000	1.2031
@@ -7495,14 +7495,15 @@
   specified.<p>If either <code title=attr-meta-name><a href=#attr-meta-name>name</a></code> or <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> is specified, then
   the <code title=attr-meta-content><a href=#attr-meta-content>content</a></code> attribute must
   also be specified. Otherwise, it must be omitted.<p>The <dfn id=attr-meta-charset title=attr-meta-charset><code>charset</code></dfn>
-  attribute specifies the character encoding used by the
-  document. This is called a <a href=#character-encoding-declaration>character encoding
-  declaration</a>. There must not be more than one element with a
-  <code title=attr-meta-charset><a href=#attr-meta-charset>charset</a></code> attribute per
-  document. If the attribute is present in an <a href=#xhtml5 title=XHTML>XML
-  document</a>, its value must be an <a href=#ascii-case-insensitive>ASCII
+  attribute specifies the character encoding used by the document. In
+  <a href=#html5 title=HTML5>HTML documents</a> this is a <a href=#character-encoding-declaration>character
+  encoding declaration</a>. If the attribute is present in an <a href=#xhtml5 title=XHTML>XML document</a>, its value must be an <a href=#ascii-case-insensitive>ASCII
   case-insensitive</a> match for the string "<code title="">UTF-8</code>", and the resource must be encoded using the
-  UTF-8 character encoding.<p>The <dfn id=attr-meta-content title=attr-meta-content><code>content</code></dfn>
+  UTF-8 character encoding. (The element has no effect in XML
+  documents, and is only allowed to facilitate migration to and from
+  XHTML.)<p>There must not be more than one <code><a href=#meta>meta</a></code> element with a
+  <code title=attr-meta-charset><a href=#attr-meta-charset>charset</a></code> attribute per
+  document.<p>The <dfn id=attr-meta-content title=attr-meta-content><code>content</code></dfn>
   attribute gives the value of the document metadata or pragma
   directive when the element is used for those purposes. The allowed
   values depend on the exact context, as described in subsequent

Received on Monday, 23 February 2009 12:27:05 UTC