[e] (0) Clarify the <meta charset> rules for XML documents.

git-svn-id: http://svn.whatwg.org/webapps@2860 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Feb 23, 2009 · bc76119 · bc76119
1 parent b609571
commit bc76119
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 14 deletions.
diff --git a/index b/index
@@ -9145,14 +9145,17 @@ http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20HTML%3E%0
   also be specified. Otherwise, it must be omitted.</p>
 
   <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>
+  UTF-8 character encoding. (The element has no effect in XML
+  documents, and is only allowed to facilitate migration to and from
+  XHTML.)</p>
+
+  <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>
 
   <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

diff --git a/source b/source
@@ -9488,15 +9488,19 @@ http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20HTML%3E%0
   also be specified. Otherwise, it must be omitted.</p>
 
   <p>The <dfn title="attr-meta-charset"><code>charset</code></dfn>
-  attribute specifies the character encoding used by the
-  document. This is called a <span>character encoding
-  declaration</span>. There must not be more than one element with a
-  <code title="attr-meta-charset">charset</code> attribute per
-  document. If the attribute is present in an <span title="XHTML">XML
-  document</span>, its value must be an <span>ASCII
+  attribute specifies the character encoding used by the document. In
+  <span title="HTML5">HTML documents</span> this is a <span>character
+  encoding declaration</span>. If the attribute is present in an <span
+  title="XHTML">XML document</span>, its value must be an <span>ASCII
   case-insensitive</span> match for the string "<code
   title="">UTF-8</code>", and the resource must be encoded using the
-  UTF-8 character encoding.</p>
+  UTF-8 character encoding. (The element has no effect in XML
+  documents, and is only allowed to facilitate migration to and from
+  XHTML.)</p>
+
+  <p>There must not be more than one <code>meta</code> element with a
+  <code title="attr-meta-charset">charset</code> attribute per
+  document.</p>
 
   <p>The <dfn title="attr-meta-content"><code>content</code></dfn>
   attribute gives the value of the document metadata or pragma