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

html5/postmsg Overview.html,1.3,1.4

From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
Date: Sat, 09 Jan 2010 08:53:19 +0000
To: public-html-commits@w3.org
Message-Id: <E1NTX4R-00075Q-Ma@lionel-hutz.w3.org>
Update of /sources/public/html5/postmsg
In directory hutz:/tmp/cvs-serv27210

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

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/postmsg/Overview.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Overview.html	9 Jan 2010 01:10:53 -0000	1.3
+++ Overview.html	9 Jan 2010 08:53:17 -0000	1.4
@@ -274,7 +274,6 @@
 <!-- :ZZZ -->
     <dt>Editors:</dt>
     <dd><a href="mailto:ian@hixie.ch">Ian Hickson</a>, Google, Inc.</dd>
-    <dd>David Hyatt, Apple, Inc.</dd>
    </dl><p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a>
    &copy; 2009 <a href="http://www.w3.org/"><abbr title="World Wide
    Web Consortium">W3C</abbr></a><sup>&reg;</sup> (<a href="http://www.csail.mit.edu/"><abbr title="Massachusetts
@@ -399,9 +398,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="idl"><span class="secno">2 </span>IDL</h2><h2 id="event-definitions"><span class="secno">3 </span>Event definitions</h2><p>Messages in <span>server-sent events</span>, <span>Web
+  terminology, and typographical conventions described in the core
+  HTML5 specification apply to this specification. <a href="#refsHTML5CORE">[HTML5CORE]</a><h2 id="idl"><span class="secno">2 </span>IDL</h2><h2 id="event-definitions"><span class="secno">3 </span>Event definitions</h2><p>Messages in <span>server-sent events</span>, <span>Web
   sockets</span>, <a href="#crossDocumentMessages">cross-document messaging</a>, and
   <a href="#channel-messaging">channel messaging</a> use the <dfn id="event-message" title="event-message"><code>message</code></dfn> event.
   
@@ -1194,26 +1192,10 @@
 
    <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>
 
    <dt id="refsWEBSOCKET">[WEBSOCKET]</dt>
@@ -1226,5 +1208,5 @@
    API</a></cite>, I. Hickson. W3C, August
    2009.</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:21 GMT

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