html5/2dcontext Overview.html,1.7,1.8

Update of /sources/public/html5/2dcontext
In directory hutz:/tmp/cvs-serv27178

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

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/2dcontext/Overview.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Overview.html	9 Jan 2010 01:10:49 -0000	1.7
+++ Overview.html	9 Jan 2010 08:53:13 -0000	1.8
@@ -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
@@ -395,9 +394,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><div class="impl">
+  terminology, and typographical conventions described in the core
+  HTML5 specification apply to this specification. <a href="#refsHTML5CORE">[HTML5CORE]</a><div class="impl">
 
   
   <p>When the <code title="dom-canvas-getContext">getContext()</code>
@@ -3112,26 +3110,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="refsPORTERDUFF">[PORTERDUFF]</dt>
@@ -3140,5 +3122,5 @@
    graphics</cite>, volume 18, number 3, pp. 253-259. ACM Press, July
    1984.</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:17 UTC