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

git-svn-id: http://svn.whatwg.org/webapps@4576 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Jan 11, 2010 · 4d61e2c4a9a3dd5ec35696b879e15be0c1c5e83a · 4d61e2c
1 parent 5e11874
commit 4d61e2c4a9a3dd5ec35696b879e15be0c1c5e83a
Unified Split

Showing with 227 additions and 70 deletions.

+50 −30 complete.html

+93 −38 index

+84 −2 source
diff --git a/complete.html b/complete.html
@@ -172,21 +172,22 @@ <h2 class="no-num no-toc" id=contents>Table of contents</h2>
 <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 @@ <h2 class="no-num no-toc" id=contents>Table of contents</h2>
       <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 @@ <h2 class="no-num no-toc" id=contents>Table of contents</h2>
     <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,7 +1210,26 @@ <h2 class="no-num no-toc" id=contents>Table of contents</h2>
  <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>
@@ -1225,7 +1245,7 @@ <h3 id=background><span class=secno>1.1 </span>Background</h3>
  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 @@ <h3 id=audience><span class=secno>1.2 </span>Audience</h3>
  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 @@ <h3 id=scope><span class=secno>1.3 </span>Scope</h3>
  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=history-1><span class=secno>1.4 </span>History</h3>
-  
-  <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 @@ <h3 id=design-notes><span class=secno>1.5 </span>Design notes</h3>
  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 @@ <h4 id=serializability-of-script-execution><span class=secno>1.5.1 </span>Serial
  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 @@ <h4 id=compliance-with-other-specifications><span class=secno>1.5.2 </span>Compl
-  
-  <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 @@ <h3 id=html-vs-xhtml><span class=secno>1.6 </span>HTML vs XHTML</h3>
  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 @@ <h3 id=structure-of-this-specification><span class=secno>1.7 </span>Structure of
-  
-  <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=how-to-read-this-specification><span class=secno>1.7.1 </span>How to read
-  
-  <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 @@ <h4 id=typographic-conventions><span class=secno>1.7.2 </span>Typographic conven
-  
-  <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=a-quick-introduction-to-html><span class=secno>1.8 </span>A quick introdu
-  
-  <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>

-  
-  <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. -->

  </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>