[html5] r5101 - [] (0) Remove a paragraph from the W3C version by request of the chairs. Add a l [...]

whatwg at whatwg.org whatwg at whatwg.org
Fri Jun 4 22:55:01 PDT 2010


Author: ianh
Date: 2010-06-04 22:55:00 -0700 (Fri, 04 Jun 2010)
New Revision: 5101

Modified:
   complete.html
   index
   source
Log:
[] (0) Remove a paragraph from the W3C version by request of the chairs. Add a list of differences between the versions of the spec to the WHATWG version now that there's more than a few. Add a paragraph to the W3C version mentioning this. Make it easier to keep track of what is in what version of the spec when editing.
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=9835

Modified: complete.html
===================================================================
--- complete.html	2010-06-02 04:19:24 UTC (rev 5100)
+++ complete.html	2010-06-05 05:55:00 UTC (rev 5101)
@@ -188,7 +188,7 @@
 
   <header class=head id=head><p><a class=logo href=http://www.whatwg.org/ rel=home><img alt=WHATWG src=/images/logo></a></p>
    <hgroup><h1>Web Applications 1.0</h1>
-    <h2 class="no-num no-toc">Draft Standard — 2 June 2010</h2>
+    <h2 class="no-num no-toc">Draft Standard — 5 June 2010</h2>
    </hgroup><p>You can take part in this work. <a href=http://www.whatwg.org/mailing-list>Join the working group's discussion list.</a></p>
    <p><strong>Web designers!</strong> We have a <a href=http://blog.whatwg.org/faq/>FAQ</a>, a <a href=http://forums.whatwg.org/>forum</a>, and a <a href=http://www.whatwg.org/mailing-list#help>help mailing list</a> for you!</p>
    <!--<p class="impl"><strong>Implementors!</strong> We have a <a href="http://www.whatwg.org/mailing-list#implementors">mailing list</a> for you too!</p>-->
@@ -1332,14 +1332,13 @@
 <!--end-toc-->
   <hr><h2 id=introduction><span class=secno>1 </span>Introduction</h2>
 
+<!--VERSION-->
 
-
   <h3 id=is-this-html5?><span class=secno>1.1 </span>Is this HTML5?</h3>
 
   <p><i>This section is non-normative.</i></p>
 
 
-
   <p>No, although it does contain everything that is part of HTML5. If
   you want only HTML5, please see <a href=http://www.whatwg.org/html>the HTML specification</a>.</p>
 
@@ -1347,10 +1346,9 @@
   is actively working on. For more details, please see the <a href=http://wiki.whatwg.org/wiki/FAQ#What_are_the_various_versions_of_the_spec.3F>the
   relevant FAQ entry</a>.</p>
 
+<!--VERSION-->
 
 
-
-
   <h3 id=background><span class=secno>1.2 </span>Background</h3>
 
   <p><i>This section is non-normative.</i></p>
@@ -1509,6 +1507,7 @@
 
   <p>Since then, both groups have been working together.</p>
 
+
   <p>A separate document has been published by the W3C HTML working
   group to document the differences between this specification and the
   language described in the HTML4 specification. <a href=#refsHTMLDIFF>[HTMLDIFF]</a></p>
@@ -1594,7 +1593,7 @@
 
   This specification defines the latest HTML syntax, known simply as
   "HTML".
-  
+  <!--VERSION-->
 
   </p>
 
@@ -1609,7 +1608,7 @@
 
   This specification defines the latest XHTML syntax, known simply as
   "XHTML".
-  
+  <!--VERSION-->
 
   </p>
 
@@ -1649,7 +1648,7 @@
    this section. Rules for authors on how to use the element<span class=impl>, along with user agent requirements for how to handle
    each element,</span> are also given.</dd>
 
-
+<!--MD-->
    <dt><a href=#microdata>Microdata</a></dt>
 
    <dd>This specification introduces a mechanism for adding
@@ -1663,8 +1662,8 @@
    information, calendar events, and licensing works.
 
    </dd>
+<!--MD-->
 
-
    <dt><a href=#browsers>Loading Web pages</a></dt>
 
    <dd>HTML documents do not exist in a vacuum — this section
@@ -1696,7 +1695,7 @@
    based on name-value pairs.</dd>
 
 
-
+<!--POSTMSG-->
    <dt><a href=#comms>The communication APIs</a></dt>
 
    <dd>This section describes some mechanisms that applications
@@ -1707,9 +1706,9 @@
    two-way full-duplex socket protocol for scripts.
 
    </dd>
+<!--POSTMSG-->
 
 
-
    <dt><a href=#syntax>The HTML syntax</a></dt>
    <dt><a href=#xhtml>The XHTML syntax</a></dt>
 
@@ -2995,7 +2994,7 @@
     <p>The term "HTML validator" can be used to refer to a
     conformance checker that itself conforms to the applicable
     requirements of this specification.</p>
-    
+    <!--VERSION-->
 
     <div class=note>
 
@@ -5420,11 +5419,11 @@
 
   </ol></div>
 
-  <hr><p class=note>The <a href=#canvas-context-2d title=canvas-context-2d>2D graphics
+  <hr><!--2DCANVAS--><p class=note>The <a href=#canvas-context-2d title=canvas-context-2d>2D graphics
   context</a> has a separate color syntax that also handles
   opacity.</p>
 
-  
+  <!--2DCANVAS-->
 
 
   <h4 id=space-separated-tokens><span class=secno>2.4.7 </span>Space-separated tokens</h4>
@@ -7142,7 +7141,7 @@
 
   </ol><!-- see also http://ln.hixie.ch/?start=1161042744&count=1 --></div>
 
-
+<!--MD-->
   <div data-component="HTML Microdata (editor: Ian Hickson)">
 
   <h5 id=htmlpropertiescollection-0><span class=secno>2.7.2.5 </span>HTMLPropertiesCollection</h5>
@@ -7233,9 +7232,9 @@
   </div>
 
   </div><!--data-component-->
+<!--MD-->
 
 
-
   <h4 id=domtokenlist-0><span class=secno>2.7.3 </span>DOMTokenList</h4>
 
   <p>The <code><a href=#domtokenlist>DOMTokenList</a></code> interface represents an interface
@@ -7839,7 +7838,7 @@
   readonly attribute <a href=#htmlcollection>HTMLCollection</a> <a href=#dom-document-scripts title=dom-document-scripts>scripts</a>;
   NodeList <a href=#dom-document-getelementsbyname title=dom-document-getElementsByName>getElementsByName</a>(in DOMString elementName);
   NodeList <a href=#dom-document-getelementsbyclassname title=dom-document-getElementsByClassName>getElementsByClassName</a>(in DOMString classNames);
-  NodeList <a href=#dom-document-getitems title=dom-document-getItems>getItems</a>(in optional DOMString typeNames); // <a href=#microdata>microdata</a> <!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION-->
+<!--MD-->  NodeList <a href=#dom-document-getitems title=dom-document-getItems>getItems</a>(in optional DOMString typeNames); // <a href=#microdata>microdata</a> <!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION--><!--MD-->
 
   // <a href=#dynamic-markup-insertion>dynamic markup insertion</a>
            attribute DOMString <a href=#dom-innerhtml title=dom-innerHTML>innerHTML</a>;
@@ -8804,7 +8803,7 @@
   readonly attribute <a href=#domtokenlist>DOMTokenList</a> <a href=#dom-classlist title=dom-classList>classList</a>;
   readonly attribute <a href=#domstringmap>DOMStringMap</a> <a href=#dom-dataset title=dom-dataset>dataset</a>;
 
-  // <a href=#microdata>microdata</a> <!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION-->
+<!--MD-->  // <a href=#microdata>microdata</a> <!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION-->
            attribute boolean <a href=#dom-itemscope title=dom-itemScope>itemScope</a>;
            attribute DOMString <a href=#dom-itemtype title=dom-itemType>itemType</a>;
            attribute DOMString <a href=#dom-itemid title=dom-itemId>itemId</a>;
@@ -8812,7 +8811,7 @@
   [PutForwards=<a href=#dom-domsettabletokenlist-value title=dom-DOMSettableTokenList-value>value</a>] readonly attribute <a href=#domsettabletokenlist>DOMSettableTokenList</a> <a href=#dom-itemprop title=dom-itemProp>itemProp</a>;
   readonly attribute <a href=#htmlpropertiescollection>HTMLPropertiesCollection</a> <a href=#dom-properties title=dom-properties>properties</a>;
            attribute any <a href=#dom-itemvalue title=dom-itemValue>itemValue</a>;
-
+<!--MD-->
   // <a href=#editing>user interaction</a>
            attribute boolean <a href=#dom-hidden title=dom-hidden>hidden</a>;
   void <a href=#dom-click title=dom-click>click</a>();
@@ -8928,13 +8927,13 @@
    <li><code title=attr-draggable><a href=#the-draggable-attribute>draggable</a></code></li>
    <li><code title=attr-hidden><a href=#the-hidden-attribute>hidden</a></code></li>
    <li><code title=attr-id><a href=#the-id-attribute>id</a></code></li>
-<!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION -->
+<!--MD--><!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION -->
    <li><code title=attr-itemid><a href=#attr-itemid>itemid</a></code></li>
    <li><code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code></li>
    <li><code title=attr-itemref><a href=#attr-itemref>itemref</a></code></li>
    <li><code title=attr-itemscope><a href=#attr-itemscope>itemscope</a></code></li>
    <li><code title=attr-itemtype><a href=#attr-itemtype>itemtype</a></code></li>
-
+<!--MD-->
    <li><code title=attr-lang><a href=#attr-lang>lang</a></code></li>
    <li><code title=attr-spellcheck><a href=#attr-spellcheck>spellcheck</a></code></li>
    <li><code title=attr-style><a href=#the-style-attribute>style</a></code></li>
@@ -9857,16 +9856,16 @@
    <li><code><a href=#the-kbd-element>kbd</a></code></li>
    <li><code><a href=#the-keygen-element>keygen</a></code></li>
    <li><code><a href=#the-label-element>label</a></code></li>
-
+<!--MD-->
    <li><code><a href=#the-link-element>link</a></code> (if the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present)</li>
-
+<!--MD-->
    <li><code><a href=#the-map-element>map</a></code></li>
    <li><code><a href=#the-mark-element>mark</a></code></li>
    <li><code><a href=#math>math</a></code></li>
    <li><code><a href=#menus>menu</a></code></li>
-
+<!--MD-->
    <li><code><a href=#meta>meta</a></code> (if the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present)</li>
-
+<!--MD-->
    <li><code><a href=#the-meter-element>meter</a></code></li>
    <li><code><a href=#the-nav-element>nav</a></code></li>
    <li><code><a href=#the-noscript-element>noscript</a></code></li>
@@ -9978,15 +9977,15 @@
    <li><code><a href=#the-kbd-element>kbd</a></code></li>
    <li><code><a href=#the-keygen-element>keygen</a></code></li>
    <li><code><a href=#the-label-element>label</a></code></li>
-
+<!--MD-->
    <li><code><a href=#the-link-element>link</a></code> (if the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present)</li>
-
+<!--MD-->
    <li><code><a href=#the-map-element>map</a></code> (if it contains only <a href=#phrasing-content>phrasing content</a>)</li>
    <li><code><a href=#the-mark-element>mark</a></code></li>
    <li><code><a href=#math>math</a></code></li>
-
+<!--MD-->
    <li><code><a href=#meta>meta</a></code> (if the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present)</li>
-
+<!--MD-->
    <li><code><a href=#the-meter-element>meter</a></code></li>
    <li><code><a href=#the-noscript-element>noscript</a></code></li>
    <li><code><a href=#the-object-element>object</a></code></li>
@@ -11970,16 +11969,16 @@
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#metadata-content>Metadata content</a>.</dd>
-
+<!--MD-->
    <dd>If the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present: <a href=#flow-content>flow content</a>.</dd>
    <dd>If the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present: <a href=#phrasing-content>phrasing content</a>.</dd>
-
+<!--MD-->
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <a href=#metadata-content>metadata content</a> is expected.</dd>
    <dd>In a <code><a href=#the-noscript-element>noscript</a></code> element that is a child of a <code><a href=#the-head-element-0>head</a></code> element.</dd>
-
+<!--MD-->
    <dd>If the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present: where <a href=#phrasing-content>phrasing content</a> is expected.</dd>
-
+<!--MD-->
    <dt>Content model:</dt>
    <dd>Empty.</dd>
    <dt>Content attributes:</dt>
@@ -12013,7 +12012,7 @@
   surrounded by spaces</a>. <span class=impl>If the <code title=attr-link-href><a href=#attr-link-href>href</a></code> attribute is absent, then the
   element does not define a link.</span></p>
 
-
+<!--MD-->
   <p>A <code><a href=#the-link-element>link</a></code> element must have either a <code title=attr-link-rel><a href=#attr-link-rel>rel</a></code> attribute, or an <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute, or both.</p>
 
   <p>The types of link indicated (the relationships) are given by the
@@ -12341,19 +12340,19 @@
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#metadata-content>Metadata content</a>.</dd>
-
+<!--MD-->
    <dd>If the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present: <a href=#flow-content>flow content</a>.</dd>
    <dd>If the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present: <a href=#phrasing-content>phrasing content</a>.</dd>
-
+<!--MD-->
    <dt>Contexts in which this element may be used:</dt>
    <dd>If the <code title=attr-meta-charset><a href=#attr-meta-charset>charset</a></code> attribute is present, or if the element's <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute is in the <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration state</a>: in a <code><a href=#the-head-element-0>head</a></code> element.</dd>
    <dd>If the <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute is present but not in the <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration state</a>: in a <code><a href=#the-head-element-0>head</a></code> element.</dd>
    <dd>If the <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute is present but not in the <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration state</a>: in a <code><a href=#the-noscript-element>noscript</a></code> element that is a child of a <code><a href=#the-head-element-0>head</a></code> element.</dd>
    <dd>If the <code title=attr-meta-name><a href=#attr-meta-name>name</a></code> attribute is present: where <a href=#metadata-content>metadata content</a> is expected.</dd>
-
+<!--MD-->
    <dd>If the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present: where <a href=#metadata-content>metadata content</a> is expected.</dd>
    <dd>If the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present: where <a href=#phrasing-content>phrasing content</a> is expected.</dd>
-
+<!--MD-->
    <dt>Content model:</dt>
    <dd>Empty.</dd>
    <dt>Content attributes:</dt>
@@ -12382,7 +12381,7 @@
   document is serialized to string form (e.g. for transmission over
   the network or for disk storage) with the <code title=attr-meta-charset><a href=#attr-meta-charset>charset</a></code> attribute.</p>
 
-
+<!--MD-->
   <p>Exactly one of the <code title=attr-meta-name><a href=#attr-meta-name>name</a></code>,
   <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code>, <code title=attr-meta-charset><a href=#attr-meta-charset>charset</a></code>, and <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attributes must be
   specified.</p>
@@ -19955,13 +19954,18 @@
 
   <p>User agents may always provide the user with the option to
   display any image, or to prevent any image from being
-  displayed. User agents may also apply heuristics to help the user
-  make use of the image when the user is unable to see it, e.g. due to
-  a visual disability or because they are using a text terminal with
-  no graphics capabilities. Such heuristics could include, for
-  instance, optical character recognition (OCR) of text found within
-  the image.</p>
+  displayed.
 
+  <!--POLITICS-->
+  User agents may also apply heuristics to help the user make use of
+  the image when the user is unable to see it, e.g. due to a visual
+  disability or because they are using a text terminal with no
+  graphics capabilities. Such heuristics could include, for instance,
+  optical character recognition (OCR) of text found within the image.
+  <!--POLITICS-->
+
+  </p>
+
   <p class=warning>While user agents are encouraged to repair cases
   of missing <code title=attr-img-alt><a href=#attr-img-alt>alt</a></code> attributes, authors
   must not rely on such behavior. <a href=#alt>Requirements for
@@ -27127,14 +27131,14 @@
 
    </dd>
 
-  </dl><p>This specification only defines one context, with the name "<code title=canvas-context-2d><a href=#canvas-context-2d>2d</a></code>". <span class=impl>If <code title=dom-canvas-getContext><a href=#dom-canvas-getcontext>getContext()</a></code> is called with
+  </dl><!--2DCONTEXT--><p>This specification only defines one context, with the name "<code title=canvas-context-2d><a href=#canvas-context-2d>2d</a></code>". <span class=impl>If <code title=dom-canvas-getContext><a href=#dom-canvas-getcontext>getContext()</a></code> is called with
   that exact string for its <var title="">contextId</var> argument,
   then the UA must return a reference to an object implementing
   <code><a href=#canvasrenderingcontext2d>CanvasRenderingContext2D</a></code>. Other specifications may
   define their own contexts, which would return different
   objects.</span></p>
 
-  
+  <!--2DCONTEXT-->
 
   <div class=impl>
 
@@ -27237,7 +27241,7 @@
 
   </div>
 
-  
+  <!--2DCONTEXT-->
 
   <div data-component="HTML Canvas 2D Context (editor: Ian Hickson)">
 
@@ -30088,7 +30092,7 @@
 
   </div><!--data-component-->
 
-  
+  <!--2DCONTEXT-->
 
   <div class=impl>
 
@@ -33358,7 +33362,7 @@
      <td>34.3%
      <td>34.0%
      <td>29.0%
-  </table><hr><p>The following shows how one might mark up the operating expenses
+  </table><!--HTML4POLICE--><hr><p>The following shows how one might mark up the operating expenses
   table from lower on the same page of that document:</p>
 
   <pre><table>
@@ -47588,8 +47592,8 @@
   </ol></div>
 
 
+<!--DEVICE-->
 
-
   <h4 id=devices><span class=secno>4.11.6 </span>The <dfn><code>device</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
@@ -47798,11 +47802,11 @@
   client, the configuration information should always be transmitted
   using an encrypted connection.</p>
 
+<!--DEVICE-->
 
 
 
 
-
   <h3 id=links><span class=secno>4.12 </span>Links</h3>
 
 
@@ -49729,9 +49733,9 @@
 
   </div>
 
+<!--MD-->
 
 
-
   <div data-component="HTML Microdata (editor: Ian Hickson)">
 
   <h2 id=microdata><span class=secno>5 </span><dfn>Microdata</dfn></h2>
@@ -53431,15 +53435,10 @@
 
 
 
-
-
   <div class=impl>
 
   <h3 id=converting-html-to-other-formats><span class=secno>5.5 </span>Converting HTML to other formats</h3>
 
-
-
-
   <h4 id=json><span class=secno>5.5.1 </span>JSON</h4>
 
   <p>Given a list of nodes <var title="">nodes</var> in a
@@ -54368,9 +54367,9 @@
 
   <p>The <dfn id=atom-namespace>Atom namespace</dfn> is: <code>http://www.w3.org/2005/Atom</code></p>
 
+<!--MD-->
 
 
-
   </div>
 
 
@@ -54909,9 +54908,9 @@
   void <a href=#dom-print title=dom-print>print</a>();
   any <a href=#dom-showmodaldialog title=dom-showModalDialog>showModalDialog</a>(in DOMString url, in optional any argument<!--, in optional DOMString features-->);
 
-  // <a href=#web-messaging>cross-document messaging</a>
+<!--POSTMSG-->  // <a href=#web-messaging>cross-document messaging</a>
   void <a href=#dom-window-postmessage title=dom-window-postMessage>postMessage</a>(in any message, in DOMString targetOrigin, in optional <a href=#messageportarray>MessagePortArray</a> ports);
-
+<!--POSTMSG-->
   // <a href=#event-handler-idl-attributes>event handler IDL attributes</a>
            attribute <a href=#function>Function</a> <a href=#handler-onabort title=handler-onabort>onabort</a>;
            attribute <a href=#function>Function</a> <a href=#handler-window-onafterprint title=handler-window-onafterprint>onafterprint</a>;
@@ -65017,8 +65016,8 @@
 
    </li>
 
+<!--MD-->
 
-
    <li>
 
     <p>The user agent must take the <a href=#list-of-dragged-nodes>list of dragged nodes</a>
@@ -68747,7 +68746,6 @@
   </div>
 
   
-
   
 
   </div><!--data-component-->
@@ -84169,7 +84167,9 @@
   the <code><a href=#video>video</a></code> element itself, and is expected to be
   centered in the <code><a href=#video>video</a></code> element.</p>
 
+<!--TT-->
   <p class=XXX>pointer to rendering model for timed tracks</p>
+<!--TT-->
 
   <p class=note>Resizing <code><a href=#video>video</a></code> and <code><a href=#the-canvas-element>canvas</a></code>
   elements does not interrupt video playback or clear the canvas.</p>
@@ -84183,6 +84183,7 @@
   </div>
 
 
+<!--TT-->
   <div class=impl>
 
   <h4 id=timed-tracks-0><span class=secno>14.3.2 </span>Timed tracks</h4>
@@ -84192,6 +84193,7 @@
   <p class=XXX>CSS extensions</p>
 
   </div>
+<!--TT-->
 
 
   <div class=impl>
@@ -87374,6 +87376,7 @@
   <code><a href=#text/ping>text/ping</a></code> resources.</p>
 <!--PING-->
 
+<!--TT-->
   <h3 id=text/srt><span class=secno>16.6 </span><dfn><code>text/srt</code></dfn></h3>
 
   <p>This registration is for community review and will be submitted
@@ -87439,9 +87442,10 @@
    <dd>WHATWG</dd>
   </dl><p>Fragment identifiers have no meaning with
   <code><a href=#text/srt>text/srt</a></code> resources.</p>
+<!--TT-->
 
+<!--MD-->
 
-
   <h3 id=application/microdata+json><span class=secno>16.7 </span><dfn><code>application/microdata+json</code></dfn></h3>
 
 
@@ -87508,8 +87512,8 @@
   <code><a href=#application/microdata+json>application/microdata+json</a></code> resources have the same
   semantics as when used with <code>application/json</code>. <a href=#refsJSON>[JSON]</a></p>
 
+<!--MD-->
 
-
 <!--PING-->
   <h3 id=ping-from><span class=secno>16.8 </span><dfn title=http-ping-from><code>Ping-From</code></dfn></h3>
 
@@ -88789,10 +88793,10 @@
       <a href=#text-content title="text content">Text</a>
      <td>
       <code><a href=#the-area-element>area</a></code> (if it is a descendant of a <code><a href=#the-map-element>map</a></code> element);
-      
+      <!--MD-->
       <code><a href=#the-link-element>link</a></code> (if the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present);
       <code><a href=#meta>meta</a></code> (if the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present);
-      
+      <!--MD-->
       <code><a href=#the-style-element>style</a></code> (if the <code title=attr-style-scoped><a href=#attr-style-scoped>scoped</a></code> attribute is present)
 
     <tr><td> <a href=#sectioning-content>Sectioning content</a>
@@ -88868,13 +88872,13 @@
       <code><a href=#the-area-element>area</a></code> (if it is a descendant of a  <code><a href=#the-map-element>map</a></code> element);
       <code><a href=#the-del-element>del</a></code> (if it contains only <a href=#phrasing-content>phrasing content</a>);
       <code><a href=#the-ins-element>ins</a></code> (if it contains only <a href=#phrasing-content>phrasing content</a>);
-      
+      <!--MD-->
       <code><a href=#the-link-element>link</a></code> (if the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present);
-      
+      <!--MD-->
       <code><a href=#the-map-element>map</a></code> (if it contains only <a href=#phrasing-content>phrasing content</a>)<!--
-      --><!--
+      --><!--MD--><!--
       -->; <code><a href=#meta>meta</a></code> (if the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present)<!--
-      --><!--
+      --><!--MD--><!--
       -->
 
     <tr><td> <a href=#embedded-content>Embedded content</a>
@@ -89266,7 +89270,7 @@
      <td> <code title=attr-img-ismap><a href=#attr-img-ismap>img</a></code>
      <td> Whether the image is a server-side image map
      <td> <a href=#boolean-attribute>Boolean attribute</a>
-
+<!--MD-->
     <tr><th> <code title="">itemid</code>
      <td> <a href=#attr-itemid title=attr-itemid>HTML elements</a>
      <td> <a href=#global-identifier>Global identifier</a> for a microdata item
@@ -89287,7 +89291,7 @@
      <td> <a href=#attr-itemtype title=attr-itemtype>HTML elements</a>
      <td> <a href=#item-type>Item type</a> of a microdata item
      <td> <a href=#absolute-url title="absolute URL">Valid absolute URL</a>*
-
+<!--MD-->
     <tr><th> <code title="">keytype</code>
      <td> <code title=attr-keygen-keytype><a href=#attr-keygen-keytype>keygen</a></code>
      <td> The type of cryptographic key to generate

Modified: index
===================================================================
--- index	2010-06-02 04:19:24 UTC (rev 5100)
+++ index	2010-06-05 05:55:00 UTC (rev 5101)
@@ -192,7 +192,7 @@
 
   <header class=head id=head><p><a class=logo href=http://www.whatwg.org/ rel=home><img alt=WHATWG src=/images/logo></a></p>
    <hgroup><h1>HTML5 (including next generation additions still in development)</h1>
-    <h2 class="no-num no-toc">Draft Standard — 2 June 2010</h2>
+    <h2 class="no-num no-toc">Draft Standard — 5 June 2010</h2>
    </hgroup><p>You can take part in this work. <a href=http://www.whatwg.org/mailing-list>Join the working group's discussion list.</a></p>
    <p><strong>Web designers!</strong> We have a <a href=http://blog.whatwg.org/faq/>FAQ</a>, a <a href=http://forums.whatwg.org/>forum</a>, and a <a href=http://www.whatwg.org/mailing-list#help>help mailing list</a> for you!</p>
    <!--<p class="impl"><strong>Implementors!</strong> We have a <a href="http://www.whatwg.org/mailing-list#implementors">mailing list</a> for you too!</p>-->
@@ -1203,8 +1203,8 @@
 <!--end-toc-->
   <hr><h2 id=introduction><span class=secno>1 </span>Introduction</h2>
 
+<!--VERSION-->
 
-
   <h3 id=is-this-html5?><span class=secno>1.1 </span>Is this HTML5?</h3>
 
   <p><i>This section is non-normative.</i></p>
@@ -1228,26 +1228,49 @@
   <p>The W3C has also been working on HTML in conjunction with the
   WHATWG; at the W3C, this document has been split into several parts,
   and the occasional informative paragraph or example has been removed
-  for technical reasons. For all intents and purposes, however, the
-  W3C HTML specifications and this specification are equivalent (and
-  they are in fact all generated from the same source document).</p>
+  for technical or editorial reasons. For all intents and purposes,
+  however, the W3C HTML specifications and this specification are
+  equivalent (and they are in fact all generated from the same source
+  document). The minor differences are:</p>
 
-  <p>Features that are considered part of the next generation of HTML
-  beyond HTML5 currently consist of only:</p>
+  <ul class=brief><li>Instead of this section, the W3C version has a different
+   paragraph explaining the difference between the W3C and WHATWG
+   versions of HTML.</li>
 
+   <li>The W3C version refers to the technology as HTML5, rather than
+   just HTML.</li>
+
+   <li>Examples that use features from HTML5 are not present in the
+   W3C version since the W3C version is published as HTML4 due to W3C
+   publication policies.</li>
+
+   <li>The W3C version includes a redundant and inconsistent reference
+   to the WCAG document.</li>
+
+   <li>The W3C version omits a paragraph of implementation advice for
+   political reasons.</li>
+
+  </ul><p>Features that are considered part of the next generation of HTML
+  beyond HTML5 (and that are therefore not included in the W3C version
+  of HTML5) currently consist of:</p>
+
   <ul class=brief><li>The <code><a href=#devices>device</a></code> element.</li>
    <li>The <code title=attr-hyperlink-ping><a href=#ping>ping</a></code> attribute and related <a href=#hyperlink-auditing>hyperlink auditing</a> features.</li>
-  </ul><p>Features that are part of HTML5 (and this specification) but that
-  are either currently, or have been in the past, published as
-  separate specifications:</p>
+   <li>The <a href=#timed-track>timed track</a> model for <a href=#media-element title="media element">media elements</a>, the <span>WebSRT</span> format, and related features.</li>
+  </ul><p>Features that are part of HTML (and this specification) but that
+  are currently published as separate specifications as well, and are
+  not included in the W3C HTML5 specification, consist of:</p>
 
   <ul class=brief><li><a href=#2dcontext>Canvas 2D Graphics Context</a>
    <li><a href=#microdata>Microdata</a>
    <li><a href=#mdvocabs>Microdata vocabularies</a>
    <li><a href=#crossDocumentMessages>Cross-document messaging</a> (also known as Communications)
    <li><a href=#channel-messaging>Channel messaging</a> (also known as Communications)
-   <li><a href=#forms>Forms</a> (previously known as Web Forms 2)
-  </ul><p>Features that are not currently in this document that were in the
+  </ul><p>The <a href=#forms>forms</a> part of this specification was
+  previously published separately in a specification known as Web
+  Forms 2.</p>
+
+  <p>Features that are not currently in this document that were in the
   past considered part of HTML5, or that were never part of HTML5 but
   have been referred to as part of HTML5 in the media, include:</p>
 
@@ -1422,6 +1445,7 @@
 
   <p>Since then, both groups have been working together.</p>
 
+
   <p>A separate document has been published by the W3C HTML working
   group to document the differences between this specification and the
   language described in the HTML4 specification. <a href=#refsHTMLDIFF>[HTMLDIFF]</a></p>
@@ -1507,7 +1531,7 @@
 
   This specification defines the latest HTML syntax, known simply as
   "HTML".
-  
+  <!--VERSION-->
 
   </p>
 
@@ -1522,7 +1546,7 @@
 
   This specification defines the latest XHTML syntax, known simply as
   "XHTML".
-  
+  <!--VERSION-->
 
   </p>
 
@@ -1562,7 +1586,7 @@
    this section. Rules for authors on how to use the element<span class=impl>, along with user agent requirements for how to handle
    each element,</span> are also given.</dd>
 
-
+<!--MD-->
    <dt><a href=#microdata>Microdata</a></dt>
 
    <dd>This specification introduces a mechanism for adding
@@ -1576,8 +1600,8 @@
    information, calendar events, and licensing works.
 
    </dd>
+<!--MD-->
 
-
    <dt><a href=#browsers>Loading Web pages</a></dt>
 
    <dd>HTML documents do not exist in a vacuum — this section
@@ -1597,16 +1621,16 @@
 
 
 
-
+<!--POSTMSG-->
    <dt><a href=#comms>The communication APIs</a></dt>
 
    <dd>This section describes some mechanisms that applications
    written in HTML can use to communicate with other applications from
    different domains running on the same client.
    </dd>
+<!--POSTMSG-->
 
 
-
    <dt><a href=#syntax>The HTML syntax</a></dt>
    <dt><a href=#xhtml>The XHTML syntax</a></dt>
 
@@ -2892,7 +2916,7 @@
     <p>The term "HTML validator" can be used to refer to a
     conformance checker that itself conforms to the applicable
     requirements of this specification.</p>
-    
+    <!--VERSION-->
 
     <div class=note>
 
@@ -5317,11 +5341,11 @@
 
   </ol></div>
 
-  <hr><p class=note>The <a href=#canvas-context-2d title=canvas-context-2d>2D graphics
+  <hr><!--2DCANVAS--><p class=note>The <a href=#canvas-context-2d title=canvas-context-2d>2D graphics
   context</a> has a separate color syntax that also handles
   opacity.</p>
 
-  
+  <!--2DCANVAS-->
 
 
   <h4 id=space-separated-tokens><span class=secno>2.4.7 </span>Space-separated tokens</h4>
@@ -7039,7 +7063,7 @@
 
   </ol><!-- see also http://ln.hixie.ch/?start=1161042744&count=1 --></div>
 
-
+<!--MD-->
   <div data-component="HTML Microdata (editor: Ian Hickson)">
 
   <h5 id=htmlpropertiescollection-0><span class=secno>2.7.2.5 </span>HTMLPropertiesCollection</h5>
@@ -7130,9 +7154,9 @@
   </div>
 
   </div><!--data-component-->
+<!--MD-->
 
 
-
   <h4 id=domtokenlist-0><span class=secno>2.7.3 </span>DOMTokenList</h4>
 
   <p>The <code><a href=#domtokenlist>DOMTokenList</a></code> interface represents an interface
@@ -7736,7 +7760,7 @@
   readonly attribute <a href=#htmlcollection>HTMLCollection</a> <a href=#dom-document-scripts title=dom-document-scripts>scripts</a>;
   NodeList <a href=#dom-document-getelementsbyname title=dom-document-getElementsByName>getElementsByName</a>(in DOMString elementName);
   NodeList <a href=#dom-document-getelementsbyclassname title=dom-document-getElementsByClassName>getElementsByClassName</a>(in DOMString classNames);
-  NodeList <a href=#dom-document-getitems title=dom-document-getItems>getItems</a>(in optional DOMString typeNames); // <a href=#microdata>microdata</a> <!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION-->
+<!--MD-->  NodeList <a href=#dom-document-getitems title=dom-document-getItems>getItems</a>(in optional DOMString typeNames); // <a href=#microdata>microdata</a> <!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION--><!--MD-->
 
   // <a href=#dynamic-markup-insertion>dynamic markup insertion</a>
            attribute DOMString <a href=#dom-innerhtml title=dom-innerHTML>innerHTML</a>;
@@ -8701,7 +8725,7 @@
   readonly attribute <a href=#domtokenlist>DOMTokenList</a> <a href=#dom-classlist title=dom-classList>classList</a>;
   readonly attribute <a href=#domstringmap>DOMStringMap</a> <a href=#dom-dataset title=dom-dataset>dataset</a>;
 
-  // <a href=#microdata>microdata</a> <!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION-->
+<!--MD-->  // <a href=#microdata>microdata</a> <!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION-->
            attribute boolean <a href=#dom-itemscope title=dom-itemScope>itemScope</a>;
            attribute DOMString <a href=#dom-itemtype title=dom-itemType>itemType</a>;
            attribute DOMString <a href=#dom-itemid title=dom-itemId>itemId</a>;
@@ -8709,7 +8733,7 @@
   [PutForwards=<a href=#dom-domsettabletokenlist-value title=dom-DOMSettableTokenList-value>value</a>] readonly attribute <a href=#domsettabletokenlist>DOMSettableTokenList</a> <a href=#dom-itemprop title=dom-itemProp>itemProp</a>;
   readonly attribute <a href=#htmlpropertiescollection>HTMLPropertiesCollection</a> <a href=#dom-properties title=dom-properties>properties</a>;
            attribute any <a href=#dom-itemvalue title=dom-itemValue>itemValue</a>;
-
+<!--MD-->
   // <a href=#editing>user interaction</a>
            attribute boolean <a href=#dom-hidden title=dom-hidden>hidden</a>;
   void <a href=#dom-click title=dom-click>click</a>();
@@ -8825,13 +8849,13 @@
    <li><code title=attr-draggable><a href=#the-draggable-attribute>draggable</a></code></li>
    <li><code title=attr-hidden><a href=#the-hidden-attribute>hidden</a></code></li>
    <li><code title=attr-id><a href=#the-id-attribute>id</a></code></li>
-<!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION -->
+<!--MD--><!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION -->
    <li><code title=attr-itemid><a href=#attr-itemid>itemid</a></code></li>
    <li><code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code></li>
    <li><code title=attr-itemref><a href=#attr-itemref>itemref</a></code></li>
    <li><code title=attr-itemscope><a href=#attr-itemscope>itemscope</a></code></li>
    <li><code title=attr-itemtype><a href=#attr-itemtype>itemtype</a></code></li>
-
+<!--MD-->
    <li><code title=attr-lang><a href=#attr-lang>lang</a></code></li>
    <li><code title=attr-spellcheck><a href=#attr-spellcheck>spellcheck</a></code></li>
    <li><code title=attr-style><a href=#the-style-attribute>style</a></code></li>
@@ -9754,16 +9778,16 @@
    <li><code><a href=#the-kbd-element>kbd</a></code></li>
    <li><code><a href=#the-keygen-element>keygen</a></code></li>
    <li><code><a href=#the-label-element>label</a></code></li>
-
+<!--MD-->
    <li><code><a href=#the-link-element>link</a></code> (if the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present)</li>
-
+<!--MD-->
    <li><code><a href=#the-map-element>map</a></code></li>
    <li><code><a href=#the-mark-element>mark</a></code></li>
    <li><code><a href=#math>math</a></code></li>
    <li><code><a href=#menus>menu</a></code></li>
-
+<!--MD-->
    <li><code><a href=#meta>meta</a></code> (if the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present)</li>
-
+<!--MD-->
    <li><code><a href=#the-meter-element>meter</a></code></li>
    <li><code><a href=#the-nav-element>nav</a></code></li>
    <li><code><a href=#the-noscript-element>noscript</a></code></li>
@@ -9875,15 +9899,15 @@
    <li><code><a href=#the-kbd-element>kbd</a></code></li>
    <li><code><a href=#the-keygen-element>keygen</a></code></li>
    <li><code><a href=#the-label-element>label</a></code></li>
-
+<!--MD-->
    <li><code><a href=#the-link-element>link</a></code> (if the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present)</li>
-
+<!--MD-->
    <li><code><a href=#the-map-element>map</a></code> (if it contains only <a href=#phrasing-content>phrasing content</a>)</li>
    <li><code><a href=#the-mark-element>mark</a></code></li>
    <li><code><a href=#math>math</a></code></li>
-
+<!--MD-->
    <li><code><a href=#meta>meta</a></code> (if the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present)</li>
-
+<!--MD-->
    <li><code><a href=#the-meter-element>meter</a></code></li>
    <li><code><a href=#the-noscript-element>noscript</a></code></li>
    <li><code><a href=#the-object-element>object</a></code></li>
@@ -11867,16 +11891,16 @@
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#metadata-content>Metadata content</a>.</dd>
-
+<!--MD-->
    <dd>If the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present: <a href=#flow-content>flow content</a>.</dd>
    <dd>If the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present: <a href=#phrasing-content>phrasing content</a>.</dd>
-
+<!--MD-->
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <a href=#metadata-content>metadata content</a> is expected.</dd>
    <dd>In a <code><a href=#the-noscript-element>noscript</a></code> element that is a child of a <code><a href=#the-head-element-0>head</a></code> element.</dd>
-
+<!--MD-->
    <dd>If the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present: where <a href=#phrasing-content>phrasing content</a> is expected.</dd>
-
+<!--MD-->
    <dt>Content model:</dt>
    <dd>Empty.</dd>
    <dt>Content attributes:</dt>
@@ -11910,7 +11934,7 @@
   surrounded by spaces</a>. <span class=impl>If the <code title=attr-link-href><a href=#attr-link-href>href</a></code> attribute is absent, then the
   element does not define a link.</span></p>
 
-
+<!--MD-->
   <p>A <code><a href=#the-link-element>link</a></code> element must have either a <code title=attr-link-rel><a href=#attr-link-rel>rel</a></code> attribute, or an <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute, or both.</p>
 
   <p>The types of link indicated (the relationships) are given by the
@@ -12238,19 +12262,19 @@
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#metadata-content>Metadata content</a>.</dd>
-
+<!--MD-->
    <dd>If the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present: <a href=#flow-content>flow content</a>.</dd>
    <dd>If the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present: <a href=#phrasing-content>phrasing content</a>.</dd>
-
+<!--MD-->
    <dt>Contexts in which this element may be used:</dt>
    <dd>If the <code title=attr-meta-charset><a href=#attr-meta-charset>charset</a></code> attribute is present, or if the element's <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute is in the <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration state</a>: in a <code><a href=#the-head-element-0>head</a></code> element.</dd>
    <dd>If the <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute is present but not in the <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration state</a>: in a <code><a href=#the-head-element-0>head</a></code> element.</dd>
    <dd>If the <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute is present but not in the <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration state</a>: in a <code><a href=#the-noscript-element>noscript</a></code> element that is a child of a <code><a href=#the-head-element-0>head</a></code> element.</dd>
    <dd>If the <code title=attr-meta-name><a href=#attr-meta-name>name</a></code> attribute is present: where <a href=#metadata-content>metadata content</a> is expected.</dd>
-
+<!--MD-->
    <dd>If the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present: where <a href=#metadata-content>metadata content</a> is expected.</dd>
    <dd>If the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present: where <a href=#phrasing-content>phrasing content</a> is expected.</dd>
-
+<!--MD-->
    <dt>Content model:</dt>
    <dd>Empty.</dd>
    <dt>Content attributes:</dt>
@@ -12279,7 +12303,7 @@
   document is serialized to string form (e.g. for transmission over
   the network or for disk storage) with the <code title=attr-meta-charset><a href=#attr-meta-charset>charset</a></code> attribute.</p>
 
-
+<!--MD-->
   <p>Exactly one of the <code title=attr-meta-name><a href=#attr-meta-name>name</a></code>,
   <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code>, <code title=attr-meta-charset><a href=#attr-meta-charset>charset</a></code>, and <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attributes must be
   specified.</p>
@@ -19852,13 +19876,18 @@
 
   <p>User agents may always provide the user with the option to
   display any image, or to prevent any image from being
-  displayed. User agents may also apply heuristics to help the user
-  make use of the image when the user is unable to see it, e.g. due to
-  a visual disability or because they are using a text terminal with
-  no graphics capabilities. Such heuristics could include, for
-  instance, optical character recognition (OCR) of text found within
-  the image.</p>
+  displayed.
 
+  <!--POLITICS-->
+  User agents may also apply heuristics to help the user make use of
+  the image when the user is unable to see it, e.g. due to a visual
+  disability or because they are using a text terminal with no
+  graphics capabilities. Such heuristics could include, for instance,
+  optical character recognition (OCR) of text found within the image.
+  <!--POLITICS-->
+
+  </p>
+
   <p class=warning>While user agents are encouraged to repair cases
   of missing <code title=attr-img-alt><a href=#attr-img-alt>alt</a></code> attributes, authors
   must not rely on such behavior. <a href=#alt>Requirements for
@@ -27027,14 +27056,14 @@
 
    </dd>
 
-  </dl><p>This specification only defines one context, with the name "<code title=canvas-context-2d><a href=#canvas-context-2d>2d</a></code>". <span class=impl>If <code title=dom-canvas-getContext><a href=#dom-canvas-getcontext>getContext()</a></code> is called with
+  </dl><!--2DCONTEXT--><p>This specification only defines one context, with the name "<code title=canvas-context-2d><a href=#canvas-context-2d>2d</a></code>". <span class=impl>If <code title=dom-canvas-getContext><a href=#dom-canvas-getcontext>getContext()</a></code> is called with
   that exact string for its <var title="">contextId</var> argument,
   then the UA must return a reference to an object implementing
   <code><a href=#canvasrenderingcontext2d>CanvasRenderingContext2D</a></code>. Other specifications may
   define their own contexts, which would return different
   objects.</span></p>
 
-  
+  <!--2DCONTEXT-->
 
   <div class=impl>
 
@@ -27137,7 +27166,7 @@
 
   </div>
 
-  
+  <!--2DCONTEXT-->
 
   <div data-component="HTML Canvas 2D Context (editor: Ian Hickson)">
 
@@ -29988,7 +30017,7 @@
 
   </div><!--data-component-->
 
-  
+  <!--2DCONTEXT-->
 
   <div class=impl>
 
@@ -33258,7 +33287,7 @@
      <td>34.3%
      <td>34.0%
      <td>29.0%
-  </table><hr><p>The following shows how one might mark up the operating expenses
+  </table><!--HTML4POLICE--><hr><p>The following shows how one might mark up the operating expenses
   table from lower on the same page of that document:</p>
 
   <pre><table>
@@ -47488,8 +47517,8 @@
   </ol></div>
 
 
+<!--DEVICE-->
 
-
   <h4 id=devices><span class=secno>4.11.6 </span>The <dfn><code>device</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
@@ -47698,11 +47727,11 @@
   client, the configuration information should always be transmitted
   using an encrypted connection.</p>
 
+<!--DEVICE-->
 
 
 
 
-
   <h3 id=links><span class=secno>4.12 </span>Links</h3>
 
 
@@ -49629,9 +49658,9 @@
 
   </div>
 
+<!--MD-->
 
 
-
   <div data-component="HTML Microdata (editor: Ian Hickson)">
 
   <h2 id=microdata><span class=secno>5 </span><dfn>Microdata</dfn></h2>
@@ -53331,15 +53360,10 @@
 
 
 
-
-
   <div class=impl>
 
   <h3 id=converting-html-to-other-formats><span class=secno>5.5 </span>Converting HTML to other formats</h3>
 
-
-
-
   <h4 id=json><span class=secno>5.5.1 </span>JSON</h4>
 
   <p>Given a list of nodes <var title="">nodes</var> in a
@@ -54268,9 +54292,9 @@
 
   <p>The <dfn id=atom-namespace>Atom namespace</dfn> is: <code>http://www.w3.org/2005/Atom</code></p>
 
+<!--MD-->
 
 
-
   </div>
 
 
@@ -54809,9 +54833,9 @@
   void <a href=#dom-print title=dom-print>print</a>();
   any <a href=#dom-showmodaldialog title=dom-showModalDialog>showModalDialog</a>(in DOMString url, in optional any argument<!--, in optional DOMString features-->);
 
-  // <a href=#web-messaging>cross-document messaging</a>
+<!--POSTMSG-->  // <a href=#web-messaging>cross-document messaging</a>
   void <a href=#dom-window-postmessage title=dom-window-postMessage>postMessage</a>(in any message, in DOMString targetOrigin, in optional <a href=#messageportarray>MessagePortArray</a> ports);
-
+<!--POSTMSG-->
   // <a href=#event-handler-idl-attributes>event handler IDL attributes</a>
            attribute <a href=#function>Function</a> <a href=#handler-onabort title=handler-onabort>onabort</a>;
            attribute <a href=#function>Function</a> <a href=#handler-window-onafterprint title=handler-window-onafterprint>onafterprint</a>;
@@ -64943,8 +64967,8 @@
 
    </li>
 
+<!--MD-->
 
-
    <li>
 
     <p>The user agent must take the <a href=#list-of-dragged-nodes>list of dragged nodes</a>
@@ -77378,7 +77402,9 @@
   the <code><a href=#video>video</a></code> element itself, and is expected to be
   centered in the <code><a href=#video>video</a></code> element.</p>
 
+<!--TT-->
   <p class=XXX>pointer to rendering model for timed tracks</p>
+<!--TT-->
 
   <p class=note>Resizing <code><a href=#video>video</a></code> and <code><a href=#the-canvas-element>canvas</a></code>
   elements does not interrupt video playback or clear the canvas.</p>
@@ -77392,6 +77418,7 @@
   </div>
 
 
+<!--TT-->
   <div class=impl>
 
   <h4 id=timed-tracks-0><span class=secno>12.3.2 </span>Timed tracks</h4>
@@ -77401,6 +77428,7 @@
   <p class=XXX>CSS extensions</p>
 
   </div>
+<!--TT-->
 
 
   <div class=impl>
@@ -80583,6 +80611,7 @@
   <code><a href=#text/ping>text/ping</a></code> resources.</p>
 <!--PING-->
 
+<!--TT-->
   <h3 id=text/srt><span class=secno>14.6 </span><dfn><code>text/srt</code></dfn></h3>
 
   <p>This registration is for community review and will be submitted
@@ -80648,9 +80677,10 @@
    <dd>WHATWG</dd>
   </dl><p>Fragment identifiers have no meaning with
   <code><a href=#text/srt>text/srt</a></code> resources.</p>
+<!--TT-->
 
+<!--MD-->
 
-
   <h3 id=application/microdata+json><span class=secno>14.7 </span><dfn><code>application/microdata+json</code></dfn></h3>
 
 
@@ -80717,8 +80747,8 @@
   <code><a href=#application/microdata+json>application/microdata+json</a></code> resources have the same
   semantics as when used with <code>application/json</code>. <a href=#refsJSON>[JSON]</a></p>
 
+<!--MD-->
 
-
 <!--PING-->
   <h3 id=ping-from><span class=secno>14.8 </span><dfn title=http-ping-from><code>Ping-From</code></dfn></h3>
 
@@ -81998,10 +82028,10 @@
       <a href=#text-content title="text content">Text</a>
      <td>
       <code><a href=#the-area-element>area</a></code> (if it is a descendant of a <code><a href=#the-map-element>map</a></code> element);
-      
+      <!--MD-->
       <code><a href=#the-link-element>link</a></code> (if the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present);
       <code><a href=#meta>meta</a></code> (if the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present);
-      
+      <!--MD-->
       <code><a href=#the-style-element>style</a></code> (if the <code title=attr-style-scoped><a href=#attr-style-scoped>scoped</a></code> attribute is present)
 
     <tr><td> <a href=#sectioning-content>Sectioning content</a>
@@ -82077,13 +82107,13 @@
       <code><a href=#the-area-element>area</a></code> (if it is a descendant of a  <code><a href=#the-map-element>map</a></code> element);
       <code><a href=#the-del-element>del</a></code> (if it contains only <a href=#phrasing-content>phrasing content</a>);
       <code><a href=#the-ins-element>ins</a></code> (if it contains only <a href=#phrasing-content>phrasing content</a>);
-      
+      <!--MD-->
       <code><a href=#the-link-element>link</a></code> (if the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present);
-      
+      <!--MD-->
       <code><a href=#the-map-element>map</a></code> (if it contains only <a href=#phrasing-content>phrasing content</a>)<!--
-      --><!--
+      --><!--MD--><!--
       -->; <code><a href=#meta>meta</a></code> (if the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present)<!--
-      --><!--
+      --><!--MD--><!--
       -->
 
     <tr><td> <a href=#embedded-content>Embedded content</a>
@@ -82475,7 +82505,7 @@
      <td> <code title=attr-img-ismap><a href=#attr-img-ismap>img</a></code>
      <td> Whether the image is a server-side image map
      <td> <a href=#boolean-attribute>Boolean attribute</a>
-
+<!--MD-->
     <tr><th> <code title="">itemid</code>
      <td> <a href=#attr-itemid title=attr-itemid>HTML elements</a>
      <td> <a href=#global-identifier>Global identifier</a> for a microdata item
@@ -82496,7 +82526,7 @@
      <td> <a href=#attr-itemtype title=attr-itemtype>HTML elements</a>
      <td> <a href=#item-type>Item type</a> of a microdata item
      <td> <a href=#absolute-url title="absolute URL">Valid absolute URL</a>*
-
+<!--MD-->
     <tr><th> <code title="">keytype</code>
      <td> <code title=attr-keygen-keytype><a href=#attr-keygen-keytype>keygen</a></code>
      <td> The type of cryptographic key to generate
@@ -83742,11 +83772,6 @@
 
 
 
-
-
-
-
-
   <h2 class=no-num id=references>References</h2><!--REFS-->
 
   <p>All references are normative unless marked "Non-normative".</p>

Modified: source
===================================================================
--- source	2010-06-02 04:19:24 UTC (rev 5100)
+++ source	2010-06-05 05:55:00 UTC (rev 5101)
@@ -17,7 +17,7 @@
 
   <h2 id="introduction">Introduction</h2>
 
-<!--END w3c-html-->
+<!--END w3c-html--><!--VERSION-->
 
   <h3>Is this HTML5?</h3>
 
@@ -42,21 +42,45 @@
   <p>The W3C has also been working on HTML in conjunction with the
   WHATWG; at the W3C, this document has been split into several parts,
   and the occasional informative paragraph or example has been removed
-  for technical reasons. For all intents and purposes, however, the
-  W3C HTML specifications and this specification are equivalent (and
-  they are in fact all generated from the same source document).</p>
+  for technical or editorial reasons. For all intents and purposes,
+  however, the W3C HTML specifications and this specification are
+  equivalent (and they are in fact all generated from the same source
+  document). The minor differences are:</p>
 
+  <ul class="brief">
+
+   <li>Instead of this section, the W3C version has a different
+   paragraph explaining the difference between the W3C and WHATWG
+   versions of HTML.</li>
+
+   <li>The W3C version refers to the technology as HTML5, rather than
+   just HTML.</li>
+
+   <li>Examples that use features from HTML5 are not present in the
+   W3C version since the W3C version is published as HTML4 due to W3C
+   publication policies.</li>
+
+   <li>The W3C version includes a redundant and inconsistent reference
+   to the WCAG document.</li>
+
+   <li>The W3C version omits a paragraph of implementation advice for
+   political reasons.</li>
+
+  </ul>
+
   <p>Features that are considered part of the next generation of HTML
-  beyond HTML5 currently consist of only:</p>
+  beyond HTML5 (and that are therefore not included in the W3C version
+  of HTML5) currently consist of:</p>
 
   <ul class="brief">
    <li>The <code>device</code> element.</li>
    <li>The <code title="attr-hyperlink-ping">ping</code> attribute and related <span>hyperlink auditing</span> features.</li>
+   <li>The <span>timed track</span> model for <span title="media element">media elements</span>, the <span>WebSRT</span> format, and related features.</li>
   </ul>
 
-  <p>Features that are part of HTML5 (and this specification) but that
-  are either currently, or have been in the past, published as
-  separate specifications:</p>
+  <p>Features that are part of HTML (and this specification) but that
+  are currently published as separate specifications as well, and are
+  not included in the W3C HTML5 specification, consist of:</p>
 
   <ul class="brief">
    <li><a href="#2dcontext">Canvas 2D Graphics Context</a>
@@ -64,9 +88,12 @@
    <li><a href="#mdvocabs">Microdata vocabularies</a>
    <li><a href="#crossDocumentMessages">Cross-document messaging</a> (also known as Communications)
    <li><a href="#channel-messaging">Channel messaging</a> (also known as Communications)
-   <li><a href="#forms">Forms</a> (previously known as Web Forms 2)
   </ul>
 
+  <p>The <a href="#forms">forms</a> part of this specification was
+  previously published separately in a specification known as Web
+  Forms 2.</p>
+
   <p>Features that are not currently in this document that were in the
   past considered part of HTML5, or that were never part of HTML5 but
   have been referred to as part of HTML5 in the media, include:</p>
@@ -87,9 +114,8 @@
    <li><a href="http://dev.w3.org/2006/webapi/XMLHttpRequest-2/">XMLHttpRequest</a>
   </ul>
 
-
+<!--END html-->
 <!--START complete--><!--START epub-->
-<!--END html-->
 
   <p>No, although it does contain everything that is part of HTML5. If
   you want only HTML5, please see <a
@@ -100,8 +126,7 @@
   href="http://wiki.whatwg.org/wiki/FAQ#What_are_the_various_versions_of_the_spec.3F">the
   relevant FAQ entry</a>.</p>
 
-<!--START html-->
-<!--START w3c-html-->
+<!--START html--><!--START w3c-html--><!--VERSION-->
 
 
   <h3>Background</h3>
@@ -263,6 +288,19 @@
 
   <p>Since then, both groups have been working together.</p>
 
+<!--END complete--><!--END epub--><!--END html--><!--w3c-html--><!--VERSION-->
+
+  <p>The specification published by the WHATWG is not identical to
+  this specification. The main differences are that the WHATWG version
+  includes features not included in this W3C version: some features
+  have been omitted as they are considered part of future revisions of
+  HTML, not HTML5; and other features are omitted because at the W3C
+  they are published as separate specifications. There are also some
+  minor differences. For an exact list of differences, please see the
+  WHATWG specification.</p>
+
+<!--START complete--><!--START epub--><!--START html--><!--w3c-html--><!--VERSION-->
+
   <p>A separate document has been published by the W3C HTML working
   group to document the differences between this specification and the
   language described in the HTML4 specification. <a
@@ -352,10 +390,10 @@
   <!--END html--><!--END complete--><!--END epub-->
   This specification defines version 5 of the HTML syntax, known as
   "HTML5".
-  <!--START html--><!--START complete--><!--START epub--><!--END w3c-html-->
+  <!--START html--><!--START complete--><!--START epub--><!--END w3c-html--><!--VERSION-->
   This specification defines the latest HTML syntax, known simply as
   "HTML".
-  <!--START w3c-html-->
+  <!--START w3c-html--><!--VERSION-->
 
   </p>
 
@@ -371,10 +409,10 @@
   <!--END html--><!--END complete--><!--END epub-->
   This specification defines version 5 of the XHTML syntax, known as
   "XHTML5".
-  <!--START html--><!--START complete--><!--START epub--><!--END w3c-html-->
+  <!--START html--><!--START complete--><!--START epub--><!--END w3c-html--><!--VERSION-->
   This specification defines the latest XHTML syntax, known simply as
   "XHTML".
-  <!--START w3c-html-->
+  <!--START w3c-html--><!--VERSION-->
 
   </p>
 
@@ -419,7 +457,7 @@
    class="impl">, along with user agent requirements for how to handle
    each element,</span> are also given.</dd>
 
-<!--END w3c-html-->
+<!--END w3c-html--><!--MD-->
    <dt><a href="#microdata">Microdata</a></dt>
 
    <dd>This specification introduces a mechanism for adding
@@ -433,7 +471,7 @@
    information, calendar events, and licensing works.
 
    </dd>
-<!--START w3c-html-->
+<!--START w3c-html--><!--MD-->
 
    <dt><a href="#browsers">Loading Web pages</a></dt>
 
@@ -466,7 +504,7 @@
    based on name-value pairs.</dd>
 <!--START html--><!--START w3c-html-->
 
-<!--END w3c-html-->
+<!--END w3c-html--><!--POSTMSG-->
    <dt><a href="#comms">The communication APIs</a></dt>
 
    <dd>This section describes some mechanisms that applications
@@ -477,7 +515,7 @@
    two-way full-duplex socket protocol for scripts.
 <!--START html-->
    </dd>
-<!--START w3c-html-->
+<!--START w3c-html--><!--POSTMSG-->
 
 
    <dt><a href="#syntax">The HTML syntax</a></dt>
@@ -1856,11 +1894,11 @@
     <p>The term "HTML5 validator" can be used to refer to a
     conformance checker that itself conforms to the applicable
     requirements of this specification.</p>
-    <!--START html--><!--START complete--><!--START epub--><!--END w3c-html-->
+    <!--START html--><!--START complete--><!--START epub--><!--END w3c-html--><!--VERSION-->
     <p>The term "HTML validator" can be used to refer to a
     conformance checker that itself conforms to the applicable
     requirements of this specification.</p>
-    <!--START w3c-html-->
+    <!--START w3c-html--><!--VERSION-->
 
     <div class="note">
 
@@ -4815,13 +4853,13 @@
 
   <hr>
 
-  <!--END w3c-html-->
+  <!--END w3c-html--><!--2DCANVAS-->
 
   <p class="note">The <span title="canvas-context-2d">2D graphics
   context</span> has a separate color syntax that also handles
   opacity.</p>
 
-  <!--START w3c-html-->
+  <!--START w3c-html--><!--2DCANVAS-->
 
 
   <h4>Space-separated tokens</h4>
@@ -6846,7 +6884,7 @@
 
   </div>
 
-<!--END w3c-html-->
+<!--END w3c-html--><!--MD-->
   <div data-component="HTML Microdata (editor: Ian Hickson)">
 <!--START microdata-->
 <!--FIXUP microdata -1-->
@@ -6954,7 +6992,7 @@
   </div>
 <!--END microdata-->
   </div><!--data-component-->
-<!--START w3c-html-->
+<!--START w3c-html--><!--MD-->
 
 
   <h4>DOMTokenList</h4>
@@ -7642,7 +7680,7 @@
   readonly attribute <span>HTMLCollection</span> <span title="dom-document-scripts">scripts</span>;
   NodeList <span title="dom-document-getElementsByName">getElementsByName</span>(in DOMString elementName);
   NodeList <span title="dom-document-getElementsByClassName">getElementsByClassName</span>(in DOMString classNames);
-<!--END w3c-html-->  NodeList <span title="dom-document-getItems">getItems</span>(in optional DOMString typeNames); // <span>microdata</span> <!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION--><!--START w3c-html-->
+<!--END w3c-html--><!--MD-->  NodeList <span title="dom-document-getItems">getItems</span>(in optional DOMString typeNames); // <span>microdata</span> <!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION--><!--START w3c-html--><!--MD-->
 
   // <span>dynamic markup insertion</span>
            attribute DOMString <span title="dom-innerHTML">innerHTML</span>;
@@ -8776,7 +8814,7 @@
   readonly attribute <span>DOMTokenList</span> <span title="dom-classList">classList</span>;
   readonly attribute <span>DOMStringMap</span> <span title="dom-dataset">dataset</span>;
 
-<!--END w3c-html-->  // <span>microdata</span> <!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION-->
+<!--END w3c-html--><!--MD-->  // <span>microdata</span> <!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION-->
            attribute boolean <span title="dom-itemScope">itemScope</span>;
            attribute DOMString <span title="dom-itemType">itemType</span>;
            attribute DOMString <span title="dom-itemId">itemId</span>;
@@ -8784,7 +8822,7 @@
   [PutForwards=<span title="dom-DOMSettableTokenList-value">value</span>] readonly attribute <span>DOMSettableTokenList</span> <span title="dom-itemProp">itemProp</span>;
   readonly attribute <span>HTMLPropertiesCollection</span> <span title="dom-properties">properties</span>;
            attribute any <span title="dom-itemValue">itemValue</span>;
-<!--START w3c-html-->
+<!--START w3c-html--><!--MD-->
   // <span>user interaction</span>
            attribute boolean <span title="dom-hidden">hidden</span>;
   void <span title="dom-click">click</span>();
@@ -8901,13 +8939,13 @@
    <li><code title="attr-draggable">draggable</code></li>
    <li><code title="attr-hidden">hidden</code></li>
    <li><code title="attr-id">id</code></li>
-<!--END w3c-html--><!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION -->
+<!--END w3c-html--><!--MD--><!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION -->
    <li><code title="attr-itemid">itemid</code></li>
    <li><code title="attr-itemprop">itemprop</code></li>
    <li><code title="attr-itemref">itemref</code></li>
    <li><code title="attr-itemscope">itemscope</code></li>
    <li><code title="attr-itemtype">itemtype</code></li>
-<!--START w3c-html-->
+<!--START w3c-html--><!--MD-->
    <li><code title="attr-lang">lang</code></li>
    <li><code title="attr-spellcheck">spellcheck</code></li>
    <li><code title="attr-style">style</code></li>
@@ -9948,16 +9986,16 @@
    <li><code>kbd</code></li>
    <li><code>keygen</code></li>
    <li><code>label</code></li>
-<!--END w3c-html-->
+<!--END w3c-html--><!--MD-->
    <li><code>link</code> (if the <code title="attr-itemprop">itemprop</code> attribute is present)</li>
-<!--START w3c-html-->
+<!--START w3c-html--><!--MD-->
    <li><code>map</code></li>
    <li><code>mark</code></li>
    <li><code>math</code></li>
    <li><code>menu</code></li>
-<!--END w3c-html-->
+<!--END w3c-html--><!--MD-->
    <li><code>meta</code> (if the <code title="attr-itemprop">itemprop</code> attribute is present)</li>
-<!--START w3c-html-->
+<!--START w3c-html--><!--MD-->
    <li><code>meter</code></li>
    <li><code>nav</code></li>
    <li><code>noscript</code></li>
@@ -10082,15 +10120,15 @@
    <li><code>kbd</code></li>
    <li><code>keygen</code></li>
    <li><code>label</code></li>
-<!--END w3c-html-->
+<!--END w3c-html--><!--MD-->
    <li><code>link</code> (if the <code title="attr-itemprop">itemprop</code> attribute is present)</li>
-<!--START w3c-html-->
+<!--START w3c-html--><!--MD-->
    <li><code>map</code> (if it contains only <span>phrasing content</span>)</li>
    <li><code>mark</code></li>
    <li><code>math</code></li>
-<!--END w3c-html-->
+<!--END w3c-html--><!--MD-->
    <li><code>meta</code> (if the <code title="attr-itemprop">itemprop</code> attribute is present)</li>
-<!--START w3c-html-->
+<!--START w3c-html--><!--MD-->
    <li><code>meter</code></li>
    <li><code>noscript</code></li>
    <li><code>object</code></li>
@@ -12371,16 +12409,16 @@
   <dl class="element">
    <dt>Categories</dt>
    <dd><span>Metadata content</span>.</dd>
-<!--END w3c-html-->
+<!--END w3c-html--><!--MD-->
    <dd>If the <code title="attr-itemprop">itemprop</code> attribute is present: <span>flow content</span>.</dd>
    <dd>If the <code title="attr-itemprop">itemprop</code> attribute is present: <span>phrasing content</span>.</dd>
-<!--START w3c-html-->
+<!--START w3c-html--><!--MD-->
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <span>metadata content</span> is expected.</dd>
    <dd>In a <code>noscript</code> element that is a child of a <code>head</code> element.</dd>
-<!--END w3c-html-->
+<!--END w3c-html--><!--MD-->
    <dd>If the <code title="attr-itemprop">itemprop</code> attribute is present: where <span>phrasing content</span> is expected.</dd>
-<!--START w3c-html-->
+<!--START w3c-html--><!--MD-->
    <dt>Content model:</dt>
    <dd>Empty.</dd>
    <dt>Content attributes:</dt>
@@ -12418,11 +12456,11 @@
   title="attr-link-href">href</code> attribute is absent, then the
   element does not define a link.</span></p>
 
-<!--END w3c-html-->
+<!--END w3c-html--><!--MD-->
   <p>A <code>link</code> element must have either a <code
   title="attr-link-rel">rel</code> attribute, or an <code
   title="attr-itemprop">itemprop</code> attribute, or both.</p>
-<!--START w3c-html--><!--END html--><!--END complete--><!--END epub-->
+<!--START w3c-html--><!--MD--><!--END html--><!--END complete--><!--END epub-->
   <p>A <code>link</code> element must have <code
   title="attr-link-rel">rel</code> attribute.</p>
 <!--START html--><!--START complete--><!--START epub-->
@@ -12802,19 +12840,19 @@
   <dl class="element">
    <dt>Categories</dt>
    <dd><span>Metadata content</span>.</dd>
-<!--END w3c-html-->
+<!--END w3c-html--><!--MD-->
    <dd>If the <code title="attr-itemprop">itemprop</code> attribute is present: <span>flow content</span>.</dd>
    <dd>If the <code title="attr-itemprop">itemprop</code> attribute is present: <span>phrasing content</span>.</dd>
-<!--START w3c-html-->
+<!--START w3c-html--><!--MD-->
    <dt>Contexts in which this element may be used:</dt>
    <dd>If the <code title="attr-meta-charset">charset</code> attribute is present, or if the element's <code title="attr-meta-http-equiv">http-equiv</code> attribute is in the <span title="attr-meta-http-equiv-content-type">Encoding declaration state</span>: in a <code>head</code> element.</dd>
    <dd>If the <code title="attr-meta-http-equiv">http-equiv</code> attribute is present but not in the <span title="attr-meta-http-equiv-content-type">Encoding declaration state</span>: in a <code>head</code> element.</dd>
    <dd>If the <code title="attr-meta-http-equiv">http-equiv</code> attribute is present but not in the <span title="attr-meta-http-equiv-content-type">Encoding declaration state</span>: in a <code>noscript</code> element that is a child of a <code>head</code> element.</dd>
    <dd>If the <code title="attr-meta-name">name</code> attribute is present: where <span>metadata content</span> is expected.</dd>
-<!--END w3c-html-->
+<!--END w3c-html--><!--MD-->
    <dd>If the <code title="attr-itemprop">itemprop</code> attribute is present: where <span>metadata content</span> is expected.</dd>
    <dd>If the <code title="attr-itemprop">itemprop</code> attribute is present: where <span>phrasing content</span> is expected.</dd>
-<!--START w3c-html-->
+<!--START w3c-html--><!--MD-->
    <dt>Content model:</dt>
    <dd>Empty.</dd>
    <dt>Content attributes:</dt>
@@ -12847,7 +12885,7 @@
   the network or for disk storage) with the <code
   title="attr-meta-charset">charset</code> attribute.</p>
 
-<!--END w3c-html-->
+<!--END w3c-html--><!--MD-->
   <p>Exactly one of the <code title="attr-meta-name">name</code>,
   <code title="attr-meta-http-equiv">http-equiv</code>, <code
   title="attr-meta-charset">charset</code>, and <code
@@ -12860,7 +12898,7 @@
   title="attr-meta-content">content</code> attribute must also be
   specified. Otherwise, it must be omitted.</p>
 <!--END html--><!--END complete--><!--END epub-->
-<!--START w3c-html-->
+<!--START w3c-html--><!--MD-->
   <p>Exactly one of the <code title="attr-meta-name">name</code>,
   <code title="attr-meta-http-equiv">http-equiv</code>, and <code
   title="attr-meta-charset">charset</code> attributes must be
@@ -20935,6 +20973,7 @@
   attribute's value are described <a href="#alt">in the next
   section</a>.
   <!--END complete--><!--END epub--><!--END html-->
+  <!-- only included in w3c-html--><!--WCAG-->
   For guidance on accessibility requirements for text alternatives
   authors are encouraged to also consult
   <a href="http://www.w3.org/TR/WCAG20/">WCAG 2.0</a>.
@@ -21198,13 +21237,18 @@
 
   <p>User agents may always provide the user with the option to
   display any image, or to prevent any image from being
-  displayed. User agents may also apply heuristics to help the user
-  make use of the image when the user is unable to see it, e.g. due to
-  a visual disability or because they are using a text terminal with
-  no graphics capabilities. Such heuristics could include, for
-  instance, optical character recognition (OCR) of text found within
-  the image.</p>
+  displayed.
 
+  <!--END w3c-html--><!--POLITICS-->
+  User agents may also apply heuristics to help the user make use of
+  the image when the user is unable to see it, e.g. due to a visual
+  disability or because they are using a text terminal with no
+  graphics capabilities. Such heuristics could include, for instance,
+  optical character recognition (OCR) of text found within the image.
+  <!--START w3c-html--><!--POLITICS-->
+
+  </p>
+
   <p class="warning">While user agents are encouraged to repair cases
   of missing <code title="attr-img-alt">alt</code> attributes, authors
   must not rely on such behavior. <a href="#alt">Requirements for
@@ -29389,7 +29433,7 @@
 
   </dl>
 
-  <!--END w3c-html-->
+  <!--END w3c-html--><!--2DCONTEXT-->
 
   <p>This specification only defines one context, with the name "<code
   title="canvas-context-2d">2d</code>". <span class="impl">If <code
@@ -29400,7 +29444,7 @@
   define their own contexts, which would return different
   objects.</span></p>
 
-  <!--START w3c-html-->
+  <!--START w3c-html--><!--2DCONTEXT-->
   <!--END complete--><!--END epub--><!--END html-->
   <p>Contexts are defined by other specifications, for example the 2D
   Context specification. <a href="#refs2DCONTEXT">[2DCONTEXT]</a></p>
@@ -29531,7 +29575,7 @@
 
   </div>
 
-  <!--END w3c-html-->
+  <!--END w3c-html--><!--2DCONTEXT-->
 
   <div data-component="HTML Canvas 2D Context (editor: Ian Hickson)">
 
@@ -32938,7 +32982,7 @@
 
   </div><!--data-component-->
 
-  <!--START w3c-html-->
+  <!--START w3c-html--><!--2DCONTEXT-->
 
   <div class="impl">
 
@@ -36833,7 +36877,7 @@
      <td>34.0%
      <td>29.0%
   </table>
-<!--START w3c-html-->
+<!--START w3c-html--><!--HTML4POLICE-->
 
   <hr>
 
@@ -52965,7 +53009,7 @@
   </div>
 
 
-<!--END w3c-html--><!--START html-device-->
+<!--END w3c-html--><!--DEVICE--><!--START html-device-->
 
   <h4 id="devices">The <dfn><code>device</code></dfn> element</h4>
 
@@ -53194,7 +53238,7 @@
   client, the configuration information should always be transmitted
   using an encrypted connection.</p>
 
-<!--END html-device--><!--START w3c-html-->
+<!--END html-device--><!--START w3c-html--><!--DEVICE-->
 
 
 
@@ -55437,7 +55481,7 @@
 
   </div>
 
-<!--END w3c-html-->
+<!--END w3c-html--><!--MD-->
 
 
   <div data-component="HTML Microdata (editor: Ian Hickson)">
@@ -60004,15 +60048,10 @@
 
 <!--START microdata-->
 
-<!--START w3c-html-->
-
   <div class="impl">
 
   <h3>Converting HTML to other formats</h3>
 
-<!--END w3c-html-->
-
-
   <h4>JSON</h4>
 
   <p>Given a list of nodes <var title="">nodes</var> in a
@@ -61184,7 +61223,7 @@
 
   <p>The <dfn>Atom namespace</dfn> is: <code>http://www.w3.org/2005/Atom</code></p>
 
-<!--START w3c-html-->
+<!--START w3c-html--><!--MD-->
 <!--START microdata-->
 
   </div>
@@ -61792,9 +61831,9 @@
   void <span title="dom-print">print</span>();
   any <span title="dom-showModalDialog">showModalDialog</span>(in DOMString url, in optional any argument<!--, in optional DOMString features-->);
 
-<!--END w3c-html-->  // <span>cross-document messaging</span>
+<!--END w3c-html--><!--POSTMSG-->  // <span>cross-document messaging</span>
   void <span title="dom-window-postMessage">postMessage</span>(in any message, in DOMString targetOrigin, in optional <span>MessagePortArray</span> ports);
-<!--START w3c-html-->
+<!--START w3c-html--><!--POSTMSG-->
   // <span>event handler IDL attributes</span>
            attribute <span>Function</span> <span title="handler-onabort">onabort</span>;
            attribute <span>Function</span> <span title="handler-window-onafterprint">onafterprint</span>;
@@ -73556,7 +73595,7 @@
 
    </li>
 
-<!--END w3c-html-->
+<!--END w3c-html--><!--MD-->
 
    <li>
 
@@ -73571,7 +73610,7 @@
    </li>
 
 <!--END complete--><!--END epub--><!--END html-->
-<!--START w3c-html-->
+<!--START w3c-html--><!--MD-->
 
    <li>Perform <dfn>drag-and-drop initialization steps</dfn> defined
    in other relevant specificaations.</li>
@@ -77135,7 +77174,6 @@
   </div>
 
   <!--END html-->
-
   <!--END postmsg-->
 
   </div><!--data-component-->
@@ -95857,7 +95895,9 @@
   the <code>video</code> element itself, and is expected to be
   centered in the <code>video</code> element.</p>
 
+<!--END w3c-html--><!--TT-->
   <p class="XXX">pointer to rendering model for timed tracks</p>
+<!--START w3c-html--><!--TT-->
 
   <p class="note">Resizing <code>video</code> and <code>canvas</code>
   elements does not interrupt video playback or clear the canvas.</p>
@@ -95873,6 +95913,7 @@
   </div>
 
 
+<!--END w3c-html--><!--TT-->
   <div class="impl">
 
   <h4>Timed tracks</h4>
@@ -95882,6 +95923,7 @@
   <p class="XXX">CSS extensions</p>
 
   </div>
+<!--START w3c-html--><!--TT-->
 
 
   <div class="impl">
@@ -99603,6 +99645,7 @@
   <code>text/ping</code> resources.</p>
 <!--START w3c-html--><!--PING-->
 
+<!--END w3c-html--><!--TT-->
   <h3><dfn><code>text/srt</code></dfn></h3>
 
   <p>This registration is for community review and will be submitted
@@ -99673,10 +99716,11 @@
 
   <p>Fragment identifiers have no meaning with
   <code>text/srt</code> resources.</p>
+<!--START w3c-html--><!--TT-->
 
-<!--END w3c-html-->
+<!--END w3c-html--><!--MD--><!--START microdata-->
 
-<!--END complete--><!--END epub--><!--END html--><!--START microdata-->
+<!--END complete--><!--END epub--><!--END html-->
   <h4><dfn><code>application/microdata+json</code></dfn></h4>
 <!--START complete--><!--START epub--><!--START html--><!--END microdata-->
   <h3><dfn><code>application/microdata+json</code></dfn></h3>
@@ -99753,7 +99797,7 @@
   semantics as when used with <code>application/json</code>. <a
   href="#refsJSON">[JSON]</a></p>
 
-<!--END microdata--><!--START w3c-html-->
+<!--END microdata--><!--START w3c-html--><!--MD-->
 
 <!--END w3c-html--><!--PING-->
   <h3><dfn title="http-ping-from"><code>Ping-From</code></dfn></h3>
@@ -101360,10 +101404,10 @@
       <span title="text content">Text</span>
      <td>
       <code>area</code> (if it is a descendant of a <code>map</code> element);
-      <!--END w3c-html-->
+      <!--END w3c-html--><!--MD-->
       <code>link</code> (if the <code title="attr-itemprop">itemprop</code> attribute is present);
       <code>meta</code> (if the <code title="attr-itemprop">itemprop</code> attribute is present);
-      <!--START w3c-html-->
+      <!--START w3c-html--><!--MD-->
       <code>style</code> (if the <code title="attr-style-scoped">scoped</code> attribute is present)
 
     <tr>
@@ -101442,13 +101486,13 @@
       <code>area</code> (if it is a descendant of a  <code>map</code> element);
       <code>del</code> (if it contains only <span>phrasing content</span>);
       <code>ins</code> (if it contains only <span>phrasing content</span>);
-      <!--END w3c-html-->
+      <!--END w3c-html--><!--MD-->
       <code>link</code> (if the <code title="attr-itemprop">itemprop</code> attribute is present);
-      <!--START w3c-html-->
+      <!--START w3c-html--><!--MD-->
       <code>map</code> (if it contains only <span>phrasing content</span>)<!--
-      --><!--END w3c-html--><!--
+      --><!--END w3c-html--><!--MD--><!--
       -->; <code>meta</code> (if the <code title="attr-itemprop">itemprop</code> attribute is present)<!--
-      --><!--START w3c-html--><!--
+      --><!--START w3c-html--><!--MD--><!--
       -->
 
     <tr>
@@ -101907,7 +101951,7 @@
      <td> <code title="attr-img-ismap">img</code>
      <td> Whether the image is a server-side image map
      <td> <span>Boolean attribute</span>
-<!--END w3c-html-->
+<!--END w3c-html--><!--MD-->
     <tr>
      <th> <code title="">itemid</code>
      <td> <span title="attr-itemid">HTML elements</span>
@@ -101933,7 +101977,7 @@
      <td> <span title="attr-itemtype">HTML elements</span>
      <td> <span>Item type</span> of a microdata item
      <td> <span title="absolute URL">Valid absolute URL</span>*
-<!--START w3c-html-->
+<!--START w3c-html--><!--MD-->
     <tr>
      <th> <code title="">keytype</code>
      <td> <code title="attr-keygen-keytype">keygen</code>
@@ -103486,11 +103530,10 @@
   events</a>, <a href="#appcacheevents">application cache events</a>,
   and <a href="#dndevents">drag-and-drop events</a>.</p>
 
-<!--END w3c-html-->
+<!--END w3c-html--><!--END html-->
 
 
-<!--START complete--><!--START epub-->
-
+<!--START complete--><!--START epub--><!--START html-->
 <!--START html-device--><!--START microdata--><!--START 2dcontext--><!--START postmsg--><!--START w3c-html-->
 <!--START websocket-api--><!--START storage--><!--START database--><!--START eventsource--><!--START workers-->
 <!--START whatwg-workers--><!--START vocabs--><!--START vCard--><!--START vEvent--><!--START work-->




More information about the Commit-Watchers mailing list