W3C home > Mailing lists > Public > public-html-commits@w3.org > January 2010

html5/html-device Overview.html,1.12,1.13

From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
Date: Sat, 09 Jan 2010 08:53:23 +0000
To: public-html-commits@w3.org
Message-Id: <E1NTX4V-00075s-Gg@lionel-hutz.w3.org>
Update of /sources/public/html5/html-device
In directory hutz:/tmp/cvs-serv27254

Modified Files:
	Overview.html 
Log Message:
Merge core and vocab specs back together. (whatwg r4553)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/html-device/Overview.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Overview.html	8 Jan 2010 23:53:24 -0000	1.12
+++ Overview.html	9 Jan 2010 08:53:21 -0000	1.13
@@ -262,7 +262,7 @@
    <h1>HTML Device</h1>
    <h2 class="no-num no-toc" id="an-addition-to-html">An addition to HTML</h2>
 
-   <h2 class="no-num no-toc" id="editor-s-draft-8-january-2010">Editor's Draft 8 January 2010</h2>
+   <h2 class="no-num no-toc" id="editor-s-draft-9-january-2010">Editor's Draft 9 January 2010</h2>
    <dl><dt>Latest Published Version:</dt>
     <dd><a href="http://www.w3.org/TR/html-device/">http://www.w3.org/TR/html-device/</a></dd>
     <dt>Latest Editor's Draft:</dt>
@@ -341,7 +341,7 @@
   specification's progress along the W3C Recommendation
   track.
 
-  This specification is the 8 January 2010 Editor's Draft.
+  This specification is the 9 January 2010 Editor's Draft.
   </p><!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!-- relationship to other work (required) --><p>This specification is part of <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/">a
   larger specification</a> being produced by the <a href="http://www.whatwg.org/">WHATWG</a>.
   <!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST -->
@@ -371,9 +371,8 @@
  <li><a class="no-num" href="#acknowledgements">Acknowledgements</a></ol>
 <!--end-toc--><hr><h2 id="conformance-requirements"><span class="secno">1 </span>Conformance requirements</h2><p>This specification is an HTML specification. All the conformance
   requirements, conformance classes, definitions, dependencies,
-  terminology, and typographical conventions described in the HTML5
-  Core and HTML5 Vocabulary specifications apply to this specification. <a href="#refsHTML5CORE">[HTML5CORE]</a> <a href="#refsHTML5VOCAB">[HTML5VOCAB]</a><p>For an introduction to the HTML5 series of specifications, please
-  see the HTML5 Introduction specification. <a href="#refsHTML5INTRO">[HTML5INTRO]</a><h2 id="devices"><span class="secno">2 </span>The <dfn><code>device</code></dfn> element</h2><dl class="element"><dt>Categories</dt>
+  terminology, and typographical conventions described in the core
+  HTML5 specification apply to this specification. <a href="#refsHTML5CORE">[HTML5CORE]</a><h2 id="devices"><span class="secno">2 </span>The <dfn><code>device</code></dfn> element</h2><dl class="element"><dt>Categories</dt>
    <dd><span>Flow content</span>.</dd>
    <dd><span>Phrasing content</span>.</dd>
    <dd><span>Interactive content</span>.</dd>
@@ -454,27 +453,11 @@
 
    <dt id="refsHTML5CORE">[HTML5CORE]</dt>
    <!--
-   <dd><cite><a href="http://www.w3.org/TR/html-core/">HTML5 Core</a></cite>,
-   I. Hickson, D. Hyatt. W3C, April 2009.</dd>
-   -->
-   <dd><cite><a href="http://dev.w3.org/html5/core/">HTML5 Core</a></cite>,
-   I. Hickson, D. Hyatt. W3C, January 2010.</dd>
-
-   <dt id="refsHTML5INTRO">[HTML5INTRO]</dt>
-   <!--
-   <dd><cite><a href="http://www.w3.org/TR/html5/">HTML5 Introduction</a></cite>,
-   I. Hickson, D. Hyatt. W3C, April 2009.</dd>
-   -->
-   <dd><cite><a href="http://dev.w3.org/html5/spec/">HTML5 Introduction</a></cite>,
-   I. Hickson, D. Hyatt. W3C, January 2010.</dd>
-
-   <dt id="refsHTML5VOCAB">[HTML5VOCAB]</dt>
-   <!--
-   <dd><cite><a href="http://www.w3.org/TR/html-vocabulary/">HTML5 Vocabulary</a></cite>,
+   <dd><cite><a href="http://www.w3.org/TR/html5/">HTML5</a></cite>,
    I. Hickson, D. Hyatt. W3C, April 2009.</dd>
    -->
-   <dd><cite><a href="http://dev.w3.org/html5/vocabulary/">HTML5 Vocabulary</a></cite>,
+   <dd><cite><a href="http://dev.w3.org/html5/spec/">HTML5</a></cite>,
    I. Hickson, D. Hyatt. W3C, January 2010.</dd>
 
-  </dl><h2 class="no-num" id="acknowledgements">Acknowledgements</h2><p>For a full list of acknowledgements, please see the HTML5
-  Introduction specification. <a href="#refsHTML5INTRO">[HTML5INTRO]</a>
+  </dl><h2 class="no-num" id="acknowledgements">Acknowledgements</h2><p>For a full list of acknowledgements, please see the Core HTML5
+  specification. <a href="#refsHTML5CORE">[HTML5CORE]</a>
Received on Saturday, 9 January 2010 08:53:25 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Saturday, 9 January 2010 08:54:21 GMT