hixie: Define the obsolete permitted DOCTYPEs in the syntax section. (whatwg r4808)

hixie: Define the obsolete permitted DOCTYPEs in the syntax section.
(whatwg r4808)

http://dev.w3.org/cvsweb/html5/spec/Overview.html?r1=1.3856&r2=1.3857&f=h
http://html5.org/tools/web-apps-tracker?from=4807&to=4808

===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.3856
retrieving revision 1.3857
diff -u -d -r1.3856 -r1.3857
--- Overview.html 25 Feb 2010 04:34:07 -0000 1.3856
+++ Overview.html 25 Feb 2010 04:54:41 -0000 1.3857
@@ -50461,11 +50461,11 @@
    <li>A string that is an <a href="#ascii-case-insensitive">ASCII case-insensitive</a> match for the string "<code title="">DOCTYPE</code>".</li>
    <li>One or more <a href="#space-character" title="space character">space characters</a>.</li>
    <li>A string that is an <a href="#ascii-case-insensitive">ASCII case-insensitive</a> match for the string "<code title="">HTML</code>".</li>
-   <li>Optionally, a <a href="#doctype-legacy-string">DOCTYPE legacy string</a> (defined below).</li>
+   <li>Optionally, a <a href="#doctype-legacy-string">DOCTYPE legacy string</a> or an <a href="#obsolete-permitted-doctype-string">obsolete permitted DOCTYPE string</a> (defined below).</li>
    <li>Zero or more <a href="#space-character" title="space character">space characters</a>.</li>
    <li>A U+003E GREATER-THAN SIGN character (&gt;).</li>
   </ol><p class="note">In other words, <code>&lt;!DOCTYPE HTML&gt;</code>,
-  case-insensitively.<p>For the purposes of HTML generators that cannot output HTML
+  case-insensitively.<hr><p>For the purposes of HTML generators that cannot output HTML
   markup with the short DOCTYPE "<code title="">&lt;!DOCTYPE
   HTML&gt;</code>", a <dfn id="doctype-legacy-string">DOCTYPE legacy string</dfn> may be inserted
   into the DOCTYPE (in the position defined above). This string must
@@ -50480,7 +50480,40 @@
   'about:legacy-compat'&gt;</code>, case-insensitively except for the bit
   in single or double quotes.<p>The <a href="#doctype-legacy-string">DOCTYPE legacy string</a> should not be used unless
   the document is generated from a system that cannot output the
-  shorter string.<h4 id="elements-0"><span class="secno">8.1.2 </span>Elements</h4><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i><p>There are five different kinds of <dfn id="syntax-elements" title="syntax-elements">elements</dfn>: <a href="#void-elements">void elements</a>,
+  shorter string.<hr><!-- see the parser section before changing this bit --><p>To help authors transition from HTML4 and XHTML1, an
+  <dfn id="obsolete-permitted-doctype-string">obsolete permitted DOCTYPE string</dfn> can be inserted into
+  the DOCTYPE (in the position defined above). This string must
+  consist of:<ol class="brief"><li>One or more <a href="#space-character" title="space character">space characters</a>.</li>
+   <li>A string that is an <a href="#ascii-case-insensitive">ASCII case-insensitive</a> match for the string "<code title="">PUBLIC</code>".</li>
+   <li>One or more <a href="#space-character" title="space character">space characters</a>.</li>
+   <li>A U+0022 QUOTATION MARK or U+0027 APOSTROPHE character (the <i>first quote mark</i>).</li>
+   <li>The string from one of the cells in the first column of the table below. The row to which this cell belongs is the <i>selected row</i>.</li>
+   <li>A matching U+0022 QUOTATION MARK or U+0027 APOSTROPHE character (i.e. the same character as in the earlier step labeled <i>first quote mark</i>).</li>
+   <li>If the cell in the second column of the <i>selected row</i> is not blank, one or more <a href="#space-character" title="space character">space characters</a>.</li>
+   <li>If the cell in the second column of the <i>selected row</i> is not blank, a U+0022 QUOTATION MARK or U+0027 APOSTROPHE character (the <i>third quote mark</i>).</li>
+   <li>If the cell in the second column of the <i>selected row</i> is not blank, the string from the cell in the second column of the <i>selected row</i>.</li>
+   <li>If the cell in the second column of the <i>selected row</i> is not blank, a matching U+0022 QUOTATION MARK or U+0027 APOSTROPHE character (i.e. the same character as in the earlier step labeled <i>third quote mark</i>).</li>
+  </ol><table><caption>
+    Allowed values for public and system identifiers in an <a href="#obsolete-permitted-doctype-string">obsolete permitted DOCTYPE string</a>.
+   </caption>
+   <thead><tr><th> Public identifier
+     <th> System identifier
+   <tbody><tr><td> <code title="">-//W3C//DTD&nbsp;HTML&nbsp;4.0//EN</code>
+     <td>
+    <tr><td> <code title="">-//W3C//DTD&nbsp;HTML&nbsp;4.0//EN</code>
+     <td> <code title="">http://www.w3.org/TR/REC-html40/strict.dtd</code>
+    <tr><td> <code title="">-//W3C//DTD&nbsp;HTML&nbsp;4.01//EN</code>
+     <td>
+    <tr><td> <code title="">-//W3C//DTD&nbsp;HTML&nbsp;4.01//EN</code>
+     <td> <code title="">http://www.w3.org/TR/html4/strict.dtd</code>
+    <tr><td> <code title="">-//W3C//DTD&nbsp;XHTML&nbsp;1.0&nbsp;Strict//EN</code>
+     <td> <code title="">http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</code>
+    <tr><td> <code title="">-//W3C//DTD&nbsp;XHTML&nbsp;1.1//EN</code>
+     <td> <code title="">http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd</code>
+  </table><p>A <a href="#syntax-doctype" title="syntax-doctype">DOCTYPE</a> containing an
+  <a href="#obsolete-permitted-doctype-string">obsolete permitted DOCTYPE string</a> is an <dfn id="obsolete-permitted-doctype">obsolete
+  permitted DOCTYPE</dfn>. Authors should not use <a href="#obsolete-permitted-doctype" title="obsolete permitted DOCTYPE">obsolete permitted
+  DOCTYPEs</a>, as they are unnecessarily long.<h4 id="elements-0"><span class="secno">8.1.2 </span>Elements</h4><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i><p>There are five different kinds of <dfn id="syntax-elements" title="syntax-elements">elements</dfn>: <a href="#void-elements">void elements</a>,
   <a href="#raw-text-elements">raw text elements</a>, <a href="#rcdata-elements">RCDATA elements</a>,
   <a href="#foreign-elements">foreign elements</a>, and <a href="#normal-elements">normal elements</a>.<dl><dt><dfn id="void-elements">Void elements</dfn></dt>
 
@@ -54719,9 +54752,7 @@
     <a href="#case-sensitive">case-sensitive</a> match for the string
     "<code><a href="#about:legacy-compat">about:legacy-compat</a></code>", and none of the sets of
     conditions in the following list are matched, then there is a
-    <a href="#parse-error">parse error</a>. If one of the sets of conditions in the
-    following list is matched, then there is an <dfn id="obsolete-permitted-doctype">obsolete
-    permitted DOCTYPE</dfn>.</p>
+    <a href="#parse-error">parse error</a>.</p>
 
     <ul><!-- only things that trigger no-quirks mode and were valid in
      some other spec are allowed in this list --><li>The DOCTYPE token's name is a <a href="#case-sensitive">case-sensitive</a>
@@ -63495,9 +63526,7 @@
 
 
   </div><h2 id="obsolete"><span class="secno">11 </span>Obsolete features</h2><h3 id="obsolete-but-conforming-features"><span class="secno">11.1 </span>Obsolete but conforming features</h3><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i><p>Features listed in this section will trigger warnings in
-  conformance checkers.<p>In <a href="#syntax">the HTML syntax</a>, authors should not specify <a href="#syntax-doctype" title="syntax-DOCTYPE">DOCTYPE</a>s that get parsed as <a href="#obsolete-permitted-doctype" title="obsolete permitted DOCTYPE">obsolete permitted
-  DOCTYPEs</a>.</p><!-- this is poor form; we really should define
-  this in the syntax section somehow --><p>Authors should not specify an <code title="attr-meta-http-equiv"><a href="#attr-meta-http-equiv">http-equiv</a></code> attribute in the
+  conformance checkers.<p>Authors should not specify 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-language" title="attr-meta-http-equiv-content-language">Content
   Language</a> state on a <code><a href="#meta">meta</a></code> element. The <code title="attr-lang"><a href="#attr-lang">lang</a></code> attribute should be used instead.<p>Authors should not specify a <code title="attr-img-border"><a href="#attr-img-border">border</a></code> attribute on an
   <code><a href="#the-img-element">img</a></code> element. If the attribute is present, its value
@@ -63521,7 +63550,8 @@
   be equal to the element's <a href="#concept-id" title="concept-id">ID</a>. In
   earlier versions of the language, this attribute was intended as a
   way to specify possible targets for fragment identifiers in <a href="#url" title="URL">URLs</a>. The <code title="attr-id"><a href="#the-id-attribute">id</a></code>
-  attribute should be used instead.<p class="note">The <code title="attr-table-summary"><a href="#attr-table-summary">summary</a></code>
+  attribute should be used instead.<p class="note">In <a href="#syntax">the HTML syntax</a>, specifying a <a href="#syntax-doctype" title="syntax-DOCTYPE">DOCTYPE</a> that is an <a href="#obsolete-permitted-doctype">obsolete
+  permitted DOCTYPE</a> will also trigger a warning.<p class="note">The <code title="attr-table-summary"><a href="#attr-table-summary">summary</a></code>
   attribute, defined in the <code><a href="#the-table-element">table</a></code> section, will also
   trigger a warning.<div class="impl">

Received on Thursday, 25 February 2010 04:55:22 UTC