hixie: Remove a paragraph from the W3C version by request of the chairs. Add a list of differences between the versions of the spec to the WHATWG version now that there's more than a few. Add a paragraph to the W3C version mentioning this. Make it easier to keep track of what is in what version of the spec when editing. (whatwg r5101)

hixie: Remove a paragraph from the W3C version by request of the chairs.
Add a list of differences between the versions of the spec to the WHATWG
version now that there's more than a few. Add a paragraph to the W3C
version mentioning this. Make it easier to keep track of what is in what
version of the spec when editing. (whatwg r5101)

http://dev.w3.org/cvsweb/html5/spec/Overview.html?r1=1.4097&r2=1.4098&f=h
http://html5.org/tools/web-apps-tracker?from=5100&to=5101

===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.4097
retrieving revision 1.4098
diff -u -d -r1.4097 -r1.4098
--- Overview.html 3 Jun 2010 01:10:44 -0000 1.4097
+++ Overview.html 5 Jun 2010 05:55:06 -0000 1.4098
@@ -287,7 +287,7 @@
 
    <h1>HTML5</h1>
    <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-   <h2 class="no-num no-toc" id="editor-s-draft-3-june-2010">Editor's Draft 3 June 2010</h2>
+   <h2 class="no-num no-toc" id="editor-s-draft-5-june-2010">Editor's Draft 5 June 2010</h2>
    <dl><dt>Latest Published Version:</dt>
     <dd><a href="http://www.w3.org/TR/html5/">http://www.w3.org/TR/html5/</a></dd>
     <dt>Latest Editor's Draft:</dt>
@@ -391,7 +391,7 @@
   Group</a> is the W3C working group responsible for this
   specification's progress along the W3C Recommendation
   track.
-  This specification is the 3 June 2010 Editor's Draft.
+  This specification is the 5 June 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>The contents of this specification are also part of <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/">a
   specification</a> published by the <a href="http://www.whatwg.org/">WHATWG</a>, which is available under a
   license that permits reuse of the specification text.</p><!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!-- required patent boilerplate --><p>This document was produced by a group operating under the <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5
@@ -867,8 +867,7 @@
    <li><a href="#matching-html-elements-using-selectors"><span class="secno">4.14 </span>Matching HTML elements using selectors</a>
     <ol>
      <li><a href="#selectors"><span class="secno">4.14.1 </span>Case-sensitivity</a></li>
-     <li><a href="#pseudo-classes"><span class="secno">4.14.2 </span>Pseudo-classes</a></ol></li>
-   <li><a href="#converting-html-to-other-formats"><span class="secno">4.15 </span>Converting HTML to other formats</a></ol></li>
+     <li><a href="#pseudo-classes"><span class="secno">4.14.2 </span>Pseudo-classes</a></ol></ol></li>
  <li><a href="#browsers"><span class="secno">5 </span>Loading Web pages</a>
   <ol>
    <li><a href="#windows"><span class="secno">5.1 </span>Browsing contexts</a>
@@ -1188,11 +1187,10 @@
    <li><a href="#replaced-elements"><span class="secno">10.3 </span>Replaced elements</a>
     <ol>
      <li><a href="#embedded-content-2"><span class="secno">10.3.1 </span>Embedded content</a></li>
-     <li><a href="#timed-tracks"><span class="secno">10.3.2 </span>Timed tracks</a></li>
-     <li><a href="#images"><span class="secno">10.3.3 </span>Images</a></li>
-     <li><a href="#attributes-for-embedded-content-and-images"><span class="secno">10.3.4 </span>Attributes for embedded content and images</a></li>
-     <li><a href="#image-maps-0"><span class="secno">10.3.5 </span>Image maps</a></li>
-     <li><a href="#toolbars-0"><span class="secno">10.3.6 </span>Toolbars</a></ol></li>
+     <li><a href="#images"><span class="secno">10.3.2 </span>Images</a></li>
+     <li><a href="#attributes-for-embedded-content-and-images"><span class="secno">10.3.3 </span>Attributes for embedded content and images</a></li>
+     <li><a href="#image-maps-0"><span class="secno">10.3.4 </span>Image maps</a></li>
+     <li><a href="#toolbars-0"><span class="secno">10.3.5 </span>Toolbars</a></ol></li>
    <li><a href="#bindings"><span class="secno">10.4 </span>Bindings</a>
     <ol>
      <li><a href="#introduction-7"><span class="secno">10.4.1 </span>Introduction</a></li>
@@ -1236,8 +1234,7 @@
    <li><a href="#text-html"><span class="secno">12.1 </span><code>text/html</code></a></li>
    <li><a href="#text-html-sandboxed"><span class="secno">12.2 </span><code>text/html-sandboxed</code></a></li>
    <li><a href="#application-xhtml-xml"><span class="secno">12.3 </span><code>application/xhtml+xml</code></a></li>
-   <li><a href="#text-cache-manifest"><span class="secno">12.4 </span><code>text/cache-manifest</code></a></li>
-   <li><a href="#text-srt"><span class="secno">12.5 </span><code>text/srt</code></a></ol></li>
+   <li><a href="#text-cache-manifest"><span class="secno">12.4 </span><code>text/cache-manifest</code></a></ol></li>
  <li><a class="no-num" href="#index">Index</a>
   <ol>
    <li><a class="no-num" href="#elements-1">Elements</a></li>
@@ -1346,7 +1343,14 @@
   chartered to work with the WHATWG on the development of the HTML5
   specification. Apple, Mozilla, and Opera allowed the W3C to publish
   the specification under the W3C copyright, while keeping a version
-  with the less restrictive license on the WHATWG site.<p>Since then, both groups have been working together.<p>A separate document has been published by the W3C HTML working
+  with the less restrictive license on the WHATWG site.<p>Since then, both groups have been working together.</p><!--w3c-html--><!--VERSION--><p>The specification published by the WHATWG is not identical to
+  this specification. The main differences are that the WHATWG version
+  includes features not included in this W3C version: some features
+  have been omitted as they are considered part of future revisions of
+  HTML, not HTML5; and other features are omitted because at the W3C
+  they are published as separate specifications. There are also some
+  minor differences. For an exact list of differences, please see the
+  WHATWG specification.</p><!--w3c-html--><!--VERSION--><p>A separate document has been published by the W3C HTML working
   group to document the differences between this specification and the
   language described in the HTML4 specification. <a href="#refsHTMLDIFF">[HTMLDIFF]</a><h3 id="design-notes"><span class="secno">1.5 </span>Design notes</h3><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i><p><i>This section is non-normative.</i><p>It must be admitted that many aspects of HTML appear at first
   glance to be nonsensical and inconsistent.<p>HTML, its supporting DOM APIs, as well as many of its supporting
@@ -4511,7 +4515,7 @@
 
    </li>
 
-  </ol></div><h4 id="colors"><span class="secno">2.4.6 </span>Colors</h4><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i><p>A <dfn id="simple-color">simple color</dfn> consists of three 8-bit numbers in the
+  </ol></div><h4 id="colors"><span class="secno">2.4.6 </span>Colors</h4><p class="XXX annotation"><b>Status: </b><i>Awaiting implementation feedback</i><p>A <dfn id="simple-color">simple color</dfn> consists of three 8-bit numbers in the
   range 0..255, representing the red, green, and blue components of
   the color respectively, in the sRGB color space. <a href="#refsSRGB">[SRGB]</a><p>A string is a <dfn id="valid-simple-color">valid simple color</dfn> if it is exactly
   seven characters long, and the first character is a U+0023 NUMBER
@@ -16878,6 +16882,7 @@
   attribute's value are described <a href="#alt">in the next
   section</a>.
   
+  <!-- only included in w3c-html--><!--WCAG-->
   For guidance on accessibility requirements for text alternatives
   authors are encouraged to also consult
   <a href="http://www.w3.org/TR/WCAG20/">WCAG 2.0</a>.
@@ -17092,12 +17097,10 @@
 
   <p>User agents may always provide the user with the option to
   display any image, or to prevent any image from being
-  displayed. User agents may also apply heuristics to help the user
-  make use of the image when the user is unable to see it, e.g. due to
-  a visual disability or because they are using a text terminal with
-  no graphics capabilities. Such heuristics could include, for
-  instance, optical character recognition (OCR) of text found within
-  the image.</p>
+  displayed.
+
+
+  </p>
 
   <p class="warning">While user agents are encouraged to repair cases
   of missing <code title="attr-img-alt"><a href="#attr-img-alt">alt</a></code> attributes, authors
@@ -40028,12 +40031,6 @@
   those are all defined in sufficient detail in a language-agnostic
   fashion in the Selectors specification. <a href="#refsSELECTORS">[SELECTORS]</a></p>
 
-  </div><div class="impl">
-
-  <h3 id="converting-html-to-other-formats"><span class="secno">4.15 </span>Converting HTML to other formats</h3><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p>
-
-
-
   </div><h2 id="browsers"><span class="secno">5 </span>Loading Web pages</h2><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i><div class="impl">
 
   <p>This section describes features that apply most directly to Web
@@ -40426,7 +40423,7 @@
 
    </li>
 
-  </ol></div><h3 id="the-window-object"><span class="secno">5.2 </span>The <code><a href="#window">Window</a></code> object</h3><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i><pre class="idl">[OverrideBuiltins, ReplaceableNamedProperties] <!-- XXX http://www.w3.org/Bugs/Public/show_bug.cgi?id=8241 -->
+  </ol></div><h3 id="the-window-object"><span class="secno">5.2 </span>The <code><a href="#window">Window</a></code> object</h3><p class="XXX annotation"><b>Status: </b><i>Implemented and widely deployed</i><pre class="idl">[OverrideBuiltins, ReplaceableNamedProperties] <!-- XXX http://www.w3.org/Bugs/Public/show_bug.cgi?id=8241 -->
 interface <dfn id="window">Window</dfn> {
   // the current browsing context
   readonly attribute <a href="#windowproxy">WindowProxy</a> <a href="#dom-window" title="dom-window">window</a>;
@@ -61087,7 +61084,6 @@
   the <code><a href="#video">video</a></code> element itself, and is expected to be
   centered in the <code><a href="#video">video</a></code> element.</p>
 
-  <p class="XXX">pointer to rendering model for timed tracks</p>
 
   <p class="note">Resizing <code><a href="#video">video</a></code> and <code><a href="#the-canvas-element">canvas</a></code>
   elements does not interrupt video playback or clear the canvas.</p>
@@ -61100,15 +61096,7 @@
 
   </div><div class="impl">
 
-  <h4 id="timed-tracks"><span class="secno">10.3.2 </span>Timed tracks</h4><p class="XXX annotation"><b>Status: </b><i>Being edited right now</i></p>
-
-  <p class="XXX">rendering model for timed tracks</p>
-
-  <p class="XXX">CSS extensions</p>
-
-  </div><div class="impl">
-
-  <h4 id="images"><span class="secno">10.3.3 </span>Images</h4><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p>
+  <h4 id="images"><span class="secno">10.3.2 </span>Images</h4><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p>
 
   <p>When an <code><a href="#the-img-element">img</a></code> element or an <code><a href="#the-input-element">input</a></code> element
   when its <code title="attr-input-type"><a href="#attr-input-type">type</a></code> attribute is in
@@ -61177,7 +61165,7 @@
 
   </div><div class="impl">
 
-  <h4 id="attributes-for-embedded-content-and-images"><span class="secno">10.3.4 </span>Attributes for embedded content and images</h4><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p>
+  <h4 id="attributes-for-embedded-content-and-images"><span class="secno">10.3.3 </span>Attributes for embedded content and images</h4><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p>
 
   <p>The following CSS rules are expected to apply as
   <a href="#presentational-hints">presentational hints</a>:</p>
@@ -61272,7 +61260,7 @@
 
   </div><div class="impl">
 
-  <h4 id="image-maps-0"><span class="secno">10.3.5 </span>Image maps</h4><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p>
+  <h4 id="image-maps-0"><span class="secno">10.3.4 </span>Image maps</h4><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p>
 
   <p>Shapes on an <a href="#image-map">image map</a> are expected to act, for the
   purpose of the CSS cascade, as elements independent of the original
@@ -61297,7 +61285,7 @@
 
   </div><div class="impl">
 
-  <h4 id="toolbars-0"><span class="secno">10.3.6 </span>Toolbars</h4><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p>
+  <h4 id="toolbars-0"><span class="secno">10.3.5 </span>Toolbars</h4><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p>
 
   <p>When a <code><a href="#menus">menu</a></code> element's <code title="attr-menu-type"><a href="#attr-menu-type">type</a></code> attribute is in the <a href="#toolbar-state" title="toolbar state">toolbar</a> state, the element is
   expected to be treated as a replaced element with a height about two
@@ -64065,65 +64053,7 @@
    <dt>Change controller:</dt>
    <dd>WHATWG</dd>
   </dl><p>Fragment identifiers have no meaning with
-  <code><a href="#text-cache-manifest">text/cache-manifest</a></code> resources.<h3 id="text-srt"><span class="secno">12.5 </span><dfn><code>text/srt</code></dfn></h3><p>This registration is for community review and will be submitted
-  to the IESG for review, approval, and registration with IANA.</p><!--
-   To: ietf-types@iana.org
-   Subject: Registration of media type text/cues
-  --><dl><dt>Type name:</dt>
-   <dd>text</dd>
-   <dt>Subtype name:</dt>
-   <dd>srt</dd>
-   <dt>Required parameters:</dt>
-   <dd>No parameters</dd>
-   <dt>Optional parameters:</dt>
-   <dd>No parameters</dd>
-   <dt>Encoding considerations:</dt>
-   <dd>Always UTF-8.</dd>
-   <dt>Security considerations:</dt>
-   <dd>
-    <p>Timed track files themselves pose no immediate risk unless
-    sensitive information is included within the
-    data. Implementations, however, are required to follow specific
-    rules when processing timed tracks, to ensure that certain
-    origin-based restrictions are honored. Failure to correctly
-    implement these rules can result in information leakage,
-    cross-site scripting attacks, and the like.</p>
-   </dd>
-   <dt>Interoperability considerations:</dt>
-   <dd>
-    Rules for processing both conforming and non-conforming content
-    are defined in this specification.
-   </dd>
-   <dt>Published specification:</dt>
-   <dd>
-    This document is the relevant specification.
-   </dd>
-   <dt>Applications that use this media type:</dt>
-   <dd>
-    Web browsers and other video players.
-   </dd>
-   <dt>Additional information:</dt>
-   <dd>
-    <dl><dt>Magic number(s):</dt>
-     <dd>No sequence of bytes can uniquely identify a WebSRT timed
-     track file.</dd>
-     <dt>File extension(s):</dt>
-     <dd>"<code title="">srt</code>"</dd>
-     <dt>Macintosh file type code(s):</dt>
-     <dd>No specific Macintosh file type codes are recommended for this type.</dd>
-    </dl></dd>
-   <dt>Person &amp; email address to contact for further information:</dt>
-   <dd>Ian Hickson &lt;ian@hixie.ch&gt;</dd>
-   <dt>Intended usage:</dt>
-   <dd>Common</dd>
-   <dt>Restrictions on usage:</dt>
-   <dd>No restrictions apply.</dd>
-   <dt>Author:</dt>
-   <dd>Ian Hickson &lt;ian@hixie.ch&gt;</dd>
-   <dt>Change controller:</dt>
-   <dd>WHATWG</dd>
-  </dl><p>Fragment identifiers have no meaning with
-  <code><a href="#text-srt">text/srt</a></code> resources.<h2 class="no-num" id="index">Index</h2><p class="XXX annotation"><b>Status: </b><i>Implemented and widely deployed</i><div class="impl">
+  <code><a href="#text-cache-manifest">text/cache-manifest</a></code> resources.<h2 class="no-num" id="index">Index</h2><p class="XXX annotation"><b>Status: </b><i>Implemented and widely deployed</i><div class="impl">
 
   <p>The following sections only cover conforming elements and features.</p>

Received on Saturday, 5 June 2010 05:56:03 UTC