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

html5/markup/html5-spec Overview.html,1.4,1.5 acknowledgements.html,1.3,1.4 association-of-controls-and-forms.html,1.3,1.4 browsers.html,1.3,1.4 editing.html,1.3,1.4 elements.html,1.3,1.4 history.html,1.3,1.4 infrastructure.html,1.3,1.4 offline.html,1.3,1.4 origin-0.html,1.3,1.4 references.html,1.3,1.4 rendering.html,1.3,1.4 semantics.html,1.3,1.4 spec.html,1.3,1.4 tabular-data.html,1.3,1.4 the-canvas-element.html,1.3,1.4 the-end.html,1.3,1.4 the-iframe-element.html,1.3,1.4 toc-status.html,1.3,1.4 video.html,1.3,1.4

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Fri, 03 Dec 2010 07:23:32 +0000
To: public-html-commits@w3.org
Message-Id: <E1POPzv-0002fr-1f@lionel-hutz.w3.org>
Update of /sources/public/html5/markup/html5-spec
In directory hutz:/tmp/cvs-serv10095/html5-spec

Modified Files:
	Overview.html acknowledgements.html 
	association-of-controls-and-forms.html browsers.html 
	editing.html elements.html history.html infrastructure.html 
	offline.html origin-0.html references.html rendering.html 
	semantics.html spec.html tabular-data.html 
	the-canvas-element.html the-end.html the-iframe-element.html 
	toc-status.html video.html 
Log Message:
moved some contraints on src-less script elements


Index: infrastructure.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/infrastructure.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- infrastructure.html	30 Nov 2010 01:49:48 -0000	1.3
+++ infrastructure.html	3 Dec 2010 07:23:30 -0000	1.4
@@ -424,7 +424,8 @@
   specification that defines the resource's format. For CSS resources,
   only <code title="">@import</code> rules introduce <a href="#critical-subresources">critical
   subresources</a>; other resources, e.g. fonts or backgrounds, are
-  not.</p><h4 id="xml"><span class="secno">2.1.2 </span>XML</h4><p id="html-namespace">To ease migration from HTML to XHTML, UAs
+  not.</p><p>The term <dfn id="data-protocol" title="data protocol"><code title="">data:</code>
+  URL</dfn> refers to <a href="urls.html#url" title="URL">URLs</a> that use the <code title="">data:</code> scheme. <a href="references.html#refsRFC2397">[RFC2397]</a></p><h4 id="xml"><span class="secno">2.1.2 </span>XML</h4><p id="html-namespace">To ease migration from HTML to XHTML, UAs
   conforming to this specification will place elements in HTML in the
   <code>http://www.w3.org/1999/xhtml</code> namespace, at least for
   the purposes of the DOM and CSS. The term "<dfn id="html-elements">HTML

Index: the-canvas-element.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/the-canvas-element.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- the-canvas-element.html	30 Nov 2010 01:49:49 -0000	1.3
+++ the-canvas-element.html	3 Dec 2010 07:23:30 -0000	1.4
@@ -562,8 +562,7 @@
 
    <dd>
 
-    <p>Returns a <code title="">data:</code> URL for the image in the
-    canvas.</p>
+    <p>Returns a <a href="infrastructure.html#data-protocol" title="data protocol"><code title="">data:</code> URL</a> for the image in the canvas.</p>
 
     <p>The first argument, if provided, controls the type of the image
     to be returned (e.g. PNG or JPEG). The default is <code title="">image/png</code>; that type is also used if the given
@@ -576,17 +575,18 @@
   </dl><div class="impl">
 
   <p>The <dfn id="dom-canvas-todataurl" title="dom-canvas-toDataURL"><code>toDataURL()</code></dfn> method
-  must, when called with no arguments, return a <code title="">data:</code> URL containing a representation of the image
-  as a PNG file. <a href="references.html#refsPNG">[PNG]</a></p>
+  must, when called with no arguments, return a <a href="infrastructure.html#data-protocol" title="data&#10;  protocol"><code title="">data:</code> URL</a> containing a
+  representation of the image as a PNG file. <a href="references.html#refsPNG">[PNG]</a> <a href="references.html#refsRFC2397">[RFC2397]</a></p>
 
   <p>If the canvas has no pixels (i.e. either its horizontal dimension
   or its vertical dimension is zero) then the method must return the
-  string "<code title="">data:,</code>". (This is the shortest <code title="">data:</code> URL; it represents the empty string in a <code title="">text/plain</code> resource.)</p>
+  string "<code title="">data:,</code>". (This is the shortest <a href="infrastructure.html#data-protocol" title="data protocol"><code title="">data:</code> URL</a>; it
+  represents the empty string in a <code title="">text/plain</code>
+  resource.)</p>
 
   <p>When the <code title="dom-canvas-toDataURL"><a href="#dom-canvas-todataurl">toDataURL(<var title="">type</var>)</a></code> method is called with one <em>or
-  more</em> arguments, it must return a <code title="">data:</code>
-  URL containing a representation of the image in the format given by
-  <var title="">type</var>. The possible values are <a href="infrastructure.html#mime-type" title="MIME&#10;  type">MIME types</a> with no parameters, for example
+  more</em> arguments, it must return a <a href="infrastructure.html#data-protocol" title="data&#10;  protocol"><code title="">data:</code> URL</a> containing a
+  representation of the image in the format given by <var title="">type</var>. The possible values are <a href="infrastructure.html#mime-type" title="MIME&#10;  type">MIME types</a> with no parameters, for example
   <code>image/png</code>, <code>image/jpeg</code>, or even maybe
   <code>image/svg+xml</code> if the implementation actually keeps
   enough information to reliably render an SVG image from the
@@ -595,15 +595,16 @@
   <p>For image types that do not support an alpha channel, the image
   must be composited onto a solid black background using the
   source-over operator, and the resulting image must be the one used
-  to create the <code title="">data:</code> URL.</p>
+  to create the <a href="infrastructure.html#data-protocol" title="data protocol"><code title="">data:</code> URL</a>.</p>
 
   <p>Only support for <code>image/png</code> is required. User agents
   may support other types. If the user agent does not support the
   requested type, it must return the image using the PNG format.</p>
 
-  <p>User agents must <a href="infrastructure.html#converted-to-ascii-lowercase" title="converted to ASCII lowercase">convert the
-  provided type to ASCII lowercase</a> before establishing if they
-  support that type and before creating the <code title="">data:</code> URL.</p>
+  <p>User agents must <a href="infrastructure.html#converted-to-ascii-lowercase" title="converted to ASCII&#10;  lowercase">convert the provided type to ASCII lowercase</a>
+  before establishing if they support that type and before creating
+  the <a href="infrastructure.html#data-protocol" title="data protocol"><code title="">data:</code>
+  URL</a>.</p>
 
   </div><p class="note">When trying to use types other than
   <code>image/png</code>, authors can check if the image was really
@@ -639,6 +640,10 @@
   more carefully control compression settings, image metadata,
   etc.</p>
 
+  <!-- should we explicitly require the URL to be base64-encoded and
+  not have any parameters, to ensure the same exact URL is generated
+  in each browser? -->
+
   </div><div class="impl">
 
   <h5 id="color-spaces-and-color-correction"><span class="secno">4.8.11.1 </span>Color spaces and color correction</h5>

Index: tabular-data.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/tabular-data.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tabular-data.html	30 Nov 2010 01:49:49 -0000	1.3
+++ tabular-data.html	3 Dec 2010 07:23:30 -0000	1.4
@@ -423,11 +423,12 @@
   contain data and which are merely being used for layout. This
   specification does not define a precise heuristic.</p>
 
-  </div><p>Tables have rows and columns given by their descendants. A table
-  must not have an empty row or column<span class="impl">, as
-  described in the description of the <a href="#table-model">table
-  model</a></span>. <!-- conformance criteria for detecting this
-  are in the table model section --></p><p id="table-descriptions">For tables that consist of more than just
+  </div><p>Tables have rows, columns, and cells given by their descendants.
+  The rows and columns form a grid; a table's cells must completely
+  cover that grid without overlap. <span class="impl note">Precise
+  rules for determining whether this conformance requirement is met
+  are described in the description of the <a href="#table-model">table
+  model</a>.</span></p><p id="table-descriptions">For tables that consist of more than just
   a grid of cells with headers in the first row and headers in the
   first column, and for any table in general where the reader might
   have difficulty understanding the content, authors should include
@@ -1448,7 +1449,7 @@
 
   <p>The <dfn id="dom-th-scope" title="dom-th-scope"><code>scope</code></dfn> IDL
   attribute must <a href="common-dom-interfaces.html#reflect">reflect</a> the content attribute of the
-  same name.</p>
+  same name, <a href="common-dom-interfaces.html#limited-to-only-known-values">limited to only known values</a>.</p>
 
   </div><div class="example">
 

Index: the-iframe-element.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/the-iframe-element.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- the-iframe-element.html	30 Nov 2010 01:49:49 -0000	1.3
+++ the-iframe-element.html	3 Dec 2010 07:23:30 -0000	1.4
@@ -1029,7 +1029,7 @@
     <p>User agents should, in general, act as if the <a href="browsers.html#active-document">active
     document</a> of the <code><a href="#the-iframe-element">iframe</a></code>'s <a href="browsers.html#nested-browsing-context">nested browsing
     context</a> was part of the document that the
-    <code><a href="#the-iframe-element">iframe</a></code> is in.</p>
+    <code><a href="#the-iframe-element">iframe</a></code> is in, if any.</p>
 
     <p class="example">For example if the user agent supports listing
     all the links in a document, links in "seamlessly" nested

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/Overview.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Overview.html	30 Nov 2010 01:49:46 -0000	1.4
+++ Overview.html	3 Dec 2010 07:23:28 -0000	1.5
@@ -775,10 +775,8 @@
         <ol><li><a href="#timed-track-model"><span class="secno">4.8.10.10.1 </span>Timed track model</a></li>
          <li><a href="#sourcing-in-band-timed-tracks"><span class="secno">4.8.10.10.2 </span>Sourcing in-band timed tracks</a></li>
          <li><a href="#sourcing-out-of-band-timed-tracks"><span class="secno">4.8.10.10.3 </span>Sourcing out-of-band timed tracks</a></li>
-         <li><a href="#guidelines-for-exposing-cues-in-various-formats-as-timed-track-cues"><span class="secno">4.8.10.10.4 </span>Guidelines for exposing cues in various formats as
-  timed track cues</a></li>
-         <li><a href="#timed-track-api"><span class="secno">4.8.10.10.5 </span>Timed track API</a></li>
-         <li><a href="#cue-events"><span class="secno">4.8.10.10.6 </span>Event definitions</a></li></ol></li>
+         <li><a href="#timed-track-api"><span class="secno">4.8.10.10.4 </span>Timed track API</a></li>
+         <li><a href="#cue-events"><span class="secno">4.8.10.10.5 </span>Event definitions</a></li></ol></li>
        <li><a href="#user-interface"><span class="secno">4.8.10.11 </span>User interface</a></li>
        <li><a href="#time-ranges"><span class="secno">4.8.10.12 </span>Time ranges</a></li>
[...1191 lines suppressed...]
+
    <dt id="refsRFC2425">[RFC2425]</dt>
    <dd><cite><a href="http://tools.ietf.org/html/rfc2425">A MIME
    Content-Type for Directory Information</a></cite>, T. Howes,
@@ -70838,6 +70620,7 @@
   Martin Atkins,
   Martin D&#xFC;rst,
   Martin Honnen,
+  Martin Janecke,
   Martin Kutschker,
   Martin Nilsson,
   Martin Thomson,
@@ -70905,6 +70688,7 @@
   Paul Norman,
   Per-Erik Brodin,
   Perry Smith,
+  Peter Beverloo,
   Peter Karlsson,
   Peter Kasting,
   Peter Stark,

Index: the-end.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/the-end.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- the-end.html	30 Nov 2010 01:49:49 -0000	1.3
+++ the-end.html	3 Dec 2010 07:23:30 -0000	1.4
@@ -442,8 +442,8 @@
    attribute set to false. This event must not bubble, must not be
    cancelable, and has no default action.</p></li>
 
-   <li><p>If the <code><a href="infrastructure.html#document">Document</a></code> has a <a href="history.html#pending-state-object">pending state
-   object</a>, then <a href="webappapis.html#queue-a-task">queue a task</a> to fire a <code title="event-popstate"><a href="history.html#event-popstate">popstate</a></code> event at the
+   <li><p>If the <code><a href="infrastructure.html#document">Document</a></code> is in a <a href="browsers.html#browsing-context">browsing
+   context</a>, then <a href="webappapis.html#queue-a-task">queue a task</a> to fire a <code title="event-popstate"><a href="history.html#event-popstate">popstate</a></code> event at the
    <code><a href="infrastructure.html#document">Document</a></code>'s <code><a href="browsers.html#window">Window</a></code> object using the
    <code><a href="history.html#popstateevent">PopStateEvent</a></code> interface, with the <code title="dom-PopStateEvent-state"><a href="history.html#dom-popstateevent-state">state</a></code> attribute set to the
    current value of the <a href="history.html#pending-state-object">pending state object</a>. This event
@@ -458,8 +458,11 @@
    for these <a href="webappapis.html#concept-task" title="concept-task">tasks</a> is the
    <a href="webappapis.html#networking-task-source">networking task source</a>.</p></li>
 
-   <li><p>The <code><a href="infrastructure.html#document">Document</a></code> is now <dfn id="completely-loaded">completely
-   loaded</dfn>.</p></li>
+   <li><p>The <code><a href="infrastructure.html#document">Document</a></code> is now <dfn id="ready-for-post-load-tasks">ready for post-load
+   tasks</dfn>.</p></li>
+
+   <li><p><a href="webappapis.html#queue-a-task">Queue a task</a> to mark the <code><a href="infrastructure.html#document">Document</a></code>
+   as <dfn id="completely-loaded">completely loaded</dfn>.</p></li>
 
   </ol><p>When the user agent is to <dfn id="abort-a-parser">abort a parser</dfn>, it must run
   the following steps:</p>

Index: history.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/history.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- history.html	30 Nov 2010 01:49:48 -0000	1.3
+++ history.html	3 Dec 2010 07:23:30 -0000	1.4
@@ -587,7 +587,7 @@
    <a href="#refused-to-allow-the-document-to-be-unloaded">refused to allow the document to be unloaded</a>, then
    abort these steps.</p></li>
 
-   <li><p><a href="#unload-a-document" title="unload a document">Unload</a> the the
+   <li><p><a href="#unload-a-document" title="unload a document">Unload</a> the
    <a href="browsers.html#active-document">active document</a> of the <var title="">specified
    browsing context</var> with the <var title="">recycle</var>
    parameter set to false.</p></li>
@@ -702,6 +702,21 @@
 
    </li>
 
+   <li>
+
+     <p>If the <a href="dom.html#current-document-readiness">current document readiness</a> is not yet set
+     to the string "complete", let the <code><a href="infrastructure.html#document">Document</a></code>'s
+     <a href="#pending-state-object">pending state object</a> be another <a href="common-dom-interfaces.html#structured-clone">structured
+     clone</a> of the specified <var title="">data</var>. (If there
+     was already a <a href="#pending-state-object">pending state object</a>, the previous one
+     is discarded.)</p>
+
+     <p class="note">This ensures that the <code title="event-popstate"><a href="#event-popstate">popstate</a></code> event that will be fired
+     when the document finally loads will accurately reflect the
+     pushed or replaced state object.</p>
+
+   </li>
+
   </ol><p class="note">The <var title="">title</var> is purely
   advisory. User agents might use the title in the user interface.</p>
 
@@ -898,22 +913,13 @@
   attribute must return <a href="dom.html#the-document-s-current-address" title="the document's current&#10;  address">the current address</a> of the associated
   <code><a href="infrastructure.html#document">Document</a></code> object, as an <a href="urls.html#absolute-url">absolute URL</a>.</p>
 
-  <p>On setting, <!-- READ ME WHEN EDITING THIS: Mozilla does this,
-  but IE doesn't. What should we do?: the behavior depends on the
-  context in which the script that set the attribute is running. If
-  the script ran as the direct result of the execution of a
-  <code>script</code> element in the document represented by the
-  <code>Location</code> object's associated <code>Document</code>
-  object, then the user agent must act as if the <code
-  title="dom-location-replace">replace()</code> method had been called
-  with the new value as its argument. Otherwise,--> the user agent
-  must act as if the <code title="dom-location-assign"><a href="#dom-location-assign">assign()</a></code>
-  method had been called with the new value as its argument.</p><!--
-  v2: may wish to allow replace instead as a UI improvement -->
-  <!-- XXXXX the above is about to change -->
-
-  <!-- we could change the magic .location setter to simply refer
-  straight to assign(), so we don't have two levels of indirection -->
+  <p>On setting, if the <code><a href="#location">Location</a></code> object's associated
+  <code><a href="infrastructure.html#document">Document</a></code> object has <a href="the-end.html#completely-loaded">completely loaded</a>,
+  then the user agent must act as if the <code title="dom-location-assign"><a href="#dom-location-assign">assign()</a></code> method had been called
+  with the new value as its argument. Otherwise, the user agent must
+  act as if the <code title="dom-location-replace"><a href="#dom-location-replace">replace()</a></code>
+  method had been called with the new value as its argument.</p>
+  <!--DONAV location.href, defined in terms of the paragraphs below-->
 
   <p>When the <dfn id="dom-location-assign" title="dom-location-assign"><code>assign(<var title="">url</var>)</code></dfn> method is invoked, the UA must
   <a href="urls.html#resolve-a-url" title="resolve a url">resolve</a> the argument, relative to
@@ -934,7 +940,7 @@
   <a href="urls.html#resolve-a-url" title="resolve a url">resolve</a> the argument, relative to
   the <a href="browsers.html#entry-script">entry script</a>'s <a href="webappapis.html#script-s-base-url" title="script's base URL">base
   URL</a>, and if that is successful,
-  <a href="#navigate">navigate</a><!--DONAV location.replace--> the
+  <a href="#navigate">navigate</a><!--DONAV location.href/replace--> the
   <a href="browsers.html#browsing-context">browsing context</a> to the specified <var title="">url</var> with <a href="#replacement-enabled">replacement enabled</a>.</p>
 
   <p>Navigation for the <code title="dom-location-assign"><a href="#dom-location-assign">assign()</a></code> and <code title="dom-location-replace"><a href="#dom-location-replace">replace()</a></code> methods must be done
@@ -1988,6 +1994,12 @@
      attribute set to true. This event must not bubble, must not be
      cancelable, and has no default action.</p></li>
 
+     <!-- an interesting thing to test would be to traverse back
+     during onload, before the first pageshow has fired, and then to
+     traverse forward again, and see if we get _two_ pageshows. If so,
+     it indicates that the history traversal task source has a higher
+     priority than the DOM manipulation task source. -->
+
     </ol></li>
 
    <li><p>Set <a href="dom.html#the-document-s-current-address">the document's current address</a> to the URL
@@ -2033,8 +2045,8 @@
 
      <dt>Otherwise</dt>
 
-     <dd><p>Let the <code><a href="infrastructure.html#document">Document</a></code>'s <dfn id="pending-state-object">pending state
-     object</dfn> be <var title="">state</var>. (If there was already
+     <dd><p>Let the <code><a href="infrastructure.html#document">Document</a></code>'s <a href="#pending-state-object">pending state
+     object</a> be <var title="">state</var>. (If there was already
      a <a href="#pending-state-object">pending state object</a>, the previous one is
      discarded.)</p>
 
@@ -2053,7 +2065,10 @@
    <li><p>The <a href="#current-entry">current entry</a> is now the <i>specified
    entry</i>.</p></li>
 
-  </ol><p>The <a href="#pending-state-object">pending state object</a> must be initially null.</p>
+  </ol><p>The <dfn id="pending-state-object">pending state object</dfn> is used to keep track of what
+  state object to use in the inital <code title="event-popstate"><a href="#event-popstate">popstate</a></code> event fired by the parser
+  once it <a href="the-end.html#stop-parsing" title="stop parsing">stops parsing</a>. The
+  <a href="#pending-state-object">pending state object</a> must be initially null.</p>
 
   <p>The <a href="webappapis.html#task-source">task source</a> for the tasks mentioned above is the
   <a href="webappapis.html#dom-manipulation-task-source">DOM manipulation task source</a>.</p>

Index: origin-0.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/origin-0.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- origin-0.html	30 Nov 2010 01:49:49 -0000	1.3
+++ origin-0.html	3 Dec 2010 07:23:30 -0000	1.4
@@ -562,17 +562,19 @@
 
 
      <dt>If a <code><a href="infrastructure.html#document">Document</a></code> or image was generated from a
-     <code title="">data:</code> URL that was returned as the location
-     of an HTTP redirect (<a href="fetching-resources.html#concept-http-equivalent-codes" title="concept-http-equivalent-codes">or equivalent</a> in
-     other protocols)</dt>
+     <a href="infrastructure.html#data-protocol" title="data protocol"><code title="">data:</code>
+     URL</a> that was returned as the location of an HTTP redirect
+     (<a href="fetching-resources.html#concept-http-equivalent-codes" title="concept-http-equivalent-codes">or equivalent</a>
+     in other protocols)</dt>
 
      <dd>The <a href="#origin">origin</a> is the <a href="#origin">origin</a> of the
-     <a href="urls.html#url">URL</a> that redirected to the <code title="">data:</code> URL.</dd>
+     <a href="urls.html#url">URL</a> that redirected to the <a href="infrastructure.html#data-protocol" title="data&#10;     protocol"><code title="">data:</code> URL</a>.</dd>
 
 
      <dt>If a <code><a href="infrastructure.html#document">Document</a></code> or image was generated from a
-     <code title="">data:</code> URL found in another
-     <code><a href="infrastructure.html#document">Document</a></code> or in a script</dt>
+     <a href="infrastructure.html#data-protocol" title="data protocol"><code title="">data:</code>
+     URL</a> found in another <code><a href="infrastructure.html#document">Document</a></code> or in a
+     script</dt>
 
      <dd>The <a href="#origin">origin</a> is the <a href="#origin">origin</a> of the
      <code><a href="infrastructure.html#document">Document</a></code> or script that initiated the <a href="history.html#navigate" title="navigate">navigation</a> to that <a href="urls.html#url">URL</a>.</dd>
@@ -594,8 +596,8 @@
 
 
      <dt>If a <code><a href="infrastructure.html#document">Document</a></code> or image was obtained in some
-     other manner (e.g. a <code title="">data:</code> URL typed in by
-     the user, a <code><a href="infrastructure.html#document">Document</a></code> created using the <code title="dom-DOMImplementation-createDocument"><a href="infrastructure.html#dom-domimplementation-createdocument">createDocument()</a></code>
+     other manner (e.g. a <a href="infrastructure.html#data-protocol" title="data protocol"><code title="">data:</code> URL</a> typed in by the user, a
+     <code><a href="infrastructure.html#document">Document</a></code> created using the <code title="dom-DOMImplementation-createDocument"><a href="infrastructure.html#dom-domimplementation-createdocument">createDocument()</a></code>
      API, etc)</dt>
 
      <dd>The <a href="#origin">origin</a> is a globally unique identifier

Index: rendering.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/rendering.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rendering.html	30 Nov 2010 01:49:49 -0000	1.3
+++ rendering.html	3 Dec 2010 07:23:30 -0000	1.4
@@ -1554,67 +1554,67 @@
       following list:</p>
 
       <dl class="switch"><dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-horizontal-writing-direction" title="timed track cue horizontal writing direction">horizontal</a>,
-              the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-start-alignment" title="timed track cue start alignment">start</a>,
+              the <span>timed track cue alignment</span> is <span title="timed track cue start alignment">start</span>,
               and <var title="">direction</var> is 'ltr'</dt>
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-horizontal-writing-direction" title="timed track cue horizontal writing direction">horizontal</a>,
-              the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-end-alignment" title="timed track cue end alignment">end</a>,
+              the <span>timed track cue alignment</span> is <span title="timed track cue end alignment">end</span>,
               and <var title="">direction</var> is 'rtl'</dt>
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-vertical-growing-left-writing-direction" title="timed track cue vertical growing left writing direction">vertical growing left</a>,
-              and the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-start-alignment" title="timed track cue start alignment">start</a></dt>
+              and the <span>timed track cue alignment</span> is <span title="timed track cue start alignment">start</span></dt>
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-vertical-growing-right-writing-direction" title="timed track cue vertical growing right writing direction">vertical growing right</a>,
-              and the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-start-alignment" title="timed track cue start alignment">start</a></dt>
+              and the <span>timed track cue alignment</span> is <span title="timed track cue start alignment">start</span></dt>
        <dd>
-        <p>Let <var title="">maximum size</var> be the <a href="video.html#timed-track-cue-text-position">timed track cue text position</a> subtracted from 100.</p>
+        <p>Let <var title="">maximum size</var> be the <span>timed track cue text position</span> subtracted from 100.</p>
        </dd>
 
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-horizontal-writing-direction" title="timed track cue horizontal writing direction">horizontal</a>,
-              the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-end-alignment" title="timed track cue end alignment">end</a>,
+              the <span>timed track cue alignment</span> is <span title="timed track cue end alignment">end</span>,
               and <var title="">direction</var> is 'ltr'</dt>
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-horizontal-writing-direction" title="timed track cue horizontal writing direction">horizontal</a>,
-              the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-start-alignment" title="timed track cue start alignment">start</a>,
+              the <span>timed track cue alignment</span> is <span title="timed track cue start alignment">start</span>,
               and <var title="">direction</var> is 'rtl'</dt>
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-vertical-growing-left-writing-direction" title="timed track cue vertical growing left writing direction">vertical growing left</a>,
-              and the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-end-alignment" title="timed track cue end alignment">end</a></dt>
+              and the <span>timed track cue alignment</span> is <span title="timed track cue end alignment">end</span></dt>
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-vertical-growing-right-writing-direction" title="timed track cue vertical growing right writing direction">vertical growing right</a>,
-              and the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-end-alignment" title="timed track cue end alignment">end</a></dt>
+              and the <span>timed track cue alignment</span> is <span title="timed track cue end alignment">end</span></dt>
        <dd>
-        <p>Let <var title="">maximum size</var> be the <a href="video.html#timed-track-cue-text-position">timed track cue text position</a>.</p>
+        <p>Let <var title="">maximum size</var> be the <span>timed track cue text position</span>.</p>
        </dd>
 
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-horizontal-writing-direction" title="timed track cue horizontal writing direction">horizontal</a>,
-              the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-middle-alignment" title="timed track cue middle alignment">middle</a>,
-              the <a href="video.html#timed-track-cue-text-position">timed track cue text position</a> is less than or equal to 50,
+              the <span>timed track cue alignment</span> is <span title="timed track cue middle alignment">middle</span>,
+              the <span>timed track cue text position</span> is less than or equal to 50,
               and <var title="">direction</var> is 'ltr'</dt>
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-horizontal-writing-direction" title="timed track cue horizontal writing direction">horizontal</a>,
-              the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-middle-alignment" title="timed track cue middle alignment">middle</a>,
-              the <a href="video.html#timed-track-cue-text-position">timed track cue text position</a> is greater than <!-- or equal to --> 50,
+              the <span>timed track cue alignment</span> is <span title="timed track cue middle alignment">middle</span>,
+              the <span>timed track cue text position</span> is greater than <!-- or equal to --> 50,
               and <var title="">direction</var> is 'rtl'</dt>
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-vertical-growing-left-writing-direction" title="timed track cue vertical growing left writing direction">vertical growing left</a>,
-              the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-middle-alignment" title="timed track cue middle alignment">middle</a>,
-              and the <a href="video.html#timed-track-cue-text-position">timed track cue text position</a> is less than or equal to 50</dt>
+              the <span>timed track cue alignment</span> is <span title="timed track cue middle alignment">middle</span>,
+              and the <span>timed track cue text position</span> is less than or equal to 50</dt>
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-vertical-growing-right-writing-direction" title="timed track cue vertical growing right writing direction">vertical growing right</a>,
-              the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-middle-alignment" title="timed track cue middle alignment">middle</a>,
-              and the <a href="video.html#timed-track-cue-text-position">timed track cue text position</a> is less than or equal to 50</dt>
+              the <span>timed track cue alignment</span> is <span title="timed track cue middle alignment">middle</span>,
+              and the <span>timed track cue text position</span> is less than or equal to 50</dt>
        <dd>
-        <p>Let <var title="">maximum size</var> be the <a href="video.html#timed-track-cue-text-position">timed track cue text position</a> multiplied by two.</p>
+        <p>Let <var title="">maximum size</var> be the <span>timed track cue text position</span> multiplied by two.</p>
        </dd>
 
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-horizontal-writing-direction" title="timed track cue horizontal writing direction">horizontal</a>,
-              the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-middle-alignment" title="timed track cue middle alignment">middle</a>,
-              the <a href="video.html#timed-track-cue-text-position">timed track cue text position</a> is greater than <!-- or equal to --> 50,
+              the <span>timed track cue alignment</span> is <span title="timed track cue middle alignment">middle</span>,
+              the <span>timed track cue text position</span> is greater than <!-- or equal to --> 50,
               and <var title="">direction</var> is 'ltr'</dt>
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-horizontal-writing-direction" title="timed track cue horizontal writing direction">horizontal</a>,
-              the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-middle-alignment" title="timed track cue middle alignment">middle</a>,
-              the <a href="video.html#timed-track-cue-text-position">timed track cue text position</a> is less than or equal to 50,
+              the <span>timed track cue alignment</span> is <span title="timed track cue middle alignment">middle</span>,
+              the <span>timed track cue text position</span> is less than or equal to 50,
               and <var title="">direction</var> is 'rtl'</dt>
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-vertical-growing-left-writing-direction" title="timed track cue vertical growing left writing direction">vertical growing left</a>,
-              the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-middle-alignment" title="timed track cue middle alignment">middle</a>,
-              and the <a href="video.html#timed-track-cue-text-position">timed track cue text position</a> is greater than <!-- or equal to --> 50</dt>
+              the <span>timed track cue alignment</span> is <span title="timed track cue middle alignment">middle</span>,
+              and the <span>timed track cue text position</span> is greater than <!-- or equal to --> 50</dt>
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-vertical-growing-right-writing-direction" title="timed track cue vertical growing right writing direction">vertical growing right</a>,
-              the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-middle-alignment" title="timed track cue middle alignment">middle</a>,
-              and the <a href="video.html#timed-track-cue-text-position">timed track cue text position</a> is greater than <!-- or equal to --> 50</dt>
+              the <span>timed track cue alignment</span> is <span title="timed track cue middle alignment">middle</span>,
+              and the <span>timed track cue text position</span> is greater than <!-- or equal to --> 50</dt>
        <dd>
-        <p>Let <var title="">maximum size</var> be the result of subtracting <a href="video.html#timed-track-cue-text-position">timed track cue text position</a> from 100 and then multiplying the result by two.</p>
+        <p>Let <var title="">maximum size</var> be the result of subtracting <span>timed track cue text position</span> from 100 and then multiplying the result by two.</p>
        </dd>
 
       </dl></li>
@@ -1635,62 +1635,62 @@
       appropriate rules from the following list:</p>
 
       <dl class="switch"><dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-horizontal-writing-direction" title="timed track cue horizontal writing direction">horizontal</a>,
-              the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-start-alignment" title="timed track cue start alignment">start</a>,
+              the <span>timed track cue alignment</span> is <span title="timed track cue start alignment">start</span>,
               and <var title="">direction</var> is 'ltr'</dt>
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-horizontal-writing-direction" title="timed track cue horizontal writing direction">horizontal</a>,
-              the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-end-alignment" title="timed track cue end alignment">end</a>,
+              the <span>timed track cue alignment</span> is <span title="timed track cue end alignment">end</span>,
               and <var title="">direction</var> is 'rtl'</dt>
        <dd>
-        <p>Let <var title="">x-position</var> be the <a href="video.html#timed-track-cue-text-position">timed track cue text position</a>.</p>
+        <p>Let <var title="">x-position</var> be the <span>timed track cue text position</span>.</p>
        </dd>
 
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-horizontal-writing-direction" title="timed track cue horizontal writing direction">horizontal</a>,
-              the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-end-alignment" title="timed track cue end alignment">end</a>,
+              the <span>timed track cue alignment</span> is <span title="timed track cue end alignment">end</span>,
               and <var title="">direction</var> is 'ltr'</dt>
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-horizontal-writing-direction" title="timed track cue horizontal writing direction">horizontal</a>,
-              the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-start-alignment" title="timed track cue start alignment">start</a>,
+              the <span>timed track cue alignment</span> is <span title="timed track cue start alignment">start</span>,
               and <var title="">direction</var> is 'rtl'</dt>
        <dd>
-        <p>Let <var title="">x-position</var> be the <a href="video.html#timed-track-cue-text-position">timed track cue text position</a> subtracted from 100.</p>
+        <p>Let <var title="">x-position</var> be the <span>timed track cue text position</span> subtracted from 100.</p>
        </dd>
 
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-vertical-growing-left-writing-direction" title="timed track cue vertical growing left writing direction">vertical growing left</a>,
-              and the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-start-alignment" title="timed track cue start alignment">start</a></dt>
+              and the <span>timed track cue alignment</span> is <span title="timed track cue start alignment">start</span></dt>
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-vertical-growing-right-writing-direction" title="timed track cue vertical growing right writing direction">vertical growing right</a>,
-              and the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-start-alignment" title="timed track cue start alignment">start</a></dt>
+              and the <span>timed track cue alignment</span> is <span title="timed track cue start alignment">start</span></dt>
        <dd>
-        <p>Let <var title="">y-position</var> be the <a href="video.html#timed-track-cue-text-position">timed track cue text position</a>.</p>
+        <p>Let <var title="">y-position</var> be the <span>timed track cue text position</span>.</p>
        </dd>
 
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-vertical-growing-left-writing-direction" title="timed track cue vertical growing left writing direction">vertical growing left</a>,
-              and the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-end-alignment" title="timed track cue end alignment">end</a></dt>
+              and the <span>timed track cue alignment</span> is <span title="timed track cue end alignment">end</span></dt>
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-vertical-growing-right-writing-direction" title="timed track cue vertical growing right writing direction">vertical growing right</a>,
-              and the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-end-alignment" title="timed track cue end alignment">end</a></dt>
+              and the <span>timed track cue alignment</span> is <span title="timed track cue end alignment">end</span></dt>
        <dd>
-        <p>Let <var title="">y-position</var> be the <a href="video.html#timed-track-cue-text-position">timed track cue text position</a> subtracted from 100.</p>
+        <p>Let <var title="">y-position</var> be the <span>timed track cue text position</span> subtracted from 100.</p>
        </dd>
 
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-horizontal-writing-direction" title="timed track cue horizontal writing direction">horizontal</a>,
-              the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-middle-alignment" title="timed track cue middle alignment">middle</a>,
+              the <span>timed track cue alignment</span> is <span title="timed track cue middle alignment">middle</span>,
               and <var title="">direction</var> is 'ltr'</dt>
        <dd>
-        <p>Let <var title="">x-position</var> be the <a href="video.html#timed-track-cue-text-position">timed track cue text position</a> minus half of <var title="">size</var>.</p>
+        <p>Let <var title="">x-position</var> be the <span>timed track cue text position</span> minus half of <var title="">size</var>.</p>
        </dd>
 
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-horizontal-writing-direction" title="timed track cue horizontal writing direction">horizontal</a>,
-              the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-middle-alignment" title="timed track cue middle alignment">middle</a>,
+              the <span>timed track cue alignment</span> is <span title="timed track cue middle alignment">middle</span>,
               and <var title="">direction</var> is 'rtl'</dt>
        <dd>
-        <p>Let <var title="">x-position-reverse</var> be the <a href="video.html#timed-track-cue-text-position">timed track cue text position</a> minus half of <var title="">size</var>.</p>
+        <p>Let <var title="">x-position-reverse</var> be the <span>timed track cue text position</span> minus half of <var title="">size</var>.</p>
         <p>Let <var title="">x-position</var> be <var title="">x-position-reverse</var> subtracted from 100.</p>
        </dd>
 
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-vertical-growing-left-writing-direction" title="timed track cue vertical growing left writing direction">vertical growing left</a>,
-              and the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-middle-alignment" title="timed track cue middle alignment">middle</a></dt>
+              and the <span>timed track cue alignment</span> is <span title="timed track cue middle alignment">middle</span></dt>
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-vertical-growing-right-writing-direction" title="timed track cue vertical growing right writing direction">vertical growing right</a>,
-              and the <a href="video.html#timed-track-cue-alignment">timed track cue alignment</a> is <a href="video.html#timed-track-cue-middle-alignment" title="timed track cue middle alignment">middle</a></dt>
+              and the <span>timed track cue alignment</span> is <span title="timed track cue middle alignment">middle</span></dt>
        <dd>
-        <p>Let <var title="">y-position</var> be the <a href="video.html#timed-track-cue-text-position">timed track cue text position</a> minus half of <var title="">size</var>.</p>
+        <p>Let <var title="">y-position</var> be the <span>timed track cue text position</span> minus half of <var title="">size</var>.</p>
        </dd>
 
       </dl></li>
@@ -1702,31 +1702,31 @@
       appropriate rules from the following list:</p>
 
       <dl class="switch"><dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-horizontal-writing-direction" title="timed track cue horizontal writing direction">horizontal</a>,
-              and the <a href="video.html#timed-track-cue-snap-to-lines-flag">timed track cue snap-to-lines flag</a> is set</dt>
+              and the <span>timed track cue snap-to-lines flag</span> is set</dt>
        <dd>
         <p>Let <var title="">y-position</var> be zero.</p>
        </dd>
 
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-horizontal-writing-direction" title="timed track cue horizontal writing direction">horizontal</a>,
-              and the <a href="video.html#timed-track-cue-snap-to-lines-flag">timed track cue snap-to-lines flag</a> is not set</dt>
+              and the <span>timed track cue snap-to-lines flag</span> is not set</dt>
        <dd>
-        <p>Let <var title="">y-position</var> be the <a href="video.html#timed-track-cue-line-position">timed track cue line position</a>.</p>
+        <p>Let <var title="">y-position</var> be the <span>timed track cue line position</span>.</p>
        </dd>
 
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-vertical-growing-left-writing-direction" title="timed track cue vertical growing left writing direction">vertical growing left</a>,
-              and the <a href="video.html#timed-track-cue-snap-to-lines-flag">timed track cue snap-to-lines flag</a> is set</dt>
+              and the <span>timed track cue snap-to-lines flag</span> is set</dt>
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-vertical-growing-right-writing-direction" title="timed track cue vertical growing right writing direction">vertical growing right</a>,
-              and the <a href="video.html#timed-track-cue-snap-to-lines-flag">timed track cue snap-to-lines flag</a> is set</dt>
+              and the <span>timed track cue snap-to-lines flag</span> is set</dt>
        <dd>
         <p>Let <var title="">x-position</var> be zero.</p>
        </dd>
 
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-vertical-growing-left-writing-direction" title="timed track cue vertical growing left writing direction">vertical growing left</a>,
-              and the <a href="video.html#timed-track-cue-snap-to-lines-flag">timed track cue snap-to-lines flag</a> is not set</dt>
+              and the <span>timed track cue snap-to-lines flag</span> is not set</dt>
        <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-vertical-growing-right-writing-direction" title="timed track cue vertical growing right writing direction">vertical growing right</a>,
-              and the <a href="video.html#timed-track-cue-snap-to-lines-flag">timed track cue snap-to-lines flag</a> is not set</dt>
+              and the <span>timed track cue snap-to-lines flag</span> is not set</dt>
        <dd>
-        <p>Let <var title="">x-position</var> be the <a href="video.html#timed-track-cue-line-position">timed track cue line position</a>.</p>
+        <p>Let <var title="">x-position</var> be the <span>timed track cue line position</span>.</p>
        </dd>
 
       </dl></li>
@@ -1792,7 +1792,7 @@
       <p>Adjust the positions of <var title="">boxes</var> according
       to the appropriate steps from the following list:</p>
 
-      <dl class="switch"><dt>If <var title="">cue</var>'s <a href="video.html#timed-track-cue-snap-to-lines-flag">timed track cue snap-to-lines flag</a> is set</dt>
+      <dl class="switch"><dt>If <var title="">cue</var>'s <span>timed track cue snap-to-lines flag</span> is set</dt>
 
        <dd>
 
@@ -1824,7 +1824,7 @@
          step labeled <i>done positioning</i> below.</p></li>
 
          <li><p>Let <var title="">line position</var> be the
-         <a href="video.html#timed-track-cue-line-position">timed track cue line position</a>.</p></li>
+         <span>timed track cue line position</span>.</p></li>
 
          <li><p><strong>Vertical Growing Left</strong>: Add one to
          <var title="">line position</var> then negate it.</p></li>
@@ -1913,7 +1913,7 @@
 
         </ol></dd>
 
-       <dt>If <var title="">cue</var>'s <a href="video.html#timed-track-cue-snap-to-lines-flag">timed track cue snap-to-lines flag</a> is not set</dt>
+       <dt>If <var title="">cue</var>'s <span>timed track cue snap-to-lines flag</span> is not set</dt>
        <dd>
 
         <ol><li>
@@ -1925,32 +1925,32 @@
                   and <var title="">direction</var> is 'ltr'</dt>
            <dd>
             <p>Let <var title="">x</var> be a percentage given by the
-            <a href="video.html#timed-track-cue-text-position">timed track cue text position</a>, and let <var title="">y</var> be a percentage given by the <a href="video.html#timed-track-cue-line-position">timed
-            track cue line position</a>.</p>
+            <span>timed track cue text position</span>, and let <var title="">y</var> be a percentage given by the <span>timed
+            track cue line position</span>.</p>
            </dd>
 
            <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-horizontal-writing-direction" title="timed track cue horizontal writing direction">horizontal</a>,
                   and <var title="">direction</var> is 'rtl'</dt>
            <dd>
             <p>Let <var title="">x</var> be a percentage given by the
-            <a href="video.html#timed-track-cue-text-position">timed track cue text position</a> subtracted from
+            <span>timed track cue text position</span> subtracted from
             100, and let <var title="">y</var> be a percentage given
-            by the <a href="video.html#timed-track-cue-line-position">timed track cue line position</a>.</p>
+            by the <span>timed track cue line position</span>.</p>
            </dd>
 
            <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-vertical-growing-left-writing-direction" title="timed track cue vertical growing left writing direction">vertical growing left</a></dt>
            <dd>
             <p>Let <var title="">x</var> be a percentage given by the
-            <a href="video.html#timed-track-cue-line-position">timed track cue line position</a> subtracted from
+            <span>timed track cue line position</span> subtracted from
             100, and let <var title="">y</var> be a percentage given
-            by the <a href="video.html#timed-track-cue-text-position">timed track cue text position</a>.</p>
+            by the <span>timed track cue text position</span>.</p>
            </dd>
 
            <dt>If the <a href="video.html#timed-track-cue-writing-direction">timed track cue writing direction</a> is <a href="video.html#timed-track-cue-vertical-growing-right-writing-direction" title="timed track cue vertical growing right writing direction">vertical growing right</a></dt>
            <dd>
             <p>Let <var title="">x</var> be a percentage given by the
-            <a href="video.html#timed-track-cue-line-position">timed track cue line position</a>, and let <var title="">y</var> be a percentage given by the <a href="video.html#timed-track-cue-text-position">timed
-            track cue text position</a>.</p>
+            <span>timed track cue line position</span>, and let <var title="">y</var> be a percentage given by the <span>timed
+            track cue text position</span>.</p>
            </dd>
 
           </dl></li>
@@ -3518,26 +3518,39 @@
 
   <div class="example">
 
-    <p>For example, consider the following script:</p>
+   <p>Thus, the following script:</p>
 
-    <pre>var s;
+   <pre>alert('\u05DC\u05DE\u05D3 HTML \u05D4\u05D9\u05D5\u05DD!')</pre>
+
+   <p>...would always result in a message reading
+        "<bdo dir="rtl" lang="" title="">&#x5DC;&#x5DE;&#x5D3;&#xA0;LMTH&#xA0;&#x5D4;&#x5D9;&#x5D5;&#x5DD;!</bdo>"
+   (not "<bdo dir="ltr" lang="" title="">&#x5D3;&#x5DE;&#x5DC;&#xA0;HTML&#xA0;&#x5DD;&#x5D5;&#x5D9;&#x5D4;!</bdo>"),
+   regardless of the language of the user agent interface or the
+   direction of the page or any of its elements.</p>
+
+  </div>
+
+  <div class="example">
+
+   <p>For a more complex example, consider the following script:</p>
+
+   <pre>var s;
 if (s = prompt('What is your name?')) {
   alert(s + '! Ok, Fred, ' + s + ', and Wilma will get the car.');
 }</pre>
 
-    <p>When the user enters "<kbd>Kitty</kbd>", the user agent would
-    alert "<samp>Kitty! Ok, Fred, Kitty, and Wilma will get the
-    car.</samp>". However, if the user enters "<kbd dir="rtl" lang="ar">&#x644;&#x627;&#xA0;&#x623;&#x641;&#x647;&#x645;</kbd>",
-    then the bidirectional algorithm will determine that the direction
-    of the paragraph is right-to-left, and so the output will be
-    "<samp lang=""><bdo dir="rtl">&#x644;&#x627;&#xA0;&#x623;&#x641;&#x647;&#x645;!&#xA0;derF&#xA0;,kO,&#xA0;&#x644;&#x627;&#xA0;&#x623;&#x641;&#x647;&#x645;,&#xA0;rac&#xA0;eht&#xA0;teg&#xA0;lliw&#xA0;amliW&#xA0;dna.</bdo></samp>"!</p>
-
-    <p>Authors can enforce a particular interpretation by using the
-    Unicode U+200E LEFT-TO-RIGHT MARK and U+200F RIGHT-TO-LEFT MARK
-    characters.</p>
+   <p>When the user enters "<kbd>Kitty</kbd>", the user agent would
+   alert "<samp>Kitty! Ok, Fred, Kitty, and Wilma will get the
+   car.</samp>". However, if the user enters "<kbd dir="rtl" lang="ar">&#x644;&#x627;&#xA0;&#x623;&#x641;&#x647;&#x645;</kbd>",
+   then the bidirectional algorithm will determine that the direction
+   of the paragraph is right-to-left, and so the output will be "<samp lang=""><bdo dir="rtl">&#x644;&#x627;&#xA0;&#x623;&#x641;&#x647;&#x645;!&#xA0;derF&#xA0;,kO,&#xA0;&#x644;&#x627;&#xA0;&#x623;&#x641;&#x647;&#x645;,&#xA0;rac&#xA0;eht&#xA0;teg&#xA0;lliw&#xA0;amliW&#xA0;dna.</bdo></samp>"!</p>
 
   </div>
 
+  <p>When necessary, authors can enforce a particular direction for a
+  given paragraph by starting it with the Unicode U+200E LEFT-TO-RIGHT
+  MARK or U+200F RIGHT-TO-LEFT MARK characters.</p>
+
 
 
   <h3 id="print-media"><span class="secno">10.7 </span>Print media</h3>

Index: elements.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/elements.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- elements.html	30 Nov 2010 01:49:47 -0000	1.3
+++ elements.html	3 Dec 2010 07:23:30 -0000	1.4
@@ -919,7 +919,8 @@
       element that is a descendant of the element whose <a href="#the-directionality" title="the directionality">directionality</a> is being
       determined and that is either:</p>
 
-      <ul class="brief"><li>A <code><a href="scripting-1.html#script">script</a></code> element.
+      <ul class="brief"><li>A <code><a href="text-level-semantics.html#the-bdi-element">bdi</a></code> element.
+       </li><li>A <code><a href="scripting-1.html#script">script</a></code> element.
        </li><li>A <code><a href="semantics.html#the-style-element">style</a></code> element.
        </li><li>An element with a <code title="attr-dir"><a href="#the-dir-attribute">dir</a></code> attribute in a defined state.
       </li></ul></li>

Index: association-of-controls-and-forms.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/association-of-controls-and-forms.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- association-of-controls-and-forms.html	30 Nov 2010 01:49:47 -0000	1.3
+++ association-of-controls-and-forms.html	3 Dec 2010 07:23:29 -0000	1.4
@@ -1304,12 +1304,17 @@
   <var title="">scripted-submit</var> flag set, the user agent must
   run the following steps:</p>
 
-  <ol><li id="sandboxSubmitBlocked"><p>If <var title="">form</var> is in
-   a <code><a href="infrastructure.html#document">Document</a></code> that has no associated <a href="browsers.html#browsing-context">browsing
-   context</a> or whose <a href="browsers.html#browsing-context">browsing context</a> had its
-   <a href="the-iframe-element.html#sandboxed-forms-browsing-context-flag">sandboxed forms browsing context flag</a> set when the
-   <code><a href="infrastructure.html#document">Document</a></code> was created, then abort these steps without
-   doing anything.</p></li>
+  <ol><li><p>Let <var title="">form document</var> be the <var title="">form</var>'s <code><a href="infrastructure.html#document">Document</a></code>.</p></li>
+
+   <li id="sandboxSubmitBlocked"><p>If <var title="">form
+   document</var> has no associated <a href="browsers.html#browsing-context">browsing context</a> or
+   its <a href="browsers.html#browsing-context">browsing context</a> had its <a href="the-iframe-element.html#sandboxed-forms-browsing-context-flag">sandboxed forms
+   browsing context flag</a> set when the <code><a href="infrastructure.html#document">Document</a></code> was
+   created, then abort these steps without doing anything.</p></li>
+
+   <li><p>Let <var title="">form browsing context</var> be the
+   <a href="browsers.html#browsing-context">browsing context</a> of <var title="">form
+   document</var>.</p></li>
 
    <li><p>If <var title="">form</var> is already being submitted
    (i.e. the form was <a href="#concept-form-submit" title="concept-form-submit">submitted</a> again while processing
@@ -1515,7 +1520,8 @@
 
    <li>
 
-    <p>If <var title="">action</var> is the empty string, let <var title="">action</var> be <a href="dom.html#the-document-s-address">the document's address</a>.</p>
+    <p>If <var title="">action</var> is the empty string, let <var title="">action</var> be <a href="dom.html#the-document-s-address">the document's address</a> of
+    the <var title="">form document</var>.</p>
 
     <p class="note">This step is a <a href="introduction.html#willful-violation">willful violation</a> of
     RFC 3986, which would require base URL processing here. This
@@ -1549,16 +1555,15 @@
    <li><p>If the user indicated a specific <a href="browsers.html#browsing-context">browsing
    context</a> to use when submitting the form, then let <var title="">target browsing context</var> be that <a href="browsers.html#browsing-context">browsing
    context</a>. Otherwise, apply <a href="browsers.html#the-rules-for-choosing-a-browsing-context-given-a-browsing-context-name">the rules for choosing a
-   browsing context given a browsing context name</a> using <var title="">target</var> as the name and the <a href="browsers.html#browsing-context">browsing
-   context</a> of <var title="">form</var> as the context in which
-   the algorithm is executed, and let <var title="">target browsing
-   context</var> be the resulting <a href="browsers.html#browsing-context">browsing
-   context</a>.</p></li>
+   browsing context given a browsing context name</a> using <var title="">target</var> as the name and <var title="">form browsing
+   context</var> as the context in which the algorithm is executed,
+   and let <var title="">target browsing context</var> be the
+   resulting <a href="browsers.html#browsing-context">browsing context</a>.</p></li>
 
    <li><p>If <var title="">target browsing context</var> was created
-   in the previous step, then let <var title="">replace</var> be true.
-   Otherwise, let it be false.</p></li>
-   <!-- XXXXX this is about to change -->
+   in the previous step, or if the <var title="">form document</var>
+   has not yet <a href="the-end.html#completely-loaded">completely loaded</a>, then let <var title="">replace</var> be true. Otherwise, let it be
+   false.</p></li>
 
    <li>
 
@@ -1646,11 +1651,10 @@
 
       </dl><!--<p>If <var title="">method</var> is anything but (GET or)
       POST, and the <span>origin</span> of <var title="">action</var>
-      is not the <span>same origin</span> as that of the
-      <code>form</code> element's <code>Document</code>, then abort
-      these steps.</p> [or do CORS] (this is commented out since only
-      POST can trigger this now, and that's historically
-      unrestricted)--><p>Otherwise, <a href="history.html#navigate">navigate</a><!--DONAV form--> <var title="">target browsing context</var> to <var title="">action</var> using the HTTP method given by <var title="">method</var> and with <var title="">entity body</var>
+      is not the <span>same origin</span> as that of <var
+      title="">form document</var>, then abort these steps.</p> [or do
+      CORS] (this is commented out since only POST can trigger this
+      now, and that's historically unrestricted)--><p>Otherwise, <a href="history.html#navigate">navigate</a><!--DONAV form--> <var title="">target browsing context</var> to <var title="">action</var> using the HTTP method given by <var title="">method</var> and with <var title="">entity body</var>
       as the entity body, of type <var title="">MIME type</var>. If
       <var title="">replace</var> is true, then <var title="">target
       browsing context</var> must be navigated with <a href="history.html#replacement-enabled">replacement
@@ -1692,9 +1696,9 @@
       resulting escaped string. <a href="references.html#refsRFC3986">[RFC3986]</a></p>
 
       <p><a href="history.html#navigate">Navigate</a><!--DONAV form--> <var title="">target
-      browsing context</var> to the potentially modified <var title="">action</var>. If <var title="">replace</var> is true,
-      then <var title="">target browsing context</var> must be
-      navigated with <a href="history.html#replacement-enabled">replacement enabled</a>.</p>
+      browsing context</var> to the potentially modified <var title="">action</var> (which will be a <a href="infrastructure.html#data-protocol" title="data&#10;      protocol"><code title="">data:</code> URL</a>). If <var title="">replace</var> is true, then <var title="">target
+      browsing context</var> must be navigated with <a href="history.html#replacement-enabled">replacement
+      enabled</a>.</p>
 
      </dd>
 

Index: editing.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/editing.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- editing.html	30 Nov 2010 01:49:47 -0000	1.3
+++ editing.html	3 Dec 2010 07:23:30 -0000	1.4
@@ -659,6 +659,7 @@
    </li>
 
    <li><p><a href="webappapis.html#fire-a-simple-event">Fire a simple event</a> named <code title="event-focus">focus</code> at the element.</p></li>
+   <!-- http://software.hixie.ch/utilities/js/live-dom-viewer/saved/723 -->
 
   </ol><p>User agents must synchronously run the <a href="#focusing-steps">focusing
   steps</a> for an element whenever the user moves the focus to a
@@ -678,6 +679,7 @@
    </li><li><p>Unfocus the element.</p></li>
 
    <li><p><a href="webappapis.html#fire-a-simple-event">Fire a simple event</a> named <code title="event-blur">blur</code> at the element.</p></li>
+   <!-- http://software.hixie.ch/utilities/js/live-dom-viewer/saved/723 -->
 
   </ol><p>When an element that is focused stops being a
   <a href="#focusable">focusable</a> element, or stops being focused without

Index: video.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/video.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- video.html	30 Nov 2010 01:49:50 -0000	1.3
+++ video.html	3 Dec 2010 07:23:30 -0000	1.4
@@ -366,8 +366,7 @@
    <a href="the-canvas-element.html">4.8.11 The canvas element &#x2192;</a>
   <ol class="toc"><li><ol><li><ol><li><a href="video.html#video"><span class="secno">4.8.6 </span>The <code>video</code> element</a></li><li><a href="video.html#audio"><span class="secno">4.8.7 </span>The <code>audio</code> element</a></li><li><a href="video.html#the-source-element"><span class="secno">4.8.8 </span>The <code>source</code> element</a></li><li><a href="video.html#the-track-element"><span class="secno">4.8.9 </span>The <code>track</code> element</a></li><li><a href="video.html#media-elements"><span class="secno">4.8.10 </span>Media elements</a>
       <ol><li><a href="video.html#error-codes"><span class="secno">4.8.10.1 </span>Error codes</a></li><li><a href="video.html#location-of-the-media-resource"><span class="secno">4.8.10.2 </span>Location of the media resource</a></li><li><a href="video.html#mime-types"><span class="secno">4.8.10.3 </span>MIME types</a></li><li><a href="video.html#network-states"><span class="secno">4.8.10.4 </span>Network states</a></li><li><a href="video.html#loading-the-media-resource"><span class="secno">4.8.10.5 </span>Loading the media resource</a></li><li><a href="video.html#offsets-into-the-media-resource"><span class="secno">4.8.10.6 </span>Offsets into the media resource</a></li><li><a href="video.html#the-ready-states"><span class="secno">4.8.10.7 </span>The ready states</a></li><li><a href="video.html#playing-the-media-resource"><span class="secno">4.8.10.8 </span>Playing the media resource</a></li><li><a href="video.html#seeking"><span class="secno">4.8.10.9 </span>Seeking</a></li><li><a href="video.html#timed-tracks"><span class="secno">4.8.10.10 </span>Timed tracks</a>
-        <ol><li><a href="video.html#timed-track-model"><span class="secno">4.8.10.10.1 </span>Timed track model</a></li><li><a href="video.html#sourcing-in-band-timed-tracks"><span class="secno">4.8.10.10.2 </span>Sourcing in-band timed tracks</a></li><li><a href="video.html#sourcing-out-of-band-timed-tracks"><span class="secno">4.8.10.10.3 </span>Sourcing out-of-band timed tracks</a></li><li><a href="video.html#guidelines-for-exposing-cues-in-various-formats-as-timed-track-cues"><span class="secno">4.8.10.10.4 </span>Guidelines for exposing cues in various formats as
-  timed track cues</a></li><li><a href="video.html#timed-track-api"><span class="secno">4.8.10.10.5 </span>Timed track API</a></li><li><a href="video.html#cue-events"><span class="secno">4.8.10.10.6 </span>Event definitions</a></li></ol></li><li><a href="video.html#user-interface"><span class="secno">4.8.10.11 </span>User interface</a></li><li><a href="video.html#time-ranges"><span class="secno">4.8.10.12 </span>Time ranges</a></li><li><a href="video.html#mediaevents"><span class="secno">4.8.10.13 </span>Event summary</a></li><li><a href="video.html#security-and-privacy-considerations"><span class="secno">4.8.10.14 </span>Security and privacy considerations</a></li></ol></li></ol></li></ol></li></ol></div><h4 id="video"><span class="secno">4.8.6 </span>The <dfn><code>video</code></dfn> element</h4><p class="XXX annotation"><span><a href="http://www.w3.org/html/wg/tracker/issues/9">ISSUE-9</a> (video-accessibility) blocks progress to Last Call</span></p><dl class="element"><dt>Categories</dt>
+        <ol><li><a href="video.html#timed-track-model"><span class="secno">4.8.10.10.1 </span>Timed track model</a></li><li><a href="video.html#sourcing-in-band-timed-tracks"><span class="secno">4.8.10.10.2 </span>Sourcing in-band timed tracks</a></li><li><a href="video.html#sourcing-out-of-band-timed-tracks"><span class="secno">4.8.10.10.3 </span>Sourcing out-of-band timed tracks</a></li><li><a href="video.html#timed-track-api"><span class="secno">4.8.10.10.4 </span>Timed track API</a></li><li><a href="video.html#cue-events"><span class="secno">4.8.10.10.5 </span>Event definitions</a></li></ol></li><li><a href="video.html#user-interface"><span class="secno">4.8.10.11 </span>User interface</a></li><li><a href="video.html#time-ranges"><span class="secno">4.8.10.12 </span>Time ranges</a></li><li><a href="video.html#mediaevents"><span class="secno">4.8.10.13 </span>Event summary</a></li><li><a href="video.html#security-and-privacy-considerations"><span class="secno">4.8.10.14 </span>Security and privacy considerations</a></li></ol></li></ol></li></ol></li></ol></div><h4 id="video"><span class="secno">4.8.6 </span>The <dfn><code>video</code></dfn> element</h4><p class="XXX annotation"><span><a href="http://www.w3.org/html/wg/tracker/issues/9">ISSUE-9</a> (video-accessibility) blocks progress to Last Call</span></p><dl class="element"><dt>Categories</dt>
    <dd><a href="content-models.html#flow-content">Flow content</a>.</dd>
    <dd><a href="content-models.html#phrasing-content">Phrasing content</a>.</dd>
    <dd><a href="content-models.html#embedded-content">Embedded content</a>.</dd>
@@ -980,16 +979,14 @@
   URL</a>. Otherwise, the element's <a href="#track-url">track URL</a> is the
   empty string.</p>
 
-  </div><p>If the elements's <a href="#track-url">track URL</a> identifies a
-  <span>WebSRT</span> resource, and the element's <code title="attr-track-kind"><a href="#attr-track-kind">kind</a></code> attribute is not in the <a href="#attr-track-kind-metadata" title="attr-track-kind-metadata">metadata</a> state, then the
-  <span>WebSRT</span> file must be a <span>WebSRT file using cue
-  text</span>.</p><p>If the elements's <a href="#track-url">track URL</a> identifies a
-  <span>WebSRT</span> resource, then the <dfn id="attr-track-charset" title="attr-track-charset"><code>charset</code></dfn> attribute may
+  </div><p>If the elements's <a href="#track-url">track URL</a> identifies a resource
+  that <dfn id="supports-external-timed-track-character-encoding-overrides">supports external timed track character encoding
+  overrides</dfn>, then the <dfn id="attr-track-charset" title="attr-track-charset"><code>charset</code></dfn> attribute may
   be specified. If the attribute is set, its value must be a valid
   character encoding name, must be an <a href="infrastructure.html#ascii-case-insensitive">ASCII
   case-insensitive</a> match for the <a href="infrastructure.html#preferred-mime-name">preferred MIME
   name</a> for that encoding, and must match the character encoding
-  of the <span>WebSRT</span> file. <a href="references.html#refsIANACHARSET">[IANACHARSET]</a></p><p>The <dfn id="attr-track-srclang" title="attr-track-srclang"><code>srclang</code></dfn>
+  of the resource in question. <a href="references.html#refsIANACHARSET">[IANACHARSET]</a></p><p>The <dfn id="attr-track-srclang" title="attr-track-srclang"><code>srclang</code></dfn>
   attribute gives the language of the timed track data. The value must
   be a valid BCP 47 language tag. This attribute must be present if
   the element's <code title="attr-track-kind"><a href="#attr-track-kind">kind</a></code> attribute is
@@ -3114,9 +3111,8 @@
 
    <li><p>Run the <a href="#rules-for-updating-the-timed-track-rendering">rules for updating the timed track
    rendering</a> of each of the <a href="#timed-track" title="timed track">timed
-   tracks</a> in <var title="">affected tracks</var> that are <a href="#timed-track-showing" title="timed track showing">showing</a> (e.g., for <a href="#timed-track" title="timed track">timed tracks</a> based on
-   <span>WebSRT</span>, the <a href="rendering.html#rules-for-updating-the-display-of-websrt-timed-tracks">rules for updating the display of
-   WebSRT timed tracks</a>).</p></li>
+   tracks</a> in <var title="">affected tracks</var> that are <a href="#timed-track-showing" title="timed track showing">showing</a>.
+   </p></li>
 <!--KEEP-START w3c-html--><!--TT-->
 
   </ol><!--KEEP-END w3c-html--><!--TT--><p>For the purposes of the algorithm above, a <a href="#timed-track-cue">timed track
@@ -3446,12 +3442,12 @@
 
     <p>A list of <a href="#timed-track-cue" title="timed track cue">timed track
     cues</a>, along with <dfn id="rules-for-updating-the-timed-track-rendering">rules for updating the timed track
-    rendering</dfn> (e.g., for <span>WebSRT</span>, the <a href="rendering.html#rules-for-updating-the-display-of-websrt-timed-tracks">rules
-    for updating the display of WebSRT timed tracks</a>).</p>
+    rendering</dfn>.
+    </p>
 
     <p>The <a href="#timed-track-list-of-cues" title="timed track list of cues">list of cues of a
     timed track</a> can change dynamically, either because the
-    <a href="#timed-track">timed track</a> has <a href="#timed-track-not-loaded" title="timed track not&#10;    loaded">not yet been loaded</a> or is still <a href="#timed-track-loading" title="timed&#10;    track loading">loading</a>, or because the the <a href="#timed-track">timed
+    <a href="#timed-track">timed track</a> has <a href="#timed-track-not-loaded" title="timed track not&#10;    loaded">not yet been loaded</a> or is still <a href="#timed-track-loading" title="timed&#10;    track loading">loading</a>, or because the <a href="#timed-track">timed
     track</a> corresponds to a <code><a href="#mutabletimedtrack">MutableTimedTrack</a></code>
     object, whose API allows individual cues can be added or removed
     dynamically.</p>
@@ -3504,42 +3500,9 @@
     consecutive lines displayed to the right of each other<!-- used for
     mongolian -->).</p>
 
-    <p>If the <a href="#timed-track-cue-writing-direction" title="timed track cue writing direction">writing
-    direction</a> is <a href="#timed-track-cue-horizontal-writing-direction" title="timed track cue horizontal&#10;    writing direction">horizontal</a>, then <a href="#timed-track-cue-line-position" title="timed&#10;    track cue line position">line position</a> percentages are
-    relative to the height of the video, and <a href="#timed-track-cue-text-position" title="timed track&#10;    cue text position">text position</a> and <a href="#timed-track-cue-size" title="timed&#10;    track cue size">size</a> percentages are relative to the width
-    of the video.</p>
-
-    <p>Otherwise, <a href="#timed-track-cue-line-position" title="timed track cue line position">line
-    position</a> percentages are relative to the width of the
-    video, and <a href="#timed-track-cue-text-position" title="timed track cue text position">text
-    position</a> and <a href="#timed-track-cue-size" title="timed track cue size">size</a>
-    percentages are relative to the height of the video.</p>
 
    </dd>
 
-   <dt><dfn id="timed-track-cue-snap-to-lines-flag" title="timed track cue snap-to-lines flag">A snap-to-lines flag</dfn>
-   </dt><dd>
-    <p>A boolean indicating whether the <a href="#timed-track-cue-line-position" title="timed track cue&#10;    line position">line's position</a> is a line position
-    (positioned to a multiple of the line dimensions of the first line
-    of the cue), or whether it is a percentage of the dimension of the
-    video.</p>
-   </dd>
-
-   <dt><dfn id="timed-track-cue-line-position" title="timed track cue line position">A line position</dfn>
-   </dt><dd>
-    <p>Either a number giving the position of the lines of the cue, to
-    be interpreted as defined by the <a href="#timed-track-cue-writing-direction" title="timed track cue&#10;    writing direction">writing direction</a> and <a href="#timed-track-cue-snap-to-lines-flag" title="timed&#10;    track cue snap-to-lines flag">snap-to-lines flag</a> of the
-    cue, or the special value <dfn id="timed-track-cue-automatic-line-position" title="timed track cue automatic line&#10;    position">auto</dfn>, which means the position is to depend on
-    the other active tracks.</p>
-   </dd>
-
-   <dt><dfn id="timed-track-cue-text-position" title="timed track cue text position">A text position</dfn>
-   </dt><dd>
-    <p>A number giving the position of the text of the cue within each
-    line, to be interpreted as a percentage of the video, as defined
-    by the <a href="#timed-track-cue-writing-direction" title="timed track cue writing direction">writing
-    direction</a>.</p>
-   </dd>
 
    <dt><dfn id="timed-track-cue-size" title="timed track cue size">A size</dfn>
    </dt><dd>
@@ -3548,15 +3511,6 @@
     percentage of the video, as defined by the <a href="#timed-track-cue-writing-direction" title="timed&#10;    track cue writing direction">writing direction</a>.</p>
    </dd>
 
-   <dt><dfn id="timed-track-cue-alignment" title="timed track cue alignment">An alignment</dfn>
-   </dt><dd>
-    <p>An alignment for the text of each line of the cue, either <dfn id="timed-track-cue-start-alignment" title="timed track cue start alignment">start alignment</dfn> (the
-    text is aligned towards its start side), <dfn id="timed-track-cue-middle-alignment" title="timed track&#10;    cue middle alignment">middle alignment</dfn> (the text is aligned
-    centered between its start and end sides), <dfn id="timed-track-cue-end-alignment" title="timed track&#10;    cue end alignment">end alignment</dfn> (the text is aligned
-    towards its end side). Which sides are the start and end sides
-    depends on the Unicode bidirectional algorithm and the <a href="#timed-track-cue-writing-direction" title="timed track cue writing direction">writing
-    direction</a>. <a href="references.html#refsBIDI">[BIDI]</a></p>
-   </dd>
 
    <dt><dfn id="timed-track-cue-voice-identifier" title="timed track cue voice identifier">A voice identifier</dfn>
    </dt><dd>
@@ -3593,11 +3547,8 @@
     incident, the user agent must, after having unset the flag for all
     the affected cues, apply the <a href="#rules-for-updating-the-timed-track-rendering">rules for updating the timed
     track rendering</a> of those <a href="#timed-track" title="timed track">timed
-    tracks</a> (e.g., for <a href="#timed-track" title="timed track">timed
-    tracks</a> based on <span>WebSRT</span>, the <a href="rendering.html#rules-for-updating-the-display-of-websrt-timed-tracks">rules for
-    updating the display of WebSRT timed tracks</a>).</p>
-
-   </dd>
+    tracks</a>.
+   </p></dd>
 
    <dt>The <dfn id="timed-track-cue-display-state" title="timed track cue display state">display state</dfn>
    </dt><dd>
@@ -3649,8 +3600,8 @@
    specification.</p></li>
 
    <li><p>Populate the new <a href="#timed-track">timed track</a>'s <a href="#timed-track-list-of-cues" title="timed track list of cues">list of cues</a> with the cues
-   parsed so far, folllowing the <a href="#guidelines-for-exposing-cues-in-various-formats-as-timed-track-cues">guidelines for exposing
-   cues</a>, and begin updating it dynamically as
+   parsed so far, folllowing the <span>guidelines for exposing
+   cues</span>, and begin updating it dynamically as
    necessary.</p></li>
 
    <li>
@@ -3829,8 +3780,7 @@
     unsupported (this causes the load to fail, as described below). If
     a type is obtained, and represents a supported timed track format,
     then the resource's data must be passed to the appropriate parser
-    (e.g. the <span>WebSRT parser</span> if the <a href="fetching-resources.html#content-type" title="Content-Type">Content Type metadata</a> is 
-    <code>text/srt</code>) as it is received, with the <a href="#timed-track-list-of-cues">timed
+    as it is received, with the <a href="#timed-track-list-of-cues">timed
     track list of cues</a> being used for that parser's output. If
     the <code><a href="#the-track-element">track</a></code> element has a <code title="attr-track-charset"><a href="#attr-track-charset">charset</a></code> attribute that specifies
     a supported character encoding, then that encoding must be given
@@ -3909,72 +3859,7 @@
 
    <li><p>Jump to the step labeled <i>download</i>.</p></li>
 
-  </ol></div><div class="impl">
-
-  <h6 id="guidelines-for-exposing-cues-in-various-formats-as-timed-track-cues"><span class="secno">4.8.10.10.4 </span><dfn>Guidelines for exposing cues</dfn> in various formats as
-  <a href="#timed-track-cue" title="timed track cue">timed track cues</a></h6>
-
-  <p>How a specific format's timed track cues are to be interpreted
-  for the purposes of processing by an HTML user agent is defined by
-  that format. In the absence of such a specification, this section
-  provides some constraints within which implementations can attempt
-  to consistently expose such formats.</p>
-
-  <p>To support the <a href="#timed-track">timed track</a> model of HTML, each unit
-  of timed data is converted to a <a href="#timed-track-cue">timed track cue</a>. Where
-  the mapping of the format's features to the aspects of a <a href="#timed-track-cue">timed
-  track cue</a> as defined in this specification are not defined,
-  implementations must ensure that the mapping is consistent with the
-  definitions of the aspects of a <a href="#timed-track-cue">timed track cue</a> as
-  defined above, as well as with the following constraints:</p>
-
-  <dl><dt>The <a href="#timed-track-cue-identifier">timed track cue identifier</a>
-   </dt><dd>
-    <p>Should be set to the empty string if the format has no
-    obvious analogue to a per-cue identifier.</p>
-   </dd>
-
-   <dt>The <a href="#timed-track-cue-pause-on-exit-flag">timed track cue pause-on-exit flag</a>
-   </dt><dd>
-    <p>Should be set to false.</p>
-   </dd>
-
-   <dt>The <a href="#timed-track-cue-writing-direction">timed track cue writing direction</a>
-   </dt><dd>
-    <p>Should be set to <a href="#timed-track-cue-horizontal-writing-direction" title="timed track cue horizontal writing&#10;    direction">horizontal</a> if the concept of writing direction
-    doesn't really apply (e.g. the cue consists of a bitmap
-    image).</p>
-   </dd>
-
-   <dt>The <a href="#timed-track-cue-snap-to-lines-flag">timed track cue snap-to-lines flag</a>
-   </dt><dd>
-    <p>Should be set to false unless the format uses a rendering and
-    positioning model for cues that is largely consistent with the
-    <a href="rendering.html#websrt-cue-text-rendering-rules">WebSRT cue text rendering rules</a>.</p>
-   </dd>
-
-   <dt>The <a href="#timed-track-cue-line-position">timed track cue line position</a>
-   <dt>The <a href="#timed-track-cue-text-position">timed track cue text position</a>
-   <dt>The <a href="#timed-track-cue-size">timed track cue size</a>
-   <dt>The <a href="#timed-track-cue-alignment">timed track cue alignment</a>
-   </dt></dt></dt></dt><dd>
-    <p>If the the format uses a rendering and positioning model for
-    cues that can be largely simulated using the <a href="rendering.html#websrt-cue-text-rendering-rules">WebSRT cue text
-    rendering rules</a>, then these should be set to the values
-    that would give the same effect for <span>WebSRT</span>
-    cues. Otherwise, they should be set to zero.</p>
-   </dd>
-
-   <dt>The <a href="#timed-track-cue-voice-identifier">timed track cue voice identifier</a>
-   </dt><dd>
-    <p>Should be set to the empty string if the format has no
-    obvious analogue to cue voices. The <a href="#timed-track-cue-voice-identifier">timed track cue voice
-    identifier</a> may be set to strings that cannot be expressed
-    using <span>WebSRT</span>, if the format supports voices that do
-    not correspond to the voices used by WebSRT.</p>
-   </dd>
-
-  </dl></div><h6 id="timed-track-api"><span class="secno">4.8.10.10.5 </span>Timed track API</h6><dl class="domintro"><dt><var title="">media</var> . <code title="dom-media-tracks"><a href="#dom-media-tracks">tracks</a></code> . <code title="">length</code></dt>
+  </ol></div><h6 id="timed-track-api"><span class="secno">4.8.10.10.4 </span>Timed track API</h6><dl class="domintro"><dt><var title="">media</var> . <code title="dom-media-tracks"><a href="#dom-media-tracks">tracks</a></code> . <code title="">length</code></dt>
    <dd>
     <p>Returns the number of <a href="#timed-track" title="timed track">timed tracks</a> associated with the <a href="#media-element">media element</a> (e.g. from <code><a href="#the-track-element">track</a></code> elements). This is the number of <a href="#timed-track" title="timed track">timed tracks</a> in the <a href="#media-element">media element</a>'s <a href="#list-of-timed-tracks">list of timed tracks</a>.</p>
    </dd>
@@ -4263,10 +4148,8 @@
     <a href="#timed-track-readiness-state">timed track readiness state</a> to the <a href="#timed-track-loaded">timed track
     loaded</a> state, its <a href="#timed-track-mode">timed track mode</a> to the
     <a href="#timed-track-hidden">timed track hidden</a> mode, and its <a href="#timed-track-list-of-cues">timed track
-    list of cues</a> to an empty list, associated with the
-    <a href="rendering.html#rules-for-updating-the-display-of-websrt-timed-tracks">rules for updating the display of WebSRT timed tracks</a>
-    as its <a href="#rules-for-updating-the-timed-track-rendering">rules for updating the timed track
-    rendering</a>.</p>
+    list of cues</a> to an empty list.
+    </p>
 
    </li>
 
@@ -4404,7 +4287,7 @@
   otherwise. If the argument is the empty string, then the method must
   return null.</p>
 
-  </div><hr/><pre class="idl">[<a href="#dom-timedtrackcue" title="dom-TimedTrackCue">Constructor</a>(in DOMString id, in double startTime, in double endTime, in DOMString text, in optional DOMString settings, in optional DOMString voice, in optional boolean pauseOnExit)]
+  </div><hr/><pre class="idl">
 interface <dfn id="timedtrackcue">TimedTrackCue</dfn> {
   readonly attribute <a href="#timedtrack">TimedTrack</a> <a href="#dom-timedtrackcue-track" title="dom-TimedTrackCue-track">track</a>;
   readonly attribute DOMString <a href="#dom-timedtrackcue-id" title="dom-TimedTrackCue-id">id</a>;
@@ -4413,12 +4296,6 @@
   readonly attribute double <a href="#dom-timedtrackcue-endtime" title="dom-TimedTrackCue-endTime">endTime</a>;
   readonly attribute boolean <a href="#dom-timedtrackcue-pauseonexit" title="dom-TimedTrackCue-pauseOnExit">pauseOnExit</a>;
 
-  readonly attribute DOMString <a href="#dom-timedtrackcue-direction" title="dom-TimedTrackCue-direction">direction</a>;
-  readonly attribute boolean <a href="#dom-timedtrackcue-snaptolines" title="dom-TimedTrackCue-snapToLines">snapToLines</a>;
-  readonly attribute long <a href="#dom-timedtrackcue-lineposition" title="dom-TimedTrackCue-linePosition">linePosition</a>;
-  readonly attribute long <a href="#dom-timedtrackcue-textposition" title="dom-TimedTrackCue-textPosition">textPosition</a>;
-  readonly attribute long <a href="#dom-timedtrackcue-size" title="dom-TimedTrackCue-size">size</a>;
-  readonly attribute DOMString <a href="#dom-timedtrackcue-alignment" title="dom-TimedTrackCue-alignment">alignment</a>;
 
   readonly attribute DOMString <a href="#dom-timedtrackcue-voice" title="dom-TimedTrackCue-voice">voice</a>;
   DOMString <a href="#dom-timedtrackcue-getcueassource" title="dom-TimedTrackCue-getCueAsSource()">getCueAsSource</a>();
@@ -4426,19 +4303,7 @@
 
   readonly attribute <a href="webappapis.html#function">Function</a> <a href="#handler-timedtrackcue-onenter" title="handler-TimedTrackCue-onenter">onenter</a>;
   readonly attribute <a href="webappapis.html#function">Function</a> <a href="#handler-timedtrackcue-onexit" title="handler-TimedTrackCue-onexit">onexit</a>;
-};</pre><dl class="domintro"><dt><var title="">cue</var> = new <code title="dom-TimedTrackCue"><a href="#dom-timedtrackcue">TimedTrackCue</a></code>( <var title="">id</var>, <var title="">startTime</var>, <var title="">endTime</var>, <var title="">text</var> [, <var title="">settings</var> [, <var title="">voice</var> [, <var title="">pauseOnExit</var> ] ] ] )</dt>
-   <dd>
-    <p>Returns a new <code><a href="#timedtrackcue">TimedTrackCue</a></code> object, for use with the <code title="dom-MutableTimedTrack-addCue"><a href="#dom-mutabletimedtrack-addcue">addCue()</a></code> method.</p>
-    <p>The <var title="">id</var> argument sets the <a href="#timed-track-cue-identifier">timed track cue identifier</a>.</p>
-    <p>The <var title="">startTime</var> argument sets the <a href="#timed-track-cue-start-time">timed track cue start time</a>.</p>
-    <p>The <var title="">endTime</var> argument sets the <a href="#timed-track-cue-end-time">timed track cue end time</a>.</p>
-    <p>The <var title="">text</var> argument sets the <a href="#timed-track-cue-text">timed track cue text</a>.</p>
-    <p>The <var title="">settings</var> argument is a string in the format of <span>WebSRT cue settings</span>. If omitted, the empty string is assumed.</p>
-    <p>The <var title="">voice</var> argument sets the <a href="#timed-track-cue-voice-identifier">timed track cue voice identifier</a>. If omitted, the empty string is assumed.</p>
-    <p>The <var title="">pauseOnExit</var> argument sets the <a href="#timed-track-cue-pause-on-exit-flag">timed track cue pause-on-exit flag</a>. If omitted, false is assumed.</p>
-   </dd>
-
-   <dt><var title="">cue</var> . <a href="#dom-timedtrackcue-track" title="dom-TimedTrackCue-track">track</a></dt>
+};</pre><dl class="domintro"><dt><var title="">cue</var> . <a href="#dom-timedtrackcue-track" title="dom-TimedTrackCue-track">track</a></dt>
    <dd>
     <p>Returns the <code><a href="#timedtrack">TimedTrack</a></code> object to which this
     <a href="#timed-track-cue">timed track cue</a> belongs, if any, or null
@@ -4465,48 +4330,6 @@
     <p>Returns true if the <a href="#timed-track-cue-pause-on-exit-flag">timed track cue pause-on-exit flag</a> is set, false otherwise.</p>
    </dd>
 
-   <dt><var title="">cue</var> . <a href="#dom-timedtrackcue-direction" title="dom-TimedTrackCue-direction">direction</a></dt>
-   <dd>
-    <p>Returns a string representing the <a href="#timed-track-cue-writing-direction">timed track cue writing direction</a>, as follows:</p>
-    <dl class="switch"><dt>If it is <a href="#timed-track-cue-horizontal-writing-direction" title="timed track cue horizontal writing direction">horizontal</a></dt>
-     <dd><p>The string "<code title="">horizontal</code>".</p></dd>
-     <dt>If it is <a href="#timed-track-cue-vertical-growing-left-writing-direction" title="timed track cue vertical growing left writing direction">vertical growing left</a></dt>
-     <dd><p>The string "<code title="">vertical</code>".</p></dd>
-     <dt>If it is <a href="#timed-track-cue-vertical-growing-right-writing-direction" title="timed track cue vertical growing right writing direction">vertical growing right</a></dt>
-     <dd><p>The string "<code title="">vertical-lr</code>".</p></dd>
-    </dl></dd>
-
-   <dt><var title="">cue</var> . <a href="#dom-timedtrackcue-snaptolines" title="dom-TimedTrackCue-snapToLines">snapToLines</a></dt>
-   <dd>
-    <p>Returns true if the <a href="#timed-track-cue-snap-to-lines-flag">timed track cue snap-to-lines flag</a> is set, false otherwise.</p>
-   </dd>
-
-   <dt><var title="">cue</var> . <a href="#dom-timedtrackcue-lineposition" title="dom-TimedTrackCue-linePosition">linePosition</a></dt>
-   <dd>
-    <p>Returns the <a href="#timed-track-cue-line-position">timed track cue line position</a>. In the
-    case of the value being <a href="#timed-track-cue-automatic-line-position" title="timed track cue automatic&#10;    line position">auto</a>, the appropriate default is returned.</p>
-   </dd>
-
-   <dt><var title="">cue</var> . <a href="#dom-timedtrackcue-textposition" title="dom-TimedTrackCue-textPosition">textPosition</a></dt>
-   <dd>
-    <p>Returns the <a href="#timed-track-cue-text-position">timed track cue text position</a>.</p>
-   </dd>
-
-   <dt><var title="">cue</var> . <a href="#dom-timedtrackcue-size" title="dom-TimedTrackCue-size">size</a></dt>
-   <dd>
-    <p>Returns the <a href="#timed-track-cue-size">timed track cue size</a>.</p>
-   </dd>
-
-   <dt><var title="">cue</var> . <a href="#dom-timedtrackcue-alignment" title="dom-TimedTrackCue-alignment">alignment</a></dt>
-   <dd>
-    <p>Returns a string representing the <a href="#timed-track-cue-alignment">timed track cue alignment</a>, as follows:</p>
-    <dl class="switch"><dt>If it is <a href="#timed-track-cue-start-alignment" title="timed track cue start alignment">start alignment</a></dt>
-     <dd><p>The string "<code title="">start</code>".</p></dd>
-     <dt>If it is <a href="#timed-track-cue-middle-alignment" title="timed track cue middle alignment">middle alignment</a></dt>
-     <dd><p>The string "<code title="">middle</code>".</p></dd>
-     <dt>If it is <a href="#timed-track-cue-end-alignment" title="timed track cue end alignment">end alignment</a></dt>
-     <dd><p>The string "<code title="">end</code>".</p></dd>
-    </dl></dd>
 
    <dt><var title="">cue</var> . <a href="#dom-timedtrackcue-voice" title="dom-TimedTrackCue-voice">voice</a></dt>
    <dd>
@@ -4525,71 +4348,8 @@
 
   </dl><div class="impl">
 
-  <p>The <dfn id="dom-timedtrackcue" title="dom-TimedTrackCue"><code>TimedTrackCue(<var title="">id</var>, <var title="">startTime</var>, <var title="">endTime</var>, <var title="">text</var>, <var title="">settings</var>, <var title="">voice</var>, <var title="">pauseOnExit</var>)</code></dfn> constructor, when invoked,
-  must run the following steps:</p>
-
-  <ol><li><p>Create a new <a href="#timed-track-cue">timed track cue</a> that is not
-   associated with any <a href="#timed-track">timed track</a>. Let <var title="">cue</var> be that <a href="#timed-track-cue">timed track cue</a>.</p></li>
-
-   <li><p>Let <var title="">cue</var>'s <a href="#timed-track-cue-identifier">timed track cue
-   identifier</a> be the value of the <var title="">id</var>
-   argument.</p></li>
-
-   <li><p>Let <var title="">cue</var>'s <a href="#timed-track-cue-start-time">timed track cue start
-   time</a> be the value of the <var title="">startTime</var>
-   argument, interpreted as a time in seconds.</p></li>
-
-   <li><p>Let <var title="">cue</var>'s <a href="#timed-track-cue-end-time">timed track cue end
-   time</a> be the value of the <var title="">endTime</var>
-   argument, interpreted as a time in seconds.</p></li>
-
-   <li><p>Let <var title="">cue</var>'s <a href="#timed-track-cue-pause-on-exit-flag">timed track cue
-   pause-on-exit flag</a> be true if the <var title="">pauseOnExit</var> is present and true. Otherwise, let it
-   be false.</p></li>
 
-   <li><p>Let <var title="">cue</var>'s <a href="#timed-track-cue-voice-identifier">timed track cue voice
-   identifier</a> be the value of the <var title="">voice</var>
-   argument, if it is present, or the empty string otherwise.</p></li>
-
-   <li><p>Let <var title="">cue</var>'s <a href="#timed-track-cue-text">timed track cue
-   text</a> be the value of the <var title="">text</var> argument,
-   and let the rules for its interpretation be the <span>WebSRT cue
-   text parsing rules</span>, the <a href="rendering.html#websrt-cue-text-rendering-rules">WebSRT cue text rendering
-   rules</a>, and the <span>WebSRT cue text DOM construction
-   rules</span>.</p></li>
-
-   <!-- default settings -->
-
-   <li><p>Let <var title="">cue</var>'s <a href="#timed-track-cue-writing-direction">timed track cue
-   writing direction</a> be <a href="#timed-track-cue-horizontal-writing-direction" title="timed track cue&#10;   horizontal writing direction">horizontal</a>.</p></li>
-
-   <li><p>Let <var title="">cue</var>'s <a href="#timed-track-cue-snap-to-lines-flag">timed track cue
-   snap-to-lines flag</a> be true.</p></li>
-
-   <li><p>Let <var title="">cue</var>'s <a href="#timed-track-cue-line-position">timed track cue line
-   position</a> be <a href="#timed-track-cue-automatic-line-position" title="timed track cue automatic line&#10;   position">auto</a>.</p></li>
-
-   <li><p>Let <var title="">cue</var>'s <a href="#timed-track-cue-text-position">timed track cue
-   text position</a> be 50.</p></li>
-
-   <li><p>Let <var title="">cue</var>'s <a href="#timed-track-cue-size">timed track cue
-   size</a> be 100.</p></li>
-
-   <li><p>Let <var title="">cue</var>'s <a href="#timed-track-cue-alignment">timed track cue
-   alignment</a> be <a href="#timed-track-cue-middle-alignment" title="timed track cue middle&#10;   alignment">middle alignment</a>.</p></li>
-
-   <li><p>Let <var title="">input</var> be the string given by the
-   <var title="">settings</var> argument.</p></li>
-
-   <li><p>Let <var title="">position</var> be a pointer into <var title="">input</var>, initially pointing at the start of the
-   string.</p></li>
-
-   <li><p><span>Parse the WebSRT settings</span> for <var title="">cue</var>.</p></li>
-
-   <li><p>Return the <code><a href="#timedtrackcue">TimedTrackCue</a></code> object representing
-   <var title="">cue</var>.</p></li>
-
-  </ol><p>The <dfn id="dom-timedtrackcue-track" title="dom-TimedTrackCue-track"><code>track</code></dfn>
+  <p>The <dfn id="dom-timedtrackcue-track" title="dom-TimedTrackCue-track"><code>track</code></dfn>
   attribute must return the <code><a href="#timedtrack">TimedTrack</a></code> object of the
   <a href="#timed-track">timed track</a> with which the <a href="#timed-track-cue">timed track cue</a>
   that the <code><a href="#timedtrackcue">TimedTrackCue</a></code> object represents is associated,
@@ -4621,56 +4381,6 @@
   direction</a> of the <a href="#timed-track-cue">timed track cue</a> that the
   <code><a href="#timedtrackcue">TimedTrackCue</a></code> object represents.</p>
 
-  <p>The <dfn id="dom-timedtrackcue-snaptolines" title="dom-TimedTrackCue-snapToLines"><code>snapToLines</code></dfn>
-  attribute must return true if the <a href="#timed-track-cue-snap-to-lines-flag">timed track cue
-  snap-to-lines flag</a> of the <a href="#timed-track-cue">timed track cue</a> that
-  the <code><a href="#timedtrackcue">TimedTrackCue</a></code> object represents is set; or false
-  otherwise.</p>
-
-  <p>The <dfn id="dom-timedtrackcue-lineposition" title="dom-TimedTrackCue-linePosition"><code>linePosition</code></dfn>
-  attribute must return the <a href="#timed-track-cue-line-position">timed track cue line position</a>
-  of the <a href="#timed-track-cue">timed track cue</a> that the
-  <code><a href="#timedtrackcue">TimedTrackCue</a></code> object represents, if that value is
-  numeric. Otherwise, the value is the special value <a href="#timed-track-cue-automatic-line-position" title="timed track cue automatic line position">auto</a>; if the
-  <a href="#timed-track-cue-snap-to-lines-flag">timed track cue snap-to-lines flag</a> of the <a href="#timed-track-cue">timed
-  track cue</a> that the <code><a href="#timedtrackcue">TimedTrackCue</a></code> object
-  represents is not set, the attribute must return the value 100;
-  otherwise, it must return the value returned by the following
-  algorithm:</p>
-
-  <ol><li><p>Let <var title="">cue</var> be the <a href="#timed-track-cue">timed track
-   cue</a> that the <code><a href="#timedtrackcue">TimedTrackCue</a></code> object
-   represents.</p></li>
-
-   <li><p>If <var title="">cue</var> is not associated with a
-   <a href="#timed-track">timed track</a>, return &#x2212;1 and abort these
-   steps.</p></li>
-
-   <li><p>Let <var title="">track</var> be the <a href="#timed-track">timed
-   track</a> that the <var title="">cue</var> is associated
-   with.</p></li>
-
-   <li><p>Let <var title="">n</var> be the number of <a href="#timed-track" title="timed track">timed tracks</a> whose <a href="#timed-track-mode">timed track
-   mode</a> is <a href="#timed-track-showing" title="timed track showing">showing</a> and
-   that are in the <a href="#media-element">media element</a>'s <a href="#list-of-timed-tracks">list of timed
-   tracks</a> before <var title="">track</var>.</p></li>
-
-   <li><p>Return <var title="">n</var>.</p></li>
-
-  </ol><p>The <dfn id="dom-timedtrackcue-textposition" title="dom-TimedTrackCue-textPosition"><code>textPosition</code></dfn>
-  attribute must return the <a href="#timed-track-cue-text-position">timed track cue text position</a>
-  of the <a href="#timed-track-cue">timed track cue</a> that the
-  <code><a href="#timedtrackcue">TimedTrackCue</a></code> object represents.</p>
-
-  <p>The <dfn id="dom-timedtrackcue-size" title="dom-TimedTrackCue-size"><code>size</code></dfn>
-  attribute must return the <a href="#timed-track-cue-size">timed track cue size</a> of the
-  <a href="#timed-track-cue">timed track cue</a> that the <code><a href="#timedtrackcue">TimedTrackCue</a></code>
-  object represents.</p>
-
-  <p>The <dfn id="dom-timedtrackcue-alignment" title="dom-TimedTrackCue-alignment"><code>alignment</code></dfn>
-  attribute must return the <a href="#timed-track-cue-alignment">timed track cue alignment</a> of
-  the <a href="#timed-track-cue">timed track cue</a> that the <code><a href="#timedtrackcue">TimedTrackCue</a></code>
-  object represents.</p>
 
   <p>The <dfn id="dom-timedtrackcue-voice" title="dom-TimedTrackCue-voice"><code>voice</code></dfn>
   attribute must return the <a href="#timed-track-cue-voice-identifier">timed track cue voice
@@ -4684,13 +4394,12 @@
   method must convert the <a href="#timed-track-cue-text">timed track cue text</a> to a
   <code><a href="infrastructure.html#documentfragment">DocumentFragment</a></code> for the <a href="#media-element">media element</a>'s
   <code><a href="infrastructure.html#document">Document</a></code>, using the appropriate rules for doing
-  so. (For example, for <span>WebSRT</span>, those rules are the
-  <span>WebSRT cue text parsing rules</span> and the <span>WebSRT cue
-  text DOM construction rules</span>.)</p>
+  so.
+  </p>
 
   </div><div class="impl">
 
-  <h6 id="cue-events"><span class="secno">4.8.10.10.6 </span>Event definitions</h6>
+  <h6 id="cue-events"><span class="secno">4.8.10.10.5 </span>Event definitions</h6>
 
   <p>The following are the <a href="webappapis.html#event-handlers">event handlers</a> that must be
   supported, as IDL attributes, by all objects implementing the

Index: browsers.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/browsers.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- browsers.html	30 Nov 2010 01:49:47 -0000	1.3
+++ browsers.html	3 Dec 2010 07:23:29 -0000	1.4
@@ -438,26 +438,31 @@
 
   </div><h4 id="nested-browsing-contexts"><span class="secno">5.1.1 </span>Nested browsing contexts</h4><p>Certain elements (for example, <code><a href="the-iframe-element.html#the-iframe-element">iframe</a></code> elements) can
   instantiate further <a href="#browsing-context" title="browsing context">browsing
-  contexts</a>. These are called <dfn id="nested-browsing-context" title="nested browsing&#10;  context">nested browsing contexts</dfn>. If a browsing context <var title="">P</var> has an element <var title="">E</var> in one of its
-  <code><a href="infrastructure.html#document">Document</a></code>s <var title="">D</var> that nests another
-  browsing context <var title="">C</var> inside it, then <var title="">P</var> is said to be the <dfn id="parent-browsing-context">parent browsing
-  context</dfn> of <var title="">C</var>, <var title="">C</var> is
-  said to be a <dfn id="child-browsing-context">child browsing context</dfn> of <var title="">P</var>, <var title="">C</var> is said to be <dfn id="browsing-context-nested-through" title="browsing context nested through">nested through</dfn> <var title="">D</var>, and <var title="">E</var> is said to be the
-  <dfn id="browsing-context-container">browsing context container</dfn> of <var title="">C</var>.</p><p>A browsing context <var title="">A</var> is said to be an
-  ancestor of a browsing context <var title="">B</var> if there exists
-  a browsing context <var title="">A'</var> that is a <a href="#child-browsing-context">child
-  browsing context</a> of <var title="">A</var> and that is itself
-  an ancestor of <var title="">B</var>, or if there is a browsing
-  context <var title="">P</var> that is a <a href="#child-browsing-context">child browsing
-  context</a> of <var title="">A</var> and that is the <a href="#parent-browsing-context">parent
-  browsing context</a> of <var title="">B</var>.</p><p>The browsing context with no <a href="#parent-browsing-context">parent browsing context</a>
-  is the <dfn id="top-level-browsing-context">top-level browsing context</dfn> of all the browsing
-  contexts <a href="#nested-browsing-context" title="nested browsing context">nested</a> within
-  it (either directly or indirectly through other nested browsing
-  contexts).</p><p>The transitive closure of <a href="#parent-browsing-context" title="parent browsing&#10;  context">parent browsing contexts</a> for a <a href="#nested-browsing-context">nested browsing
-  context</a> gives the list of <dfn id="ancestor-browsing-context" title="ancestor browsing&#10;  context">ancestor browsing contexts</dfn>.</p><p>The <dfn id="list-of-the-descendant-browsing-contexts">list of the descendant browsing contexts</dfn> of a
-  <code><a href="infrastructure.html#document">Document</a></code> <var title="">d</var> is the list returned by
-  the following algorithm:</p><ol><li><p>Let <var title="">list</var> be an empty list.</p></li>
+  contexts</a>. These are called <dfn id="nested-browsing-context" title="nested browsing&#10;  context">nested browsing contexts</dfn>. If a browsing context <var title="">P</var> has a <code><a href="infrastructure.html#document">Document</a></code>s <var title="">D</var>
+  with an element <var title="">E</var> that nests another browsing
+  context <var title="">C</var> inside it, then <var title="">C</var>
+  is said to be <dfn id="browsing-context-nested-through" title="browsing context nested through">nested
+  through</dfn> <var title="">D</var>, and <var title="">E</var> is
+  said to be the <dfn id="browsing-context-container">browsing context container</dfn> of <var title="">C</var>. If the <a href="#browsing-context-container">browsing context container</a>
+  element <var title="">E</var> is <a href="infrastructure.html#in-a-document" title="in a&#10;  Document">in</a> the <code><a href="infrastructure.html#document">Document</a></code> <var title="">D</var>,
+  then <var title="">P</var> is said to be the <dfn id="parent-browsing-context">parent browsing
+  context</dfn> of <var title="">C</var> and <var title="">C</var> is
+  said to be a <dfn id="child-browsing-context">child browsing context</dfn> of <var title="">P</var>. Otherwise, the <a href="#nested-browsing-context">nested browsing
+  context</a> <var title="">C</var> has no <a href="#parent-browsing-context">parent browsing
+  context</a>.</p><p>A browsing context <var title="">A</var> is said to be an <dfn id="ancestor-browsing-context" title="ancestor browsing context">ancestor</dfn> of a browsing
+  context <var title="">B</var> if there exists a browsing context
+  <var title="">A'</var> that is a <a href="#child-browsing-context">child browsing context</a>
+  of <var title="">A</var> and that is itself an <a href="#ancestor-browsing-context" title="ancestor&#10;  browsing context">ancestor</a> of <var title="">B</var>, or if
+  there is a browsing context <var title="">P</var> that is a
+  <a href="#child-browsing-context">child browsing context</a> of <var title="">A</var> and
+  that is the <a href="#parent-browsing-context">parent browsing context</a> of <var title="">B</var>.</p><p>A browsing context that is not a <a href="#nested-browsing-context">nested browsing
+  context</a> has no <a href="#parent-browsing-context">parent browsing context</a>, and is
+  the <dfn id="top-level-browsing-context">top-level browsing context</dfn> of all the browsing
+  contexts for which it is an <a href="#ancestor-browsing-context">ancestor browsing
+  context</a>.</p><p>The transitive closure of <a href="#parent-browsing-context" title="parent browsing&#10;  context">parent browsing contexts</a> for a <a href="#nested-browsing-context">nested browsing
+  context</a> gives the list of <a href="#ancestor-browsing-context" title="ancestor browsing&#10;  context">ancestor browsing contexts</a>.</p><p>The <dfn id="list-of-the-descendant-browsing-contexts">list of the descendant browsing contexts</dfn> of a
+  <code><a href="infrastructure.html#document">Document</a></code> <var title="">d</var> is the (ordered) list
+  returned by the following algorithm:</p><ol><li><p>Let <var title="">list</var> be an empty list.</p></li>
 
    <li><p>For each <a href="#child-browsing-context">child browsing context</a> of <var title="">d</var> that is <a href="#browsing-context-nested-through" title="browsing context nested&#10;   through">nested through</a> an element that is <a href="infrastructure.html#in-a-document" title="in a&#10;   document">in the <code>Document</code></a> <var title="">d</var>, in the <a href="infrastructure.html#tree-order">tree order</a> of the elements
    nesting those <a href="#browsing-context" title="browsing context">browsing
@@ -468,18 +473,33 @@
 
    <li><p>Return the constructed <var title="">list</var>.</p></li>
 
-  </ol><hr/><p>A <code><a href="infrastructure.html#document">Document</a></code> is said to be <dfn id="fully-active">fully active</dfn>
+  </ol><p>A <code><a href="infrastructure.html#document">Document</a></code> is said to be <dfn id="fully-active">fully active</dfn>
   when it is the <a href="#active-document">active document</a> of its <a href="#browsing-context">browsing
   context</a>, and either its browsing context is a <a href="#top-level-browsing-context">top-level
-  browsing context</a>, or the <code><a href="infrastructure.html#document">Document</a></code> <a href="#browsing-context-nested-through" title="browsing context nested through">through which</a> that
-  browsing context is <a href="#nested-browsing-context" title="nested browsing&#10;  context">nested</a> is itself <a href="#fully-active">fully active</a>.</p><p>Because they are nested through an element, <a href="#child-browsing-context" title="child&#10;  browsing context">child browsing contexts</a> are always tied to
+  browsing context</a>, or it has a <a href="#parent-browsing-context">parent browsing
+  context</a> and the <code><a href="infrastructure.html#document">Document</a></code> <a href="#browsing-context-nested-through" title="browsing&#10;  context nested through">through which</a> it is <a href="#nested-browsing-context" title="nested browsing context">nested</a> is itself <a href="#fully-active">fully
+  active</a>.</p><p>Because they are nested through an element, <a href="#child-browsing-context" title="child&#10;  browsing context">child browsing contexts</a> are always tied to
   a specific <code><a href="infrastructure.html#document">Document</a></code> in their <a href="#parent-browsing-context">parent browsing
   context</a>. User agents must not allow the user to interact with
   <a href="#child-browsing-context" title="child browsing context">child browsing contexts</a>
   of elements that are in <code><a href="infrastructure.html#document">Document</a></code>s that are not
   themselves <a href="#fully-active">fully active</a>.</p><p>A <a href="#nested-browsing-context">nested browsing context</a> can have a <a href="the-iframe-element.html#seamless-browsing-context-flag">seamless
   browsing context flag</a> set, if it is embedded through an
-  <code><a href="the-iframe-element.html#the-iframe-element">iframe</a></code> element with a <code title="attr-iframe-seamless"><a href="the-iframe-element.html#attr-iframe-seamless">seamless</a></code> attribute.</p><h5 id="navigating-nested-browsing-contexts-in-the-dom"><span class="secno">5.1.1.1 </span>Navigating nested browsing contexts in the DOM</h5><dl class="domintro"><dt><var title="">window</var> . <code title="dom-top"><a href="#dom-top">top</a></code></dt>
+  <code><a href="the-iframe-element.html#the-iframe-element">iframe</a></code> element with a <code title="attr-iframe-seamless"><a href="the-iframe-element.html#attr-iframe-seamless">seamless</a></code> attribute.</p><p class="note">A <a href="#nested-browsing-context">nested browsing context</a> can in some
+  cases be taken out of its <a href="#parent-browsing-context">parent browsing context</a> (e.g.
+  if an <code><a href="the-iframe-element.html#the-iframe-element">iframe</a></code> element is removed from its
+  <code><a href="infrastructure.html#document">Document</a></code>). In such a situation, the <a href="#nested-browsing-context">nested
+  browsing context</a> has no <a href="#parent-browsing-context">parent browsing context</a>,
+  but it still has the same <a href="#browsing-context-container">browsing context container</a>
+  and is still <a href="#browsing-context-nested-through" title="browsing context nested through">nested
+  through</a> that element's <code><a href="infrastructure.html#document">Document</a></code>. Such a
+  <a href="#nested-browsing-context">nested browsing context</a> is <em>not</em> a
+  <a href="#top-level-browsing-context">top-level browsing context</a>, and cannot contain
+  <code><a href="infrastructure.html#document">Document</a></code>s that are <a href="#fully-active">fully active</a>.
+  Furthermore, if a <a href="#browsing-context-container">browsing context container</a> (such as
+  an <code><a href="the-iframe-element.html#the-iframe-element">iframe</a></code>) is moved to another <code><a href="infrastructure.html#document">Document</a></code>,
+  then the <a href="#parent-browsing-context">parent browsing context</a> of its <a href="#nested-browsing-context">nested
+  browsing context</a> will change.</p><h5 id="navigating-nested-browsing-contexts-in-the-dom"><span class="secno">5.1.1.1 </span>Navigating nested browsing contexts in the DOM</h5><dl class="domintro"><dt><var title="">window</var> . <code title="dom-top"><a href="#dom-top">top</a></code></dt>
 
    <dd>
 

Index: offline.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/offline.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- offline.html	30 Nov 2010 01:49:49 -0000	1.3
+++ offline.html	3 Dec 2010 07:23:30 -0000	1.4
@@ -1883,8 +1883,8 @@
   target <code><a href="#applicationcache">ApplicationCache</a></code> object <var title="">target</var>, the user agent must run the appropriate steps
   from the following list:</p>
 
-  <dl><dt>If <var title="">target</var>'s <code><a href="infrastructure.html#document">Document</a></code> has
-   <a href="the-end.html#completely-loaded">completely loaded</a></dt>
+  <dl><dt>If <var title="">target</var>'s <code><a href="infrastructure.html#document">Document</a></code> is
+   <a href="the-end.html#ready-for-post-load-tasks">ready for post-load tasks</a></dt>
 
    <dd><p><a href="webappapis.html#queue-a-task" title="queue a task">Queue</a> the task <var title="">task</var>.</p></dd>
 

Index: toc-status.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/toc-status.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- toc-status.html	30 Nov 2010 01:49:49 -0000	1.3
+++ toc-status.html	3 Dec 2010 07:23:30 -0000	1.4
@@ -499,11 +499,8 @@
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=sourcing-in-band-timed-tracks" class="status ADD">ADD</a> <a href="../spec/#sourcing-in-band-timed-tracks">4.8.10.10.2 Sourcing in-band timed tracks</a> <span class="id">(sourcing-in-band-timed-tracks)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=sourcing-out-of-band-timed-tracks" class="status ADD">ADD</a> <a href="../spec/#sourcing-out-of-band-timed-tracks">4.8.10.10.3 Sourcing out-of-band timed
 tracks</a> <span class="id">(sourcing-out-of-band-timed-tracks)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=guidelines-for-exposing-cues-in-various-formats-as-timed-track-cues" class="status ADD">ADD</a> <a href="../spec/#guidelines-for-exposing-cues-in-various-formats-as-timed-track-cues">
-4.8.10.10.4 Guidelines for exposing cues
-in various formats as timed track cues</a> <span class="id">(guidelines-for-exposing-cues-in-various-formats-as-timed-track-cues)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=timed-track-api" class="status ADD">ADD</a> <a href="../spec/#timed-track-api">4.8.10.10.5 Timed track API</a> <span class="id">(timed-track-api)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=cue-events" class="status ADD">ADD</a> <a href="../spec/#cue-events">4.8.10.10.6
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=timed-track-api" class="status ADD">ADD</a> <a href="../spec/#timed-track-api">4.8.10.10.4 Timed track API</a> <span class="id">(timed-track-api)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=cue-events" class="status ADD">ADD</a> <a href="../spec/#cue-events">4.8.10.10.5
 Event definitions</a> <span class="id">(cue-events)</span></li>
 </ol></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=user-interface" class="status LC">LC</a> <a href="../spec/#user-interface">4.8.10.11

Index: references.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/references.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- references.html	30 Nov 2010 01:49:49 -0000	1.3
+++ references.html	3 Dec 2010 07:23:30 -0000	1.4
@@ -487,7 +487,8 @@
    Interface Module</a></cite>, T. &#xC7;elik. W3C.</dd>
 
    <dt id="refsCSSVALUES">[CSSVALUES]</dt>
-   <dd><cite><a href="http://dev.w3.org/csswg/css3-values/">CSS3 Values and Units</a></cite>, H. Lie, C. Lilley. W3C.</dd>
+   <dd><cite><a href="http://dev.w3.org/csswg/css3-values/">CSS3
+   Values and Units</a></cite>, H. Lie, C. Lilley. W3C.</dd>
 
    <dt id="refsDOMCORE">[DOMCORE]</dt>
    <dd><cite><a href="http://www.w3.org/TR/DOM-Level-3-Core/">Document
@@ -721,6 +722,10 @@
    <dd><cite><a href="http://tools.ietf.org/html/rfc2388">Returning Values from
    Forms: multipart/form-data</a></cite>, L. Masinter. IETF.</dd>
 
+   <dt id="refsRFC2397">[RFC2397]</dt>
+   <dd><cite><a href="http://tools.ietf.org/html/rfc2397">The "data"
+   URL scheme</a></cite>, L. Masinter. IETF.</dd>
+
    <dt id="refsRFC2425">[RFC2425]</dt>
    <dd><cite><a href="http://tools.ietf.org/html/rfc2425">A MIME
    Content-Type for Directory Information</a></cite>, T. Howes,

Index: semantics.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/semantics.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- semantics.html	30 Nov 2010 01:49:49 -0000	1.3
+++ semantics.html	3 Dec 2010 07:23:30 -0000	1.4
@@ -1233,7 +1233,7 @@
      </td><td><code title="">refresh</code>
      </td><td>
     </td></tr><tr class="impl"><td><a href="#attr-meta-http-equiv-set-cookie" title="attr-meta-http-equiv-set-cookie">Cookie setter</a>
-     </td><td><code title="">Set-Cookie</code>
+     </td><td><code title="">set-cookie</code>
      </td><td>Non-conforming
   </td></tr></tbody></table><!--
 DATA: According to Henri's validator stats, here are common

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/spec.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- spec.html	30 Nov 2010 01:49:49 -0000	1.3
+++ spec.html	3 Dec 2010 07:23:30 -0000	1.4
@@ -384,7 +384,7 @@
     <a href="Overview.html">single page HTML</a>,
     <a href="spec.html">multipage HTML</a>,
     <a href="author/">web developer edition</a>.
-This is revision 1.4552.
+This is revision 1.4566.
    </p> 
      <p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a>
    &#xA9; 2010 <a href="http://www.w3.org/"><abbr title="World Wide&#10;   Web Consortium">W3C</abbr></a><sup>&#xAE;</sup> (<a href="http://www.csail.mit.edu/"><abbr title="Massachusetts&#10;   Institute of Technology">MIT</abbr></a>, <a href="http://www.ercim.org/"><abbr title="European Research&#10;   Consortium for Informatics and Mathematics">ERCIM</abbr></a>, <a href="http://www.keio.ac.jp/">Keio</a>), All Rights Reserved. W3C
@@ -775,10 +775,8 @@
         <ol><li><a href="video.html#timed-track-model"><span class="secno">4.8.10.10.1 </span>Timed track model</a></li>
          <li><a href="video.html#sourcing-in-band-timed-tracks"><span class="secno">4.8.10.10.2 </span>Sourcing in-band timed tracks</a></li>
          <li><a href="video.html#sourcing-out-of-band-timed-tracks"><span class="secno">4.8.10.10.3 </span>Sourcing out-of-band timed tracks</a></li>
-         <li><a href="video.html#guidelines-for-exposing-cues-in-various-formats-as-timed-track-cues"><span class="secno">4.8.10.10.4 </span>Guidelines for exposing cues in various formats as
-  timed track cues</a></li>
-         <li><a href="video.html#timed-track-api"><span class="secno">4.8.10.10.5 </span>Timed track API</a></li>
-         <li><a href="video.html#cue-events"><span class="secno">4.8.10.10.6 </span>Event definitions</a></li></ol></li>
+         <li><a href="video.html#timed-track-api"><span class="secno">4.8.10.10.4 </span>Timed track API</a></li>
+         <li><a href="video.html#cue-events"><span class="secno">4.8.10.10.5 </span>Event definitions</a></li></ol></li>
        <li><a href="video.html#user-interface"><span class="secno">4.8.10.11 </span>User interface</a></li>
        <li><a href="video.html#time-ranges"><span class="secno">4.8.10.12 </span>Time ranges</a></li>
        <li><a href="video.html#mediaevents"><span class="secno">4.8.10.13 </span>Event summary</a></li>

Index: acknowledgements.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/acknowledgements.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- acknowledgements.html	30 Nov 2010 01:49:47 -0000	1.3
+++ acknowledgements.html	3 Dec 2010 07:23:29 -0000	1.4
@@ -714,6 +714,7 @@
   Martin Atkins,
   Martin D&#xFC;rst,
   Martin Honnen,
+  Martin Janecke,
   Martin Kutschker,
   Martin Nilsson,
   Martin Thomson,
@@ -781,6 +782,7 @@
   Paul Norman,
   Per-Erik Brodin,
   Perry Smith,
+  Peter Beverloo,
   Peter Karlsson,
   Peter Kasting,
   Peter Stark,
Received on Friday, 3 December 2010 07:24:10 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Friday, 3 December 2010 07:25:38 GMT