eliot: Reworded Section 3 to comply with requests in bug 12062; Rewrote Section 7.2 Language Attributes, in accordance with requests in bug 10152;

eliot: Reworded Section 3 to comply with requests in bug 12062; Rewrote
Section 7.2 Language Attributes, in accordance with requests in bug
10152;

http://dev.w3.org/cvsweb/html5/html-xhtml-author-guide/html-xhtml-authoring-guide.html?r1=1.58&r2=1.59&f=h

===================================================================
RCS file: /sources/public/html5/html-xhtml-author-guide/html-xhtml-authoring-guide.html,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- html-xhtml-authoring-guide.html 1 Mar 2011 23:20:02 -0000 1.58
+++ html-xhtml-authoring-guide.html 2 Mar 2011 18:30:07 -0000 1.59
@@ -14,7 +14,7 @@
    <a href="http://www.w3.org/"><img height="48" width="72" alt="W3C" src="http://www.w3.org/Icons/w3c_home"/></a>
   </p>
   <h1 class="title" id="title">Polyglot Markup: HTML-Compatible XHTML Documents</h1>
-  <h2 id="w3c-editor-s-draft-05-january-2011">W3C Editor's Draft 1 March 2011</h2>
+  <h2 id="w3c-editor-s-draft-05-january-2011">W3C Editor's Draft 2 March 2011</h2>
   <dl>
    <dt>This version:</dt>
    <dd><a href="http://dev.w3.org/html5/html-xhtml-author-guide/html-xhtml-authoring-guide.html">http://dev.w3.org/html5/html-xhtml-author-guide/html-xhtml-authoring-guide.html</a></dd>
@@ -244,14 +244,18 @@
 <!--OddPage--><h2><span class="secno">3. </span>Specifying a Document's Character Encoding</h2>
  <p>
   <a class="internalDFN" href="#dfn-polyglot-markup" title="polyglot markup">Polyglot markup</a> uses either UTF-8 or UTF-16. UTF-8 is preferred.
-  When <a class="internalDFN" href="#dfn-polyglot-markup">polyglot markup</a> uses UTF-8, it does not include a BOM.
   When <a class="internalDFN" href="#dfn-polyglot-markup">polyglot markup</a> uses UTF-16, it includes the BOM indicating 
   little-endian UTF-16 or big-endian UTF-16. 
  </p>
  <p>
-  <a class="internalDFN" href="#dfn-polyglot-markup" title="polyglot markup">Polyglot markup</a> declares character encoding one of two ways:
+  <a class="internalDFN" href="#dfn-polyglot-markup" title="polyglot markup">Polyglot markup</a> declares character encoding in the following ways, which may be used separately or in combination 
+  (If used in combination, each approach contains identical encoding information):
   </p><ul>
-   <li>By using the BOM.</li>
+   <li>Within the document</li>
+    <ul>
+     <li>By using the BOM.</li>
+     <li>By relying on the default XML UTF-8 encoding in combination with the use of the <code>&lt;meta charset="UTF-8"/&gt;</code> element.</li>
+    </ul>
    <li>In the HTTP header of the response [<cite><a href="#bib-HTTP11" rel="biblioentry" class="bibref">HTTP11</a></cite>], as in the following:
     <p>
     <code>Content-type: text/html; charset=utf-8</code> 
@@ -715,13 +719,17 @@
  
  <div id="language-attributes" class="section">
  <h3><span class="secno">7.2 </span>Language Attributes</h3>
-  <p>When using language attributes, <a class="internalDFN" href="#dfn-polyglot-markup">polyglot markup</a> uses both the <code>lang</code> and <code>xml:lang</code> attributes. 
+  <p>When specifying the language mapping of an element, <a class="internalDFN" href="#dfn-polyglot-markup">polyglot markup</a> uses both the <code>lang</code> and <code>xml:lang</code> attributes. 
    Neither attribute is to be used without the other, and <a class="internalDFN" href="#dfn-polyglot-markup">polyglot markup</a> maintains identical values for both <code>lang</code> and <code>xml:lang</code>.</p>
   <p>
    <a class="internalDFN" href="#dfn-polyglot-markup" title="polyglot markup">Polyglot markup</a> uses the language attributes in the <code>html</code> element to set the default language for the document.
   </p>
   <p class="note">
-   If <a class="internalDFN" href="#dfn-polyglot-markup">polyglot markup</a> uses the <code>http-equiv</code> attribute on the <code>&lt;meta&gt;</code> element, <a class="internalDFN" href="#dfn-polyglot-markup">polyglot markup</a> <em title="must" class="rfc2119">must</em> use both the <code>lang</code> and <code>xml:lang</code> attributes.
+   Whenever the <code>http-equiv="content-language"</code> attribute on the <code>&lt;meta&gt;</code> element specifies the language of the root element, 
+   then it is required to specify the language mapping of the root element.
+   According to <a href="http://dev.w3.org/html5/spec/semantics.html#attr-meta-http-equiv-content-language">Content language state</a> in [<cite><a href="#bib-HTML5" rel="biblioentry" class="bibref">HTML5</a></cite>], 
+   the <code>http-equiv="content-language"</code> attribute on the <code>&lt;meta&gt;</code> element specifices the language of the root element 
+   whenever its <code>content</code> attribute contains no more and no less than exactly one language tag.
   </p>
 
 <!--End section: Language Attributes-->

Received on Wednesday, 2 March 2011 18:31:54 UTC