eliot: Changed "This version" and "Latest Version" URL. Also edited 6.5.1.1 per bug 12279

eliot: Changed "This version" and "Latest Version" URL. Also edited
6.5.1.1 per bug 12279

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

===================================================================
RCS file: /sources/public/html5/html-xhtml-author-guide/html-xhtml-authoring-guide.html,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- html-xhtml-authoring-guide.html 8 Apr 2011 09:00:30 -0000 1.77
+++ html-xhtml-authoring-guide.html 8 Apr 2011 21:29:40 -0000 1.78
@@ -14,22 +14,22 @@
    <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-07-april-2011">W3C Editor's Draft 7 April 2011</h2>
+  <h2 id="w3c-editor-s-draft-08-april-2011">W3C Editor's Draft 8 April 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>
+   <dd><a href="http://dev.w3.org/html5/html-xhtml-author-guide/">http://dev.w3.org/html5/html-xhtml-author-guide/</a></dd>
    
    <dt>Latest published version:</dt>
    <dd><a href="http://www.w3.org/TR/html-polyglot/">http://www.w3.org/TR/html-polyglot/</a></dd>
    
    <dt>Latest editor's draft:</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>
+   <dd><a href="http://dev.w3.org/html5/html-xhtml-author-guide/">http://dev.w3.org/html5/html-xhtml-author-guide/</a></dd>
    
    <dt>Previous versions:</dt>
    <dd><a href="http://www.w3.org/TR/2011/WD-html-polyglot-20110405/">http://www.w3.org/TR/2011/WD-html-polyglot-20110405/</a></dd>
    <dd><a href="http://www.w3.org/TR/2011/WD-html-polyglot-20110113/">http://www.w3.org/TR/2011/WD-html-polyglot-20110113/</a></dd>
-   <dd><a href="http://www.w3.org/TR/2010/WD-html-polyglot-20101019/">http://www.w3.org/TR/2010/WD-html-polyglot-20101019/</a></dd>
    <dd><a href="http://www.w3.org/TR/2010/WD-html-polyglot-20100624/">http://www.w3.org/TR/2010/WD-html-polyglot-20100624/</a></dd>
+   <dd><a href="http://www.w3.org/TR/2010/WD-html-polyglot-20101019/">http://www.w3.org/TR/2010/WD-html-polyglot-20101019/</a></dd>
    
    <dt>Editor:</dt>
    <dd><span>Eliot Graff</span>, Microsoft Corporation</dd>
@@ -253,12 +253,14 @@
  </p>
  <p>
   <a class="internalDFN" href="#dfn-polyglot-markup" title="polyglot markup">Polyglot markup</a> declares the UTF-8 character encoding in the following ways, which may be used separately or in combination:
-  </p><ul>
+ </p>
+  <ul>
    <li>Within the document
     <ul>
      <li>By using the Byte Order Mark (BOM) character (preferred).</li>
      <li>By using <code>&lt;meta charset="UTF-8"/&gt;</code> (the HTML encoding declaration).</li>
     </ul>
+   </li>
    <li>Outside the document  
     <ul>
      <li>By adding <code>"charset=utf-8"</code> to the MIME/HTTP Content-Type header [<cite><a href="#bib-HTTP11" rel="biblioentry" class="bibref">HTTP11</a></cite>], as the following examples show in HTML and XML, respectively: </li>
@@ -267,7 +269,6 @@
     <pre class="example"><code>Content-type: application/xhtml+xml; charset=utf-8</code></pre>
    </li>
   </ul>
- <p></p>
  <p class="note">
   The HTML encoding declaration has no effect in XML. 
   When the HTML encoding declaration is the only encoding declaration, 
@@ -670,22 +671,18 @@
    <h5><span class="secno">6.5.1.1 </span>Content-Language</h5>
    <!-- TODO per bug 12279 XXX -->
    <p>
-    The following HTTP headers and <code>http-equiv</code> declarations warrant special discussion in <a class="internalDFN" href="#dfn-polyglot-markup">polyglot markup</a>.
+    The HTTP Content-Language: header warrants special discussion in <a class="internalDFN" href="#dfn-polyglot-markup">polyglot markup</a>.
    </p>
-   <pre class="example">http-equiv: <code>&lt;meta http-equiv="Content-Language" content="ru"/&gt;</code>
-HTTP header: <code>Content-language: ru</code></pre>
+   <pre class="example">HTTP header: <code>Content-language: ru</code></pre>
+   
    <p>
-    There are no direct issues with regard to the use of 
-Content-Language as long as the language attribute is declared on the 
-root element, 
-    as described in <a href="#language-attributes">Language Attributes</a>. 
-    <a class="internalDFN" href="#dfn-polyglot-markup" title="polyglot markup">Polyglot markup</a> <em title="must" class="rfc2119">must</em> declare both the <code>xml:lang</code> as well as the <code>lang</code> attributes on the root element 
-    when there is a Content-Language (<code>http-equiv</code> pragma or HTTP header) whose value is exactly a single language tag.
-    By declaring the language attribute on the root element, <a class="internalDFN" href="#dfn-polyglot-markup">polyglot markup</a> avoids a difference between XML and HTML in regard to Content-Language. 
+    Whenever there is an HTTP Content-Language: header (whose value is no more and no less than exactly one language tag), 
+    <a class="internalDFN" href="#dfn-polyglot-markup">polyglot markup</a> declares both the <code>lang</code> and the <code>xml:lang</code> attributes on the root element.
+    For more information, see <a href="#language-attributes">Language Attributes</a>.
    </p>
    <p class="note">
-    For the sake of simplicity and expediency, content to be delivered as <a class="internalDFN" href="#dfn-polyglot-markup">polyglot markup</a> <em title="may" class="rfc2119">may</em> always include both the <code>xml:lang</code> as well as the <code>lang</code> 
-    attributes on the root element. 
+    As a general practice and for the sake of expediency and simplicity, <a class="internalDFN" href="#dfn-polyglot-markup">polyglot markup</a> may always include 
+    both the <code>xml:lang</code> as well as the <code>lang</code> attributes on the root element. 
    </p>
 <!-- End section: Content-Language -->   
    </div>

Received on Friday, 8 April 2011 21:31:46 UTC