[html5] r4576 - [e] (0) Tweak the spec's name based on adactio's feedback.

whatwg at whatwg.org whatwg at whatwg.org
Mon Jan 11 05:23:10 PST 2010


Author: ianh
Date: 2010-01-11 05:23:07 -0800 (Mon, 11 Jan 2010)
New Revision: 4576

Modified:
   complete.html
   index
   source
Log:
[e] (0) Tweak the spec's name based on adactio's feedback.

Modified: complete.html
===================================================================
--- complete.html	2010-01-11 11:25:12 UTC (rev 4575)
+++ complete.html	2010-01-11 13:23:07 UTC (rev 4576)
@@ -172,21 +172,22 @@
 <ol class=toc>
  <li><a href=#introduction><span class=secno>1 </span>Introduction</a>
   <ol>
-   <li><a href=#background><span class=secno>1.1 </span>Background</a></li>
-   <li><a href=#audience><span class=secno>1.2 </span>Audience</a></li>
-   <li><a href=#scope><span class=secno>1.3 </span>Scope</a></li>
-   <li><a href=#history-1><span class=secno>1.4 </span>History</a></li>
-   <li><a href=#design-notes><span class=secno>1.5 </span>Design notes</a>
+   <li><a href=#is-this-html5?><span class=secno>1.1 </span>Is this HTML5?</a></li>
+   <li><a href=#background><span class=secno>1.2 </span>Background</a></li>
+   <li><a href=#audience><span class=secno>1.3 </span>Audience</a></li>
+   <li><a href=#scope><span class=secno>1.4 </span>Scope</a></li>
+   <li><a href=#history-1><span class=secno>1.5 </span>History</a></li>
+   <li><a href=#design-notes><span class=secno>1.6 </span>Design notes</a>
     <ol>
-     <li><a href=#serializability-of-script-execution><span class=secno>1.5.1 </span>Serializability of script execution</a></li>
-     <li><a href=#compliance-with-other-specifications><span class=secno>1.5.2 </span>Compliance with other specifications</a></ol></li>
-   <li><a href=#html-vs-xhtml><span class=secno>1.6 </span>HTML vs XHTML</a></li>
-   <li><a href=#structure-of-this-specification><span class=secno>1.7 </span>Structure of this specification</a>
+     <li><a href=#serializability-of-script-execution><span class=secno>1.6.1 </span>Serializability of script execution</a></li>
+     <li><a href=#compliance-with-other-specifications><span class=secno>1.6.2 </span>Compliance with other specifications</a></ol></li>
+   <li><a href=#html-vs-xhtml><span class=secno>1.7 </span>HTML vs XHTML</a></li>
+   <li><a href=#structure-of-this-specification><span class=secno>1.8 </span>Structure of this specification</a>
     <ol>
-     <li><a href=#how-to-read-this-specification><span class=secno>1.7.1 </span>How to read this specification</a></li>
-     <li><a href=#typographic-conventions><span class=secno>1.7.2 </span>Typographic conventions</a></ol></li>
-   <li><a href=#a-quick-introduction-to-html><span class=secno>1.8 </span>A quick introduction to HTML</a></li>
-   <li><a href=#recommended-reading><span class=secno>1.9 </span>Recommended reading</a></ol></li>
+     <li><a href=#how-to-read-this-specification><span class=secno>1.8.1 </span>How to read this specification</a></li>
+     <li><a href=#typographic-conventions><span class=secno>1.8.2 </span>Typographic conventions</a></ol></li>
+   <li><a href=#a-quick-introduction-to-html><span class=secno>1.9 </span>A quick introduction to HTML</a></li>
+   <li><a href=#recommended-reading><span class=secno>1.10 </span>Recommended reading</a></ol></li>
  <li><a href=#infrastructure><span class=secno>2 </span>Common infrastructure</a>
   <ol>
    <li><a href=#terminology><span class=secno>2.1 </span>Terminology</a>
@@ -444,7 +445,7 @@
        <li><a href=#security-and-privacy-considerations><span class=secno>4.8.10.13 </span>Security and privacy considerations</a></ol></li>
      <li><a href=#the-canvas-element><span class=secno>4.8.11 </span>The <code>canvas</code> element</a>
       <ol>
-       <li><a href=#the-2d-context><span class=secno>4.8.11.1 </span>The 2D context</a>
+       <li><a href=#2dcontext><span class=secno>4.8.11.1 </span>The 2D context</a>
         <ol>
          <li><a href=#the-canvas-state><span class=secno>4.8.11.1.1 </span>The canvas state</a></li>
          <li><a href=#transformations><span class=secno>4.8.11.1.2 </span>Transformations</a></li>
@@ -623,7 +624,7 @@
      <li><a href=#associating-names-with-items><span class=secno>5.2.5 </span>Associating names with items</a></li>
      <li><a href=#examples-1><span class=secno>5.2.6 </span>Examples</a></ol></li>
    <li><a href=#microdata-dom-api><span class=secno>5.3 </span>Microdata DOM API</a></li>
-   <li><a href=#microdata-vocabularies><span class=secno>5.4 </span>Microdata vocabularies</a>
+   <li><a href=#mdvocabs><span class=secno>5.4 </span>Microdata vocabularies</a>
     <ol>
      <li><a href=#vcard><span class=secno>5.4.1 </span>vCard</a>
       <ol>
@@ -1209,10 +1210,29 @@
   <hr><h2 id=introduction><span class=secno>1 </span>Introduction</h2>
 
 
-  <h3 id=background><span class=secno>1.1 </span>Background</h3>
 
+  <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=multipage/>the HTML5
+  specification</a>.</p>
+
+  <p><em>This</em> specification contains everything that the WHATWG
+  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>
+
+
+
+
+
+  <h3 id=background><span class=secno>1.2 </span>Background</h3>
+
+  <p><i>This section is non-normative.</i></p>
+
   <p>The World Wide Web's markup language has always been HTML. HTML
   was primarily designed as a language for semantically describing
   scientific documents, although its general design and adaptations
@@ -1225,7 +1245,7 @@
   specifications to address issues raised in the past few years.</p>
 
 
-  <h3 id=audience><span class=secno>1.2 </span>Audience</h3>
+  <h3 id=audience><span class=secno>1.3 </span>Audience</h3>
 
   <p><i>This section is non-normative.</i></p>
 
@@ -1248,7 +1268,7 @@
   also be helpful in places but is not essential.</p>
 
 
-  <h3 id=scope><span class=secno>1.3 </span>Scope</h3>
+  <h3 id=scope><span class=secno>1.4 </span>Scope</h3>
 
   <p><i>This section is non-normative.</i></p>
 
@@ -1277,7 +1297,7 @@
   software), document editing software, etc.</p>
 
 
-  <h3 id=history-1><span class=secno>1.4 </span>History</h3>
+  <h3 id=history-1><span class=secno>1.5 </span>History</h3>
 
   <p><i>This section is non-normative.</i></p>
 
@@ -1374,7 +1394,7 @@
 
 
 
-  <h3 id=design-notes><span class=secno>1.5 </span>Design notes</h3>
+  <h3 id=design-notes><span class=secno>1.6 </span>Design notes</h3>
 
   <p><i>This section is non-normative.</i></p>
 
@@ -1397,7 +1417,7 @@
   design goals. These are described in the next few subsections.</p>
 
 
-  <h4 id=serializability-of-script-execution><span class=secno>1.5.1 </span>Serializability of script execution</h4>
+  <h4 id=serializability-of-script-execution><span class=secno>1.6.1 </span>Serializability of script execution</h4>
 
   <p><i>This section is non-normative.</i></p>
 
@@ -1413,7 +1433,7 @@
   run while the calling script is blocked.</p>
 
 
-  <h4 id=compliance-with-other-specifications><span class=secno>1.5.2 </span>Compliance with other specifications</h4>
+  <h4 id=compliance-with-other-specifications><span class=secno>1.6.2 </span>Compliance with other specifications</h4>
 
   <p><i>This section is non-normative.</i></p>
 
@@ -1427,7 +1447,7 @@
 
 
 
-  <h3 id=html-vs-xhtml><span class=secno>1.6 </span>HTML vs XHTML</h3>
+  <h3 id=html-vs-xhtml><span class=secno>1.7 </span>HTML vs XHTML</h3>
 
   <p><i>This section is non-normative.</i></p>
 
@@ -1469,7 +1489,7 @@
   HTML syntax or in XML.</p>
 
 
-  <h3 id=structure-of-this-specification><span class=secno>1.7 </span>Structure of this specification</h3>
+  <h3 id=structure-of-this-specification><span class=secno>1.8 </span>Structure of this specification</h3>
 
   <p><i>This section is non-normative.</i></p>
 
@@ -1567,7 +1587,7 @@
 
 
 
-  <h4 id=how-to-read-this-specification><span class=secno>1.7.1 </span>How to read this specification</h4>
+  <h4 id=how-to-read-this-specification><span class=secno>1.8.1 </span>How to read this specification</h4>
 
   <p>This specification should be read like all other specifications.
   First, it should be read cover-to-cover, multiple times. Then, it
@@ -1577,7 +1597,7 @@
 
 
 
-  <h4 id=typographic-conventions><span class=secno>1.7.2 </span>Typographic conventions</h4>
+  <h4 id=typographic-conventions><span class=secno>1.8.2 </span>Typographic conventions</h4>
 
   <p>This is a definition, requirement, or explanation.</p>
 
@@ -1619,7 +1639,7 @@
 
 
 
-  <h3 id=a-quick-introduction-to-html><span class=secno>1.8 </span>A quick introduction to HTML</h3>
+  <h3 id=a-quick-introduction-to-html><span class=secno>1.9 </span>A quick introduction to HTML</h3>
 
   <p><i>This section is non-normative.</i></p>
 
@@ -1764,7 +1784,7 @@
 
 
 
-  <h3 id=recommended-reading><span class=secno>1.9 </span>Recommended reading</h3>
+  <h3 id=recommended-reading><span class=secno>1.10 </span>Recommended reading</h3>
 
   <p><i>This section is non-normative.</i></p>
 
@@ -24211,7 +24231,7 @@
 
   
 
-  <h5 id=the-2d-context><span class=secno>4.8.11.1 </span>The 2D context</h5>
+  <h5 id=2dcontext><span class=secno>4.8.11.1 </span>The 2D context</h5>
 
   <!-- v2: we're on v4. suggestions for next version are marked v5. -->
 
@@ -45817,7 +45837,7 @@
   </div>
 
 
-  <h3 id=microdata-vocabularies><span class=secno>5.4 </span>Microdata vocabularies</h3>
+  <h3 id=mdvocabs><span class=secno>5.4 </span>Microdata vocabularies</h3>
 
 
 

Modified: index
===================================================================
--- index	2010-01-11 11:25:12 UTC (rev 4575)
+++ index	2010-01-11 13:23:07 UTC (rev 4576)
@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang=en-US-x-hixie><title>WHATWG HTML (Including HTML5)</title><link href=/style/specification rel=stylesheet><link href=/images/icon rel=icon><style>
+<!DOCTYPE html><html lang=en-US-x-hixie><title>HTML5 (including next generation additions still in development)</title><link href=/style/specification rel=stylesheet><link href=/images/icon rel=icon><style>
    .proposal { border: blue solid; padding: 1em; }
    .bad, .bad *:not(.XXX) { color: gray; border-color: gray; background: transparent; }
    #updatesStatus { display: none; }
@@ -111,7 +111,7 @@
   </script><body class=draft onload=init()>
 
   <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>WHATWG HTML (Including HTML5)</h1>
+   <hgroup><h1>HTML5 (including next generation additions still in development)</h1>
     <h2 class="no-num no-toc">Draft Standard — 11 January 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>
@@ -140,9 +140,10 @@
   </header><hr><h2 class="no-num no-toc" id=abstract>Abstract</h2>
 
   <p>This specification evolves HTML and its related APIs to ease the
-  authoring of Web-based applications. New additions include a
-  <code><a href=#devices>device</a></code> element to enable video conferencing, as well as
-  all the features added as part of the earlier HTML5 effort.</p>
+  authoring of Web-based applications. The most recent additions
+  include a <code><a href=#devices>device</a></code> element to enable video conferencing,
+  as well as all the features added as part of the earlier HTML5
+  effort.</p>
 
 
   <h2 class="no-num no-toc" id=status>Status of this document</h2>
@@ -166,9 +167,6 @@
   call for implementations should join the <a href=/mailing-list>WHATWG mailing list</a> and take part in the
   discussions.</p>
 
-  <p>This specification is also being produced by the <a href=http://www.w3.org/html/wg>W3C HTML WG</a>. The two
-  specifications are identical from the table of contents onwards.</p>
-
   <p>This specification is intended to replace (be the new version of)
   what was previously the HTML5, HTML4, XHTML1, and DOM2 HTML
   specifications.</p>
@@ -181,21 +179,22 @@
 <ol class=toc>
  <li><a href=#introduction><span class=secno>1 </span>Introduction</a>
   <ol>
-   <li><a href=#background><span class=secno>1.1 </span>Background</a></li>
-   <li><a href=#audience><span class=secno>1.2 </span>Audience</a></li>
-   <li><a href=#scope><span class=secno>1.3 </span>Scope</a></li>
-   <li><a href=#history-1><span class=secno>1.4 </span>History</a></li>
-   <li><a href=#design-notes><span class=secno>1.5 </span>Design notes</a>
+   <li><a href=#is-this-html5?><span class=secno>1.1 </span>Is this HTML5?</a></li>
+   <li><a href=#background><span class=secno>1.2 </span>Background</a></li>
+   <li><a href=#audience><span class=secno>1.3 </span>Audience</a></li>
+   <li><a href=#scope><span class=secno>1.4 </span>Scope</a></li>
+   <li><a href=#history-1><span class=secno>1.5 </span>History</a></li>
+   <li><a href=#design-notes><span class=secno>1.6 </span>Design notes</a>
     <ol>
-     <li><a href=#serializability-of-script-execution><span class=secno>1.5.1 </span>Serializability of script execution</a></li>
-     <li><a href=#compliance-with-other-specifications><span class=secno>1.5.2 </span>Compliance with other specifications</a></ol></li>
-   <li><a href=#html-vs-xhtml><span class=secno>1.6 </span>HTML vs XHTML</a></li>
-   <li><a href=#structure-of-this-specification><span class=secno>1.7 </span>Structure of this specification</a>
+     <li><a href=#serializability-of-script-execution><span class=secno>1.6.1 </span>Serializability of script execution</a></li>
+     <li><a href=#compliance-with-other-specifications><span class=secno>1.6.2 </span>Compliance with other specifications</a></ol></li>
+   <li><a href=#html-vs-xhtml><span class=secno>1.7 </span>HTML vs XHTML</a></li>
+   <li><a href=#structure-of-this-specification><span class=secno>1.8 </span>Structure of this specification</a>
     <ol>
-     <li><a href=#how-to-read-this-specification><span class=secno>1.7.1 </span>How to read this specification</a></li>
-     <li><a href=#typographic-conventions><span class=secno>1.7.2 </span>Typographic conventions</a></ol></li>
-   <li><a href=#a-quick-introduction-to-html><span class=secno>1.8 </span>A quick introduction to HTML</a></li>
-   <li><a href=#recommended-reading><span class=secno>1.9 </span>Recommended reading</a></ol></li>
+     <li><a href=#how-to-read-this-specification><span class=secno>1.8.1 </span>How to read this specification</a></li>
+     <li><a href=#typographic-conventions><span class=secno>1.8.2 </span>Typographic conventions</a></ol></li>
+   <li><a href=#a-quick-introduction-to-html><span class=secno>1.9 </span>A quick introduction to HTML</a></li>
+   <li><a href=#recommended-reading><span class=secno>1.10 </span>Recommended reading</a></ol></li>
  <li><a href=#infrastructure><span class=secno>2 </span>Common infrastructure</a>
   <ol>
    <li><a href=#terminology><span class=secno>2.1 </span>Terminology</a>
@@ -453,7 +452,7 @@
        <li><a href=#security-and-privacy-considerations><span class=secno>4.8.10.13 </span>Security and privacy considerations</a></ol></li>
      <li><a href=#the-canvas-element><span class=secno>4.8.11 </span>The <code>canvas</code> element</a>
       <ol>
-       <li><a href=#the-2d-context><span class=secno>4.8.11.1 </span>The 2D context</a>
+       <li><a href=#2dcontext><span class=secno>4.8.11.1 </span>The 2D context</a>
         <ol>
          <li><a href=#the-canvas-state><span class=secno>4.8.11.1.1 </span>The canvas state</a></li>
          <li><a href=#transformations><span class=secno>4.8.11.1.2 </span>Transformations</a></li>
@@ -632,7 +631,7 @@
      <li><a href=#associating-names-with-items><span class=secno>5.2.5 </span>Associating names with items</a></li>
      <li><a href=#examples-1><span class=secno>5.2.6 </span>Examples</a></ol></li>
    <li><a href=#microdata-dom-api><span class=secno>5.3 </span>Microdata DOM API</a></li>
-   <li><a href=#microdata-vocabularies><span class=secno>5.4 </span>Microdata vocabularies</a>
+   <li><a href=#mdvocabs><span class=secno>5.4 </span>Microdata vocabularies</a>
     <ol>
      <li><a href=#vcard><span class=secno>5.4.1 </span>vCard</a>
       <ol>
@@ -1090,10 +1089,66 @@
   <hr><h2 id=introduction><span class=secno>1 </span>Introduction</h2>
 
 
-  <h3 id=background><span class=secno>1.1 </span>Background</h3>
 
+  <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>In short: Yes.</p>
+
+  <p>In more length: "HTML5" has at various times been used to refer
+  to a wide variety of technologies, some of which originated in this
+  document, and some of which have only ever been tangentially
+  related.</p>
+
+  <p>This specification actually now defines the next generation of
+  HTML after HTML5. HTML5 reached Last Call at the WHATWG in October
+  2009, and shortly after we started working on some experimental new
+  features that are not as stable as the rest of the
+  specification. The stability of sections is annotated in the
+  margin.</p>
+
+  <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>
+
+  <p>Features that are considered part of the next generation of HTML
+  beyond HTML5 currently consist of only:</p>
+
+  <ul class=brief><li>The <code><a href=#devices>device</a></code> element.</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>
+
+  <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
+  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>
+
+  <ul class=brief><li><a href=http://www.whatwg.org/specs/web-workers/current-work/>Web Workers</a>
+   <li><a href=http://dev.w3.org/html5/webstorage/>Web Storage</a>
+   <li><a href=http://dev.w3.org/html5/websockets/>Web Sockets API</a>
+   <li><a href=http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol>Web Sockets protocol</a>
+   <li><a href=http://dev.w3.org/html5/eventsource/>Server-sent Events</a>
+   <li><a href=http://dev.w3.org/html5/webdatabase/>Web SQL Database</a>
+   <li><a href=http://dev.w3.org/geo/api/spec-source.html>Geolocation API</a>
+   <li><a href=http://www.w3.org/TR/SVG/>SVG</a>
+   <li><a href=http://www.w3.org/TR/MathML/>MathML</a>
+   <li><a href=http://dev.w3.org/2006/webapi/XMLHttpRequest-2/>XMLHttpRequest</a>
+  </ul><h3 id=background><span class=secno>1.2 </span>Background</h3>
+
+  <p><i>This section is non-normative.</i></p>
+
   <p>The World Wide Web's markup language has always been HTML. HTML
   was primarily designed as a language for semantically describing
   scientific documents, although its general design and adaptations
@@ -1106,7 +1161,7 @@
   specifications to address issues raised in the past few years.</p>
 
 
-  <h3 id=audience><span class=secno>1.2 </span>Audience</h3>
+  <h3 id=audience><span class=secno>1.3 </span>Audience</h3>
 
   <p><i>This section is non-normative.</i></p>
 
@@ -1129,7 +1184,7 @@
   also be helpful in places but is not essential.</p>
 
 
-  <h3 id=scope><span class=secno>1.3 </span>Scope</h3>
+  <h3 id=scope><span class=secno>1.4 </span>Scope</h3>
 
   <p><i>This section is non-normative.</i></p>
 
@@ -1158,7 +1213,7 @@
   software), document editing software, etc.</p>
 
 
-  <h3 id=history-1><span class=secno>1.4 </span>History</h3>
+  <h3 id=history-1><span class=secno>1.5 </span>History</h3>
 
   <p><i>This section is non-normative.</i></p>
 
@@ -1255,7 +1310,7 @@
 
 
 
-  <h3 id=design-notes><span class=secno>1.5 </span>Design notes</h3>
+  <h3 id=design-notes><span class=secno>1.6 </span>Design notes</h3>
 
   <p><i>This section is non-normative.</i></p>
 
@@ -1278,7 +1333,7 @@
   design goals. These are described in the next few subsections.</p>
 
 
-  <h4 id=serializability-of-script-execution><span class=secno>1.5.1 </span>Serializability of script execution</h4>
+  <h4 id=serializability-of-script-execution><span class=secno>1.6.1 </span>Serializability of script execution</h4>
 
   <p><i>This section is non-normative.</i></p>
 
@@ -1294,7 +1349,7 @@
   run while the calling script is blocked.</p>
 
 
-  <h4 id=compliance-with-other-specifications><span class=secno>1.5.2 </span>Compliance with other specifications</h4>
+  <h4 id=compliance-with-other-specifications><span class=secno>1.6.2 </span>Compliance with other specifications</h4>
 
   <p><i>This section is non-normative.</i></p>
 
@@ -1308,7 +1363,7 @@
 
 
 
-  <h3 id=html-vs-xhtml><span class=secno>1.6 </span>HTML vs XHTML</h3>
+  <h3 id=html-vs-xhtml><span class=secno>1.7 </span>HTML vs XHTML</h3>
 
   <p><i>This section is non-normative.</i></p>
 
@@ -1350,7 +1405,7 @@
   HTML syntax or in XML.</p>
 
 
-  <h3 id=structure-of-this-specification><span class=secno>1.7 </span>Structure of this specification</h3>
+  <h3 id=structure-of-this-specification><span class=secno>1.8 </span>Structure of this specification</h3>
 
   <p><i>This section is non-normative.</i></p>
 
@@ -1432,7 +1487,7 @@
 
 
 
-  <h4 id=how-to-read-this-specification><span class=secno>1.7.1 </span>How to read this specification</h4>
+  <h4 id=how-to-read-this-specification><span class=secno>1.8.1 </span>How to read this specification</h4>
 
   <p>This specification should be read like all other specifications.
   First, it should be read cover-to-cover, multiple times. Then, it
@@ -1442,7 +1497,7 @@
 
 
 
-  <h4 id=typographic-conventions><span class=secno>1.7.2 </span>Typographic conventions</h4>
+  <h4 id=typographic-conventions><span class=secno>1.8.2 </span>Typographic conventions</h4>
 
   <p>This is a definition, requirement, or explanation.</p>
 
@@ -1484,7 +1539,7 @@
 
 
 
-  <h3 id=a-quick-introduction-to-html><span class=secno>1.8 </span>A quick introduction to HTML</h3>
+  <h3 id=a-quick-introduction-to-html><span class=secno>1.9 </span>A quick introduction to HTML</h3>
 
   <p><i>This section is non-normative.</i></p>
 
@@ -1629,7 +1684,7 @@
 
 
 
-  <h3 id=recommended-reading><span class=secno>1.9 </span>Recommended reading</h3>
+  <h3 id=recommended-reading><span class=secno>1.10 </span>Recommended reading</h3>
 
   <p><i>This section is non-normative.</i></p>
 
@@ -24076,7 +24131,7 @@
 
   
 
-  <h5 id=the-2d-context><span class=secno>4.8.11.1 </span>The 2D context</h5>
+  <h5 id=2dcontext><span class=secno>4.8.11.1 </span>The 2D context</h5>
 
   <!-- v2: we're on v4. suggestions for next version are marked v5. -->
 
@@ -45682,7 +45737,7 @@
   </div>
 
 
-  <h3 id=microdata-vocabularies><span class=secno>5.4 </span>Microdata vocabularies</h3>
+  <h3 id=mdvocabs><span class=secno>5.4 </span>Microdata vocabularies</h3>
 
 
 

Modified: source
===================================================================
--- source	2010-01-11 11:25:12 UTC (rev 4575)
+++ source	2010-01-11 13:23:07 UTC (rev 4576)
@@ -3,7 +3,89 @@
 
   <h2 id="introduction">Introduction</h2>
 
+<!--END w3c-html-->
 
+  <h3>Is this HTML5?</h3>
+
+  <p><i>This section is non-normative.</i></p>
+
+<!--END complete-->
+
+  <p>In short: Yes.</p>
+
+  <p>In more length: "HTML5" has at various times been used to refer
+  to a wide variety of technologies, some of which originated in this
+  document, and some of which have only ever been tangentially
+  related.</p>
+
+  <p>This specification actually now defines the next generation of
+  HTML after HTML5. HTML5 reached Last Call at the WHATWG in October
+  2009, and shortly after we started working on some experimental new
+  features that are not as stable as the rest of the
+  specification. The stability of sections is annotated in the
+  margin.</p>
+
+  <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>
+
+  <p>Features that are considered part of the next generation of HTML
+  beyond HTML5 currently consist of only:</p>
+
+  <ul class="brief">
+   <li>The <code>device</code> element.</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>
+
+  <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
+  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>
+
+  <ul class="brief">
+   <li><a href="http://www.whatwg.org/specs/web-workers/current-work/">Web Workers</a>
+   <li><a href="http://dev.w3.org/html5/webstorage/">Web Storage</a>
+   <li><a href="http://dev.w3.org/html5/websockets/">Web Sockets API</a>
+   <li><a href="http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol">Web Sockets protocol</a>
+   <li><a href="http://dev.w3.org/html5/eventsource/">Server-sent Events</a>
+   <li><a href="http://dev.w3.org/html5/webdatabase/">Web SQL Database</a>
+   <li><a href="http://dev.w3.org/geo/api/spec-source.html">Geolocation API</a>
+   <li><a href="http://www.w3.org/TR/SVG/">SVG</a>
+   <li><a href="http://www.w3.org/TR/MathML/">MathML</a>
+   <li><a href="http://dev.w3.org/2006/webapi/XMLHttpRequest-2/">XMLHttpRequest</a>
+  </ul>
+
+
+<!--START complete-->
+<!--END html-->
+
+  <p>No, although it does contain everything that is part of HTML5. If
+  you want only HTML5, please see <a href="multipage/">the HTML5
+  specification</a>.</p>
+
+  <p><em>This</em> specification contains everything that the WHATWG
+  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>
+
+<!--START html-->
+<!--START w3c-html-->
+
+
   <h3>Background</h3>
 
   <p><i>This section is non-normative.</i></p>
@@ -26112,7 +26194,7 @@
 
   <!--END w3c-html-->
 
-  <h5>The 2D context</h5>
+  <h5 id="2dcontext">The 2D context</h5>
 
   <!-- v2: we're on v4. suggestions for next version are marked v5. -->
 
@@ -51082,7 +51164,7 @@
 
 <!--START complete--><!--START html-->
 
-  <h3>Microdata vocabularies</h3>
+  <h3 id="mdvocabs">Microdata vocabularies</h3>
 
 <!--START vocabs-->
 




More information about the Commit-Watchers mailing list