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

html5/markup/html5-spec Overview.html,1.6,1.7 acknowledgements.html,1.5,1.6 apis-in-html-documents.html,1.4,1.5 association-of-controls-and-forms.html,1.5,1.6 content-models.html,1.4,1.5 dnd.html,1.4,1.5 dom.html,1.4,1.5 history.html,1.5,1.6 iana.html,1.4,1.5 links.html,1.4,1.5 origin-0.html,1.5,1.6 rendering.html,1.5,1.6 spec.html,1.5,1.6 syntax.html,1.4,1.5 the-button-element.html,1.4,1.5 the-end.html,1.5,1.6 tokenization.html,1.4,1.5 urls.html,1.4,1.5 video.html,1.5,1.6 webappapis.html,1.4,1.5

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Mon, 13 Dec 2010 08:06:48 +0000
To: public-html-commits@w3.org
Message-Id: <E1PS3Qm-0006ly-Cf@lionel-hutz.w3.org>
Update of /sources/public/html5/markup/html5-spec
In directory hutz:/tmp/cvs-serv25824/html5-spec

Modified Files:
	Overview.html acknowledgements.html 
	apis-in-html-documents.html 
	association-of-controls-and-forms.html content-models.html 
	dnd.html dom.html history.html iana.html links.html 
	origin-0.html rendering.html spec.html syntax.html 
	the-button-element.html the-end.html tokenization.html 
	urls.html video.html webappapis.html 
Log Message:
doc video/@audio + input button requires value att


Index: Overview.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/Overview.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Overview.html	7 Dec 2010 09:46:04 -0000	1.6
+++ Overview.html	13 Dec 2010 08:06:43 -0000	1.7
@@ -5148,15 +5148,11 @@
      context</a>'s <a href="#browsing-context-container">browsing context container</a>'s
      <code><a href="#document">Document</a></code> instead.</p></li>
 
-     <li><p>If there is no <code><a href="#the-base-element">base</a></code> element that is both a
-     child of <a href="#the-head-element">the <code>head</code> element</a> and has an
-     <code title="attr-base-href"><a href="#attr-base-href">href</a></code> attribute, then the
+     <li><p>If there is no <code><a href="#the-base-element">base</a></code> element that has an <code title="attr-base-href"><a href="#attr-base-href">href</a></code> attribute, then the
      <a href="#document-base-url">document base URL</a> is <var title="">fallback base
-     url</var>.</p></li>
-
-     <li><p>Otherwise, let <var title="">url</var> be the value of the
-     <code title="attr-base-href"><a href="#attr-base-href">href</a></code> attribute of the first
-     such element.</p></li>
+     url</var>. Otherwise, let <var title="">url</var> be the value of
+     the <code title="attr-base-href"><a href="#attr-base-href">href</a></code> attribute of the
+     first such element.</p></li>
 
      <li><p><a href="#resolve-a-url" title="resolve a URL">Resolve</a> <var title="">url</var> relative to <var title="">fallback base
      url</var> (thus, the <code><a href="#the-base-element">base</a></code> <code title="attr-base-href"><a href="#attr-base-href">href</a></code> attribute isn't affected by
@@ -6976,7 +6972,22 @@
   documents</dfn> unless they are flagged as being <dfn id="html-documents">HTML
   documents</dfn> when they are created. Whether a document is an
   <a href="#html-documents" title="HTML documents">HTML document</a> or an <a href="#xml-documents" title="XML documents">XML document</a> affects the behavior of
-  certain APIs and the case-sensitivity of some selectors.</p><h4 id="documents-in-the-dom"><span class="secno">3.1.1 </span>Documents in the DOM</h4><p>All <code><a href="#document">Document</a></code> objects (in user agents implementing
+  certain APIs and the case-sensitivity of some selectors.</p><p>Each <code><a href="#document">Document</a></code> object has a <dfn id="reload-override-flag">reload override
+  flag</dfn> that is originally unset. The flag is set by the <code title="dom-document-open"><a href="#dom-document-open">document.open()</a></code> and <code title="dom-document-open"><a href="#dom-document-open">document.write()</a></code> methods in certain
+  situations. When the flag is set, the <code><a href="#document">Document</a></code> also has
+  a <dfn id="reload-override-buffer">reload override buffer</dfn> which is a Unicode string that
+  is used as the source of the document when it is reloaded.</p><p>When the user agent is to perform <dfn id="an-overridden-reload">an overridden
+  reload</dfn>, it must act as follows:</p><ol><li><p>Let <var title="">source</var> be the value of the
+   <a href="#browsing-context">browsing context</a>'s <a href="#active-document">active document</a>'s
+   <a href="#reload-override-buffer">reload override buffer</a>.</p></li>
+
+   <li><p><a href="#navigate">Navigate</a><!--DONAV reload after d.open()--> the
+   <a href="#browsing-context">browsing context</a> to a resource whose source is <var title="">source</var>. When the <a href="#navigate">navigate</a> algorithm
+   creates a <code><a href="#document">Document</a></code> object for this purpose, set that
+   <code><a href="#document">Document</a></code>'s <a href="#reload-override-flag">reload override flag</a> and set
+   its <a href="#reload-override-buffer">reload override buffer</a> to <var title="">source</var>.</p></li>
+
+  </ol><h4 id="documents-in-the-dom"><span class="secno">3.1.1 </span>Documents in the DOM</h4><p>All <code><a href="#document">Document</a></code> objects (in user agents implementing
   this specification) <span class="impl">must</span> also implement
   the <code><a href="#htmldocument">HTMLDocument</a></code> interface, available using
   binding-specific methods. (This is the case whether or not the
@@ -7162,16 +7173,19 @@
   attribute represents the cookies of the resource from which the
   <code><a href="#document">Document</a></code> was created.</p>
 
-  <p>Some <code><a href="#document">Document</a></code> objects are <dfn id="cookie-free-document-object" title="cookie-free&#10;  Document object">cookie-free <code>Document</code>
-  objects</dfn>. Any <code><a href="#document">Document</a></code> object created by the <code title="">createDocument()</code> or <code title="dom-DOMHTMLImplementation-createHTMLDocument"><a href="#dom-domhtmlimplementation-createhtmldocument">createHTMLDocument()</a></code>
-  factory methods is a <a href="#cookie-free-document-object">cookie-free <code>Document</code>
-  object</a>. Any <code><a href="#document">Document</a></code> whose <a href="#the-document-s-address" title="the&#10;  document's address">address</a> does not use a server-based
-  naming authority is a <a href="#cookie-free-document-object">cookie-free <code>Document</code>
-  object</a>. Other specifications can also define
-  <code><a href="#document">Document</a></code> objects as being <a href="#cookie-free-document-object" title="cookie-free&#10;  Document object">cookie-free <code>Document</code>
-  objects</a>.</p>
+  <p>A <code><a href="#document">Document</a></code> object that falls into one of the
+  following conditions is a <dfn id="cookie-free-document-object">cookie-free <code>Document</code>
+  object</dfn>:</p>
 
-  <p id="sandboxCookies">On getting, if the document is a
+  <ul><li>A <code><a href="#document">Document</a></code> that has no <a href="#browsing-context">browsing
+   context</a>.</li>
+
+   <li>A <code><a href="#document">Document</a></code> whose <a href="#the-document-s-address" title="the document's&#10;   address">address</a> does not use a server-based naming
+   authority.</li>
+
+  </ul><!--Other specifications can also define <code>Document</code>
+  objects as being <span title="cookie-free Document
+  object">cookie-free <code>Document</code> objects</span>.--><p id="sandboxCookies">On getting, if the document is a
   <a href="#cookie-free-document-object">cookie-free <code>Document</code> object</a>, then the user
   agent must return the empty string. Otherwise, if the
   <code><a href="#document">Document</a></code>'s <a href="#origin">origin</a> is not a
@@ -9636,7 +9650,7 @@
   overridden. The following table lists these elements<span class="impl"> and their <span>implicit ARIA semantics</span></span>,
   along with the restrictions that apply to those elements. Each
   language feature (element or attribute) in a cell in the first
-  column implies, unless otherwise overriden, the ARIA semantic (role,
+  column implies, unless otherwise overridden, the ARIA semantic (role,
   state, or property) given in the cell in the second column of the
   same row, but this semantic may be overridden under the conditions
   listed in the cell in the third column of that row. In addition, any
@@ -10085,6 +10099,10 @@
    <li><p>Change the <a href="#document-s-character-encoding">document's character encoding</a> to
    UTF-8.</p></li>
 
+   <li><p>Set the <code><a href="#document">Document</a></code> object's <a href="#reload-override-flag">reload override
+   flag</a> and set the <code><a href="#document">Document</a></code>'s <a href="#reload-override-buffer">reload
+   override buffer</a> to the empty string.</p></li>
+
    <li><p>Change <a href="#the-document-s-address">the document's address</a> to the
    <a href="#entry-script">entry script</a>'s <a href="#script-s-document" title="script's&#10;   document">document</a>'s <a href="#the-document-s-address" title="the document's&#10;   address">address</a>.</p></li>
 
@@ -10263,10 +10281,10 @@
 
    <li>
 
-    <p>If the <a href="#insertion-point">insertion point</a> is undefined, the <code title="dom-document-open"><a href="#dom-document-open">open()</a></code> method must be called
-    (with no arguments) on the <code title="Document"><a href="#document">document</a></code>
-    object. If the user <a href="#refused-to-allow-the-document-to-be-unloaded">refused to allow the document to be
-    unloaded</a>, then these steps must be aborted. Otherwise, the
+    <p>If the <a href="#insertion-point">insertion point</a> is undefined, call the
+    <code title="dom-document-open"><a href="#dom-document-open">open()</a></code> method on the <code title="Document"><a href="#document">document</a></code> object (with no arguments). If
+    the user <a href="#refused-to-allow-the-document-to-be-unloaded">refused to allow the document to be
+    unloaded</a>, then abort these steps. Otherwise, the
     <a href="#insertion-point">insertion point</a> will point at just before the end of
     the (empty) <a href="#the-input-stream">input stream</a>.</p>
 
@@ -10274,28 +10292,30 @@
 
    <li>
 
-    <p>The string consisting of the concatenation of all the arguments
-    to the method must be inserted into the <a href="#the-input-stream">input stream</a>
-    just before the <a href="#insertion-point">insertion point</a>.</p>
+    <p>Insert the string consisting of the concatenation of all the
+    arguments to the method into the <a href="#the-input-stream">input stream</a> just
+    before the <a href="#insertion-point">insertion point</a>.</p>
 
    </li>
 
    <li>
 
-    <p>If there is a <a href="#pending-parsing-blocking-script">pending parsing-blocking script</a>, then the
-    method must now return without further processing of the
-    <a href="#the-input-stream">input stream</a>.</p>
+    <p>If the <code><a href="#document">Document</a></code> object's <a href="#reload-override-flag">reload override
+    flag</a> is set, then append the string consisting of the
+    concatenation of all the arguments to the method to the
+    <code><a href="#document">Document</a></code>'s <a href="#reload-override-buffer">reload override buffer</a>.</p>
 
    </li>
 
    <li>
 
-    <p>Otherwise, the tokenizer must process the characters that were
-    inserted, one at a time, processing resulting tokens as they are
-    emitted, and stopping when the tokenizer reaches the insertion
-    point or when the processing of the tokenizer is aborted by the
-    tree construction stage (this can happen if a <code><a href="#script">script</a></code>
-    end tag token is emitted by the tokenizer).
+    <p>If there is no <a href="#pending-parsing-blocking-script">pending parsing-blocking script</a>,
+    have the tokenizer process the characters that were inserted, one
+    at a time, processing resulting tokens as they are emitted, and
+    stopping when the tokenizer reaches the insertion point or when
+    the processing of the tokenizer is aborted by the tree
+    construction stage (this can happen if a <code><a href="#script">script</a></code> end
+    tag token is emitted by the tokenizer).
 
     </p><p class="note">If the <code title="dom-document-write"><a href="#dom-document-write">document.write()</a></code> method was
     called from script executing inline (i.e. executing because the
@@ -10307,7 +10327,7 @@
 
    <li>
 
-    <p>Finally, the method must return.</p>
+    <p>Finally, return from the method.</p>
 
    </li>
 
@@ -23071,14 +23091,15 @@
 
     <p>If the <a href="#autoplaying-flag">autoplaying flag</a> is true, and the <code title="dom-media-paused"><a href="#dom-media-paused">paused</a></code> attribute is true, and the
     <a href="#media-element">media element</a> has an <code title="attr-media-autoplay"><a href="#attr-media-autoplay">autoplay</a></code> attribute specified,
-    and the <a href="#media-element">media element</a> is in a <code><a href="#document">Document</a></code>
-    whose <a href="#browsing-context">browsing context</a> did not have the
-    <a href="#sandboxed-automatic-features-browsing-context-flag">sandboxed automatic features browsing context flag</a>
-    set when the <code><a href="#document">Document</a></code> was created, then the user
-    agent may also set the <code title="dom-media-paused"><a href="#dom-media-paused">paused</a></code> attribute to false,
+    and the <a href="#media-element">media element</a>'s <code><a href="#document">Document</a></code>'s
+    <a href="#browsing-context">browsing context</a> did not have the <a href="#sandboxed-automatic-features-browsing-context-flag">sandboxed
+    automatic features browsing context flag</a> set when the
+    <code><a href="#document">Document</a></code> was created, then the user agent may also
+    set the <code title="dom-media-paused"><a href="#dom-media-paused">paused</a></code> attribute to
+    false, <a href="#queue-a-task">queue a task</a> to <a href="#fire-a-simple-event">fire a simple
+    event</a> named <code title="event-media-play"><a href="#event-media-play">play</a></code>, and
     <a href="#queue-a-task">queue a task</a> to <a href="#fire-a-simple-event">fire a simple event</a>
-    named <code title="event-media-play"><a href="#event-media-play">play</a></code>, and <a href="#queue-a-task">queue
-    a task</a> to <a href="#fire-a-simple-event">fire a simple event</a> named <code title="event-media-playing"><a href="#event-media-playing">playing</a></code>.</p>
+    named <code title="event-media-playing"><a href="#event-media-playing">playing</a></code>.</p>
 
     <p class="note">User agents are not required to autoplay, and it
     is suggested that user agents honor user preferences on the
@@ -36060,7 +36081,7 @@
   a list of the element's <code><a href="#the-label-element">label</a></code>s. The <code title="dom-fae-form"><a href="#dom-fae-form">form</a></code> IDL attribute is part of the
   element's forms API.</p>
 
-  </div><h4 id="the-meter-element"><span class="secno">4.10.17 </span>The <dfn><code>meter</code></dfn> element</h4><p class="XXX annotation"><span><a href="http://www.w3.org/html/wg/tracker/issues/97">ISSUE-97</a> (meter) blocks progress to Last Call</span></p><!-- Keep this after <progress> and NOT close to <time> --><dl class="element"><dt>Categories</dt>
+  </div><h4 id="the-meter-element"><span class="secno">4.10.17 </span>The <dfn><code>meter</code></dfn> element</h4><!-- Keep this after <progress> and NOT close to <time> --><dl class="element"><dt>Categories</dt>
    <dd><a href="#flow-content">Flow content</a>.</dd>
    <dd><a href="#phrasing-content">Phrasing content</a>.</dd>
    <dd><a href="#category-label" title="category-label">Labelable</a> <a href="#form-associated-element">form-associated element</a>.</dd>
@@ -36688,11 +36709,11 @@
   element is a <a href="#concept-submit-button" title="concept-submit-button">submit
   button</a> and has such an attribute; or the value of its
   <a href="#form-owner">form owner</a>'s <code title="attr-fs-target"><a href="#attr-fs-target">target</a></code>
-  attribute, if <em>it</em> has such an attribute; or, if one of the
-  child nodes of <a href="#the-head-element">the <code>head</code> element</a> is a
-  <code><a href="#the-base-element">base</a></code> element with a <code title="attr-base-target"><a href="#attr-base-target">target</a></code> attribute, then the value of
-  the <code title="attr-base-target"><a href="#attr-base-target">target</a></code> attribute of the
-  first such <code><a href="#the-base-element">base</a></code> element; or, if there is no such
+  attribute, if <em>it</em> has such an attribute; or, if the
+  <code><a href="#document">Document</a></code> contains a <code><a href="#the-base-element">base</a></code> element with a
+  <code title="attr-base-target"><a href="#attr-base-target">target</a></code> attribute, then the
+  value of the <code title="attr-base-target"><a href="#attr-base-target">target</a></code> attribute
+  of the first such <code><a href="#the-base-element">base</a></code> element; or, if there is no such
   element, the empty string.</p><!-- c.f. hyperlink following --><hr/><p>The <dfn id="attr-fs-novalidate" title="attr-fs-novalidate"><code>novalidate</code></dfn>
   and <dfn id="attr-fs-formnovalidate" title="attr-fs-formnovalidate"><code>formnovalidate</code></dfn>
   content attributes are <a href="#boolean-attribute" title="boolean attribute">boolean
@@ -39376,15 +39397,16 @@
   as the browsing context to be navigated.</p>
 
   <p>Otherwise, if the element is an <code><a href="#the-a-element">a</a></code> or
-  <code><a href="#the-area-element">area</a></code> element with no <code title="attr-hyperlink-target"><a href="#attr-hyperlink-target">target</a></code> attribute, but one of
-  the child nodes of <a href="#the-head-element">the <code>head</code> element</a> is a
-  <code><a href="#the-base-element">base</a></code> element with a <code title="attr-base-target"><a href="#attr-base-target">target</a></code> attribute, then the browsing
-  context that is navigated must be chosen by applying <a href="#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 the value of the <code title="attr-base-target"><a href="#attr-base-target">target</a></code> attribute of the first such
+  <code><a href="#the-area-element">area</a></code> element with no <code title="attr-hyperlink-target"><a href="#attr-hyperlink-target">target</a></code> attribute, but the
+  <code><a href="#document">Document</a></code> contains a <code><a href="#the-base-element">base</a></code> element with a
+  <code title="attr-base-target"><a href="#attr-base-target">target</a></code> attribute, then the
+  browsing context that is navigated must be chosen by applying
+  <a href="#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 the value of the <code title="attr-base-target"><a href="#attr-base-target">target</a></code> attribute of the first such
   <code><a href="#the-base-element">base</a></code> element as the browsing context name. If these
   rules result in the creation of a new <a href="#browsing-context">browsing context</a>,
   it must be navigated with <a href="#replacement-enabled">replacement enabled</a>.</p>
+  <!-- c.f. concept-fs-target -->
 
   <p>Otherwise, the browsing context that must be navigated is the
   same browsing context as the one which the element itself is in.</p>
@@ -42109,6 +42131,7 @@
 
    </dd>
 
+
    <dt>For scripts</dt>
 
    <dd>
@@ -42185,6 +42208,7 @@
 
    </dd>
 
+
    <dt>For <code><a href="#document">Document</a></code> objects and images</dt>
 
    <dd>
@@ -42201,13 +42225,6 @@
      assigned when the <code><a href="#document">Document</a></code> is created.</dd>
 
 
-     <dt>If a <code><a href="#document">Document</a></code> or image was returned by the
-     <code>XMLHttpRequest</code> API</dt>
-
-     <dd>The <a href="#origin">origin</a> is equal to the <span>XMLHttpRequest
-     origin</span> of the <code>XMLHttpRequest</code> object. <a href="#refsXHR">[XHR]</a></dd>
-
-
      <dt>If a <code><a href="#document">Document</a></code> or image was generated from a
      <a href="#javascript-protocol" title="javascript protocol"><code>javascript:</code>
      URL</a></dt>
@@ -42275,6 +42292,7 @@
 
    </dd>
 
+
    <dt>For <code><a href="#audio">audio</a></code> and <code><a href="#video">video</a></code> elements</dt>
 
    <dd>
@@ -42290,7 +42308,20 @@
 
    </dd>
 
-  </dl><p>The <dfn id="unicode-serialization-of-an-origin">Unicode serialization of an origin</dfn> is the string
+  </dl><p>Other specifications can override the above definitions by
+  themselves specifying the origin of a particular URL, script,
+  <code><a href="#document">Document</a></code>, or image.</p>
+
+  <!-- e.g.:
+
+    <p>The <span>origin</span> of a <code>Document</code> object
+    returned by the <code>XMLHttpRequest</code> API is equal to the
+    <span>XMLHttpRequest origin</span> of the
+    <code>XMLHttpRequest</code> object.</p>
+
+  -->
+
+  <hr/><p>The <dfn id="unicode-serialization-of-an-origin">Unicode serialization of an origin</dfn> is the string
   obtained by applying the following algorithm to the given
   <a href="#origin">origin</a>:</p>
 
@@ -43107,6 +43138,12 @@
    <code>iframe</code> attributes</a> of the <a href="#browsing-context">browsing
    context</a>'s <a href="#browsing-context-container">browsing context container</a>.</p></dd>
 
+   <dt>If the <a href="#browsing-context">browsing context</a>'s <a href="#active-document">active
+   document</a> has its <a href="#reload-override-flag">reload override
+   flag</a> set</dt>
+
+   <dd><p>Perform <a href="#an-overridden-reload">an overridden reload</a>.</p></dd>
+
    <dt>Otherwise</dt>
 
    <dd><p><a href="#navigate">Navigate</a><!--DONAV location.reload()--> the
@@ -43118,16 +43155,20 @@
 
    <!-- http://software.hixie.ch/utilities/js/live-dom-viewer/saved/141 -->
 
-  </dl><p>When a user requests that the current page be reloaded through a
-  user interface element, the user agent should
-  <a href="#navigate">navigate</a><!--DONAV user reload--> the <a href="#browsing-context">browsing
-  context</a> to the same resource as <code><a href="#document">Document</a></code>, with
-  <a href="#replacement-enabled">replacement enabled</a>. In the case of non-idempotent
-  methods (e.g. HTTP POST), the user agent should prompt the user to
-  confirm the operation first, since otherwise transactions (e.g.
-  purchases or database modifications) could be repeated. User agents
-  may allow the user to explicitly override any caches when
-  reloading.</p>
+  </dl><p>When a user requests that the current page of a <a href="#browsing-context">browsing
+  context</a> be reloaded through a user interface element, the
+  user agent should <a href="#navigate">navigate</a><!--DONAV user reload--> the
+  <a href="#browsing-context">browsing context</a> to the same resource as
+  <code><a href="#document">Document</a></code>, with <a href="#replacement-enabled">replacement enabled</a>. In the
+  case of non-idempotent methods (e.g. HTTP POST), the user agent
+  should prompt the user to confirm the operation first, since
+  otherwise transactions (e.g. purchases or database modifications)
+  could be repeated. User agents may allow the user to explicitly
+  override any caches when reloading. If <a href="#browsing-context">browsing
+  context</a>'s <a href="#active-document">active document</a>'s <a href="#reload-override-flag">reload
+  override flag</a> is set, then the user agent may instead perform
+  <a href="#an-overridden-reload">an overridden reload</a> rather than the navigation
+  described in this paragraph.</p>
 
   </div><p>The <code><a href="#location">Location</a></code> interface also has the complement of
   <a href="#url-decomposition-idl-attributes">URL decomposition IDL attributes</a>, <dfn id="dom-location-protocol" title="dom-location-protocol"><code>protocol</code></dfn>, <dfn id="dom-location-host" title="dom-location-host"><code>host</code></dfn>, <dfn id="dom-location-port" title="dom-location-port"><code>port</code></dfn>, <dfn id="dom-location-hostname" title="dom-location-hostname"><code>hostname</code></dfn>, <dfn id="dom-location-pathname" title="dom-location-pathname"><code>pathname</code></dfn>, <dfn id="dom-location-search" title="dom-location-search"><code>search</code></dfn>, and <dfn id="dom-location-hash" title="dom-location-hash"><code>hash</code></dfn>. <span class="impl">These must follow the rules given for <a href="#url-decomposition-idl-attributes">URL
@@ -46912,11 +46953,14 @@
    <code><a href="#document">Document</a></code>s are not <a href="#fully-active">fully active</a>. The user
    agent may pick any <a href="#task-queue">task queue</a>.</p></li>
 
+   <!-- warning! if you renumber these steps, make sure to update the
+   "spin the event loop" algorith below! -->
+
    <li><p>If the <a href="#storage-mutex">storage mutex</a> is now owned by the
    <a href="#event-loop">event loop</a>, release it so that it is once again
-   free.</p>
+   free.</p></li>
 
-   </li><li><p>Remove that task from its <a href="#task-queue">task queue</a>.</p></li>
+   <li><p>Remove that task from its <a href="#task-queue">task queue</a>.</p></li>
 
    <li><p>If any asynchronously-running algorithms are <dfn id="await-a-stable-state" title="await a stable state">awaiting a stable state</dfn>, then
    run their <dfn id="synchronous-section">synchronous section</dfn> and then resume running
@@ -46942,9 +46986,16 @@
   <ol><li><p>Let <var title="">task source</var> be the <a href="#task-source">task
    source</a> of the currently running <a href="#concept-task" title="concept-task">task</a>.</p></li>
 
-   <li><p>Stop the currently running <a href="#concept-task" title="concept-task">task</a>, allowing the <a href="#event-loop">event
-   loop</a> to resume, but continue these steps
-   asynchronously.</p></li>
+   <li>
+
+    <p>Stop the currently running <a href="#concept-task" title="concept-task">task</a>, allowing the <a href="#event-loop">event
+    loop</a> to resume, but continue these steps
+    asynchronously.</p>
+
+    <p class="note">This causes the <a href="#event-loop">event loop</a> to move on
+    to the second step of its processing model (defined above).</p>
+
+   </li>
 
    <li><p>Wait until the condition <var title="">goal</var> is
    met.</p></li>
@@ -46958,15 +47009,27 @@
 
   </ol><hr/><p>Some of the algorithms in this specification, for historical
   reasons, require the user agent to <dfn id="pause">pause</dfn> while running a
-  <a href="#concept-task" title="concept-task">task</a> until some condition has been
-  met. While a user agent has a paused <a href="#concept-task" title="concept-task">task</a>, the corresponding <a href="#event-loop">event
-  loop</a> must not run further <a href="#concept-task" title="concept-task">tasks</a>, and any script in the currently
-  running <a href="#concept-task" title="concept-task">task</a> must block. User
-  agents should remain responsive to user input while paused, however,
-  albeit in a reduced capacity since the <a href="#event-loop">event loop</a> will
-  not be doing anything.</p>
+  <a href="#concept-task" title="concept-task">task</a> until a condition <var title="">goal</var> is met. This means running the following
+  steps:</p>
 
-  <hr/><p>When a user agent is to <dfn id="obtain-the-storage-mutex">obtain the storage mutex</dfn> as
+  <ol><li><p>If any asynchronously-running algorithms are <a href="#await-a-stable-state" title="await a stable state">awaiting a stable state</a>, then
+   run their <a href="#synchronous-section">synchronous section</a> and then resume running
+   their asynchronous algorithm. (See the <a href="#event-loop">event loop</a>
+   processing model definition above for details.)</p>
+
+   </li><li><p>If necessary, update the rendering or user interface of any
+   <code><a href="#document">Document</a></code> or <a href="#browsing-context">browsing context</a> to reflect
+   the current state.</p></li>
+
+   <li><p>Wait until the condition <var title="">goal</var> is met.
+   While a user agent has a paused <a href="#concept-task" title="concept-task">task</a>, the corresponding <a href="#event-loop">event
+   loop</a> must not run further <a href="#concept-task" title="concept-task">tasks</a>, and any script in the currently
+   running <a href="#concept-task" title="concept-task">task</a> must block. User
+   agents should remain responsive to user input while paused,
+   however, albeit in a reduced capacity since the <a href="#event-loop">event
+   loop</a> will not be doing anything.</p></li>
+
+  </ol><hr/><p>When a user agent is to <dfn id="obtain-the-storage-mutex">obtain the storage mutex</dfn> as
   part of running a <a href="#concept-task" title="concept-task">task</a>, it must
   run through the following steps:</p>
 
@@ -52028,7 +52091,7 @@
   <h4 id="definitions-2"><span class="secno">7.8.1 </span>Definitions</h4>
 
   <p>The user agent must associate an <dfn id="undo-transaction-history">undo transaction
-  history</dfn> with each <code><a href="#htmldocument">HTMLDocument</a></code> object.</p>
+  history</dfn> with each <code><a href="#document">Document</a></code> object.</p>
 
   <p>The <a href="#undo-transaction-history">undo transaction history</a> is a list of
   entries. The entries are of two types: <a href="#dom-changes">DOM changes</a> and
@@ -52042,7 +52105,7 @@
    node.</li>
 
    <li>Changes to the DOM hierarchy of nodes that are descendants of
-   the <code><a href="#htmldocument">HTMLDocument</a></code> object (<code title="dom-Node-parentNode"><a href="#dom-node-parentnode">parentNode</a></code>, <code title="dom-Node-childNodes"><a href="#dom-node-childnodes">childNodes</a></code>).</li>
+   the <code><a href="#document">Document</a></code> object (<code title="dom-Node-parentNode"><a href="#dom-node-parentnode">parentNode</a></code>, <code title="dom-Node-childNodes"><a href="#dom-node-childnodes">childNodes</a></code>).</li>
 
    <li>Changes to internal state, such as a form control's <a href="#concept-fe-value" title="concept-fe-value">value</a> or <a href="#concept-input-checked-dirty-flag" title="concept-input-checked-dirty-flag">dirty checkedness
    flag</a>.</li>
@@ -52137,8 +52200,8 @@
   <p>The <dfn id="dom-undomanager" title="dom-undoManager"><code>undoManager</code></dfn>
   attribute of the <code><a href="#window">Window</a></code> interface must return the
   object implementing the <code><a href="#undomanager">UndoManager</a></code> interface for that
-  <code><a href="#window">Window</a></code> object's associated
-  <code><a href="#htmldocument">HTMLDocument</a></code> object.</p>
+  <code><a href="#window">Window</a></code> object's associated <code><a href="#document">Document</a></code>
+  object.</p>
 
   <p><code><a href="#undomanager">UndoManager</a></code> objects represent their document's
   <a href="#undo-transaction-history">undo transaction history</a>. Only <a href="#undo-object">undo object</a>
@@ -52898,6 +52961,7 @@
    <code><a href="#the-keygen-element">keygen</a></code>, <code><a href="#the-link-element">link</a></code>, <code><a href="#meta">meta</a></code>,
    <code><a href="#the-param-element">param</a></code>, <code><a href="#the-source-element">source</a></code>, <code><a href="#the-track-element">track</a></code>,
    <code><a href="#the-wbr-element">wbr</a></code></dd>
+   <!-- see also other places that say VOIDLIST -->
 
    <dt><dfn id="raw-text-elements">Raw text elements</dfn></dt>
 
@@ -59217,7 +59281,10 @@
        for this instance of the <a href="#html-parser">HTML parser</a>, such that
        the <a href="#event-loop">event loop</a> will not run <a href="#concept-task" title="concept-task">tasks</a> that invoke the <a href="#tokenization" title="tokenization">tokenizer</a>.</p></li>
 
-       <li><p><a href="#spin-the-event-loop">Spin the event loop</a> until the parser's
+       <li><p>If the parser's <code><a href="#document">Document</a></code> <a href="#has-a-style-sheet-that-is-blocking-scripts">has a style
+       sheet that is blocking scripts</a> or <var title="">the
+       script</var>'s <a href="#ready-to-be-parser-executed">"ready to be parser-executed"</a> flag
+       is not set: <a href="#spin-the-event-loop">spin the event loop</a> until the parser's
        <code><a href="#document">Document</a></code> <a href="#has-no-style-sheet-that-is-blocking-scripts">has no style sheet that is blocking
        scripts</a> and <var title="">the script</var>'s
        <a href="#ready-to-be-parser-executed">"ready to be parser-executed"</a> flag is
@@ -61161,14 +61228,15 @@
         <p>If <var title="">current node</var> is an
         <code><a href="#the-area-element">area</a></code>, <code><a href="#the-base-element">base</a></code>, <code><a href="#basefont">basefont</a></code>,
         <code><a href="#bgsound">bgsound</a></code>, <code><a href="#the-br-element">br</a></code>, <code><a href="#the-col-element">col</a></code>,
-        <code><a href="#the-embed-element">embed</a></code>, <code><a href="#frame">frame</a></code>, <code><a href="#the-hr-element">hr</a></code>,
-        <code><a href="#the-img-element">img</a></code>, <code><a href="#the-input-element">input</a></code>, <code><a href="#the-keygen-element">keygen</a></code>,
-        <code><a href="#the-link-element">link</a></code>, <code><a href="#meta">meta</a></code>, <code><a href="#the-param-element">param</a></code>, or
+        <code><a href="#the-command">command</a></code>, <code><a href="#the-embed-element">embed</a></code>, <code><a href="#frame">frame</a></code>,
+        <code><a href="#the-hr-element">hr</a></code>, <code><a href="#the-img-element">img</a></code>, <code><a href="#the-input-element">input</a></code>,
+        <code><a href="#the-keygen-element">keygen</a></code>, <code><a href="#the-link-element">link</a></code>, <code><a href="#meta">meta</a></code>,
+        <code><a href="#the-param-element">param</a></code>, <code><a href="#the-source-element">source</a></code>, <code><a href="#the-track-element">track</a></code> or
         <code><a href="#the-wbr-element">wbr</a></code> element, then continue on to the next child
-        node at this point.</p> <!-- also, i guess: image and isindex,
-        but we don't list those because we don't consider those
-        "elements", more "macros", and thus we should never serialize
-        them -->
+        node at this point.</p> <!-- VOIDLIST superset -->
+        <!-- also, i guess: image and isindex, but we don't list those
+        because we don't consider those "elements", more "macros", and
+        thus we should never serialize them -->
 
         <p>If <var title="">current node</var> is a <code><a href="#the-pre-element">pre</a></code>,
         <code><a href="#the-textarea-element">textarea</a></code>, or <code><a href="#listing">listing</a></code> element, append
@@ -61811,7 +61879,7 @@
   </ul><p class="note">Just being off-screen does not mean the element is
   not <a href="#being-rendered">being rendered</a>. The presence of the <code title="attr-hidden"><a href="#the-hidden-attribute">hidden</a></code> attribute normally means the
   element is not <a href="#being-rendered">being rendered</a>, though this might be
-  overriden by the style sheets.</p>
+  overridden by the style sheets.</p>
 
   </div><div class="impl">
 
@@ -66605,6 +66673,15 @@
     as <code><a href="#text-html-sandboxed">text/html-sandboxed</a></code> as regular
     <code><a href="#text-html">text/html</a></code> files, authors should avoid using the <code title="">.html</code> or <code title="">.htm</code> extensions for
     resources labeled as <code><a href="#text-html-sandboxed">text/html-sandboxed</a></code>.</p>
+    <p>Furthermore, since the <code><a href="#text-html-sandboxed">text/html-sandboxed</a></code> MIME
+    type impacts the origin security model, authors should be careful
+    to prevent tampering with the MIME type labeling mechanism itself
+    when documents are labeled as <code><a href="#text-html-sandboxed">text/html-sandboxed</a></code>. If
+    an attacker can cause a file to be served as
+    <code><a href="#text-html">text/html</a></code> instead of
+    <code><a href="#text-html-sandboxed">text/html-sandboxed</a></code>, then the sandboxing will not
+    take effect and a cross-site scripting attack will become
+    possible.</p>
     <p>Beyond this, the type is identical to <code><a href="#text-html">text/html</a></code>,
     and the same considerations apply.</p>
    </dd>
@@ -70769,6 +70846,7 @@
   Roy Fielding,
   Ruud Steltenpool,
   Ryan King,
+  Ryosuke Niwa,
   S. Mike Dierken,
   Salvatore Loreto,
   Sam Dutton,

Index: the-end.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/the-end.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- the-end.html	7 Dec 2010 09:46:09 -0000	1.5
+++ the-end.html	13 Dec 2010 08:06:45 -0000	1.6
@@ -899,14 +899,15 @@
         <p>If <var title="">current node</var> is an
         <code><a href="the-map-element.html#the-area-element">area</a></code>, <code><a href="semantics.html#the-base-element">base</a></code>, <code><a href="obsolete.html#basefont">basefont</a></code>,
         <code><a href="obsolete.html#bgsound">bgsound</a></code>, <code><a href="text-level-semantics.html#the-br-element">br</a></code>, <code><a href="tabular-data.html#the-col-element">col</a></code>,
-        <code><a href="the-iframe-element.html#the-embed-element">embed</a></code>, <code><a href="obsolete.html#frame">frame</a></code>, <code><a href="grouping-content.html#the-hr-element">hr</a></code>,
-        <code><a href="embedded-content-1.html#the-img-element">img</a></code>, <code><a href="the-input-element.html#the-input-element">input</a></code>, <code><a href="the-button-element.html#the-keygen-element">keygen</a></code>,
-        <code><a href="semantics.html#the-link-element">link</a></code>, <code><a href="semantics.html#meta">meta</a></code>, <code><a href="the-iframe-element.html#the-param-element">param</a></code>, or
+        <code><a href="interactive-elements.html#the-command">command</a></code>, <code><a href="the-iframe-element.html#the-embed-element">embed</a></code>, <code><a href="obsolete.html#frame">frame</a></code>,
+        <code><a href="grouping-content.html#the-hr-element">hr</a></code>, <code><a href="embedded-content-1.html#the-img-element">img</a></code>, <code><a href="the-input-element.html#the-input-element">input</a></code>,
+        <code><a href="the-button-element.html#the-keygen-element">keygen</a></code>, <code><a href="semantics.html#the-link-element">link</a></code>, <code><a href="semantics.html#meta">meta</a></code>,
+        <code><a href="the-iframe-element.html#the-param-element">param</a></code>, <code><a href="video.html#the-source-element">source</a></code>, <code><a href="video.html#the-track-element">track</a></code> or
         <code><a href="text-level-semantics.html#the-wbr-element">wbr</a></code> element, then continue on to the next child
-        node at this point.</p> <!-- also, i guess: image and isindex,
-        but we don't list those because we don't consider those
-        "elements", more "macros", and thus we should never serialize
-        them -->
+        node at this point.</p> <!-- VOIDLIST superset -->
+        <!-- also, i guess: image and isindex, but we don't list those
+        because we don't consider those "elements", more "macros", and
+        thus we should never serialize them -->
 
         <p>If <var title="">current node</var> is a <code><a href="grouping-content.html#the-pre-element">pre</a></code>,
         <code><a href="the-button-element.html#the-textarea-element">textarea</a></code>, or <code><a href="obsolete.html#listing">listing</a></code> element, append

Index: history.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/history.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- history.html	7 Dec 2010 09:46:07 -0000	1.5
+++ history.html	13 Dec 2010 08:06:45 -0000	1.6
@@ -971,6 +971,12 @@
    <code>iframe</code> attributes</a> of the <a href="browsers.html#browsing-context">browsing
    context</a>'s <a href="browsers.html#browsing-context-container">browsing context container</a>.</p></dd>
 
+   <dt>If the <a href="browsers.html#browsing-context">browsing context</a>'s <a href="browsers.html#active-document">active
+   document</a> has its <a href="dom.html#reload-override-flag">reload override
+   flag</a> set</dt>
+
+   <dd><p>Perform <a href="dom.html#an-overridden-reload">an overridden reload</a>.</p></dd>
+
    <dt>Otherwise</dt>
 
    <dd><p><a href="#navigate">Navigate</a><!--DONAV location.reload()--> the
@@ -982,16 +988,20 @@
 
    <!-- http://software.hixie.ch/utilities/js/live-dom-viewer/saved/141 -->
 
-  </dl><p>When a user requests that the current page be reloaded through a
-  user interface element, the user agent should
-  <a href="#navigate">navigate</a><!--DONAV user reload--> the <a href="browsers.html#browsing-context">browsing
-  context</a> to the same resource as <code><a href="infrastructure.html#document">Document</a></code>, with
-  <a href="#replacement-enabled">replacement enabled</a>. In the case of non-idempotent
-  methods (e.g. HTTP POST), the user agent should prompt the user to
-  confirm the operation first, since otherwise transactions (e.g.
-  purchases or database modifications) could be repeated. User agents
-  may allow the user to explicitly override any caches when
-  reloading.</p>
+  </dl><p>When a user requests that the current page of a <a href="browsers.html#browsing-context">browsing
+  context</a> be reloaded through a user interface element, the
+  user agent should <a href="#navigate">navigate</a><!--DONAV user reload--> the
+  <a href="browsers.html#browsing-context">browsing context</a> to the same resource as
+  <code><a href="infrastructure.html#document">Document</a></code>, with <a href="#replacement-enabled">replacement enabled</a>. In the
+  case of non-idempotent methods (e.g. HTTP POST), the user agent
+  should prompt the user to confirm the operation first, since
+  otherwise transactions (e.g. purchases or database modifications)
+  could be repeated. User agents may allow the user to explicitly
+  override any caches when reloading. If <a href="browsers.html#browsing-context">browsing
+  context</a>'s <a href="browsers.html#active-document">active document</a>'s <a href="dom.html#reload-override-flag">reload
+  override flag</a> is set, then the user agent may instead perform
+  <a href="dom.html#an-overridden-reload">an overridden reload</a> rather than the navigation
+  described in this paragraph.</p>
 
   </div><p>The <code><a href="#location">Location</a></code> interface also has the complement of
   <a href="urls.html#url-decomposition-idl-attributes">URL decomposition IDL attributes</a>, <dfn id="dom-location-protocol" title="dom-location-protocol"><code>protocol</code></dfn>, <dfn id="dom-location-host" title="dom-location-host"><code>host</code></dfn>, <dfn id="dom-location-port" title="dom-location-port"><code>port</code></dfn>, <dfn id="dom-location-hostname" title="dom-location-hostname"><code>hostname</code></dfn>, <dfn id="dom-location-pathname" title="dom-location-pathname"><code>pathname</code></dfn>, <dfn id="dom-location-search" title="dom-location-search"><code>search</code></dfn>, and <dfn id="dom-location-hash" title="dom-location-hash"><code>hash</code></dfn>. <span class="impl">These must follow the rules given for <a href="urls.html#url-decomposition-idl-attributes">URL

Index: origin-0.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/origin-0.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- origin-0.html	7 Dec 2010 09:46:08 -0000	1.5
+++ origin-0.html	13 Dec 2010 08:06:45 -0000	1.6
@@ -444,6 +444,7 @@
 
    </dd>
 
+
    <dt>For scripts</dt>
 
    <dd>
@@ -520,6 +521,7 @@
 
    </dd>
 
+
    <dt>For <code><a href="infrastructure.html#document">Document</a></code> objects and images</dt>
 
    <dd>
@@ -536,13 +538,6 @@
      assigned when the <code><a href="infrastructure.html#document">Document</a></code> is created.</dd>
 
 
-     <dt>If a <code><a href="infrastructure.html#document">Document</a></code> or image was returned by the
-     <code>XMLHttpRequest</code> API</dt>
-
-     <dd>The <a href="#origin">origin</a> is equal to the <span>XMLHttpRequest
-     origin</span> of the <code>XMLHttpRequest</code> object. <a href="references.html#refsXHR">[XHR]</a></dd>
-
-
      <dt>If a <code><a href="infrastructure.html#document">Document</a></code> or image was generated from a
      <a href="webappapis.html#javascript-protocol" title="javascript protocol"><code>javascript:</code>
      URL</a></dt>
@@ -610,6 +605,7 @@
 
    </dd>
 
+
    <dt>For <code><a href="video.html#audio">audio</a></code> and <code><a href="video.html#video">video</a></code> elements</dt>
 
    <dd>
@@ -625,7 +621,20 @@
 
    </dd>
 
-  </dl><p>The <dfn id="unicode-serialization-of-an-origin">Unicode serialization of an origin</dfn> is the string
+  </dl><p>Other specifications can override the above definitions by
+  themselves specifying the origin of a particular URL, script,
+  <code><a href="infrastructure.html#document">Document</a></code>, or image.</p>
+
+  <!-- e.g.:
+
+    <p>The <span>origin</span> of a <code>Document</code> object
+    returned by the <code>XMLHttpRequest</code> API is equal to the
+    <span>XMLHttpRequest origin</span> of the
+    <code>XMLHttpRequest</code> object.</p>
+
+  -->
+
+  <hr/><p>The <dfn id="unicode-serialization-of-an-origin">Unicode serialization of an origin</dfn> is the string
   obtained by applying the following algorithm to the given
   <a href="#origin">origin</a>:</p>
 

Index: dom.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/dom.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dom.html	7 Dec 2010 09:46:07 -0000	1.4
+++ dom.html	13 Dec 2010 08:06:45 -0000	1.5
@@ -384,7 +384,22 @@
   documents</dfn> unless they are flagged as being <dfn id="html-documents">HTML
   documents</dfn> when they are created. Whether a document is an
   <a href="#html-documents" title="HTML documents">HTML document</a> or an <a href="#xml-documents" title="XML documents">XML document</a> affects the behavior of
-  certain APIs and the case-sensitivity of some selectors.</p><h4 id="documents-in-the-dom"><span class="secno">3.1.1 </span>Documents in the DOM</h4><p>All <code><a href="infrastructure.html#document">Document</a></code> objects (in user agents implementing
+  certain APIs and the case-sensitivity of some selectors.</p><p>Each <code><a href="infrastructure.html#document">Document</a></code> object has a <dfn id="reload-override-flag">reload override
+  flag</dfn> that is originally unset. The flag is set by the <code title="dom-document-open"><a href="apis-in-html-documents.html#dom-document-open">document.open()</a></code> and <code title="dom-document-open"><a href="apis-in-html-documents.html#dom-document-open">document.write()</a></code> methods in certain
+  situations. When the flag is set, the <code><a href="infrastructure.html#document">Document</a></code> also has
+  a <dfn id="reload-override-buffer">reload override buffer</dfn> which is a Unicode string that
+  is used as the source of the document when it is reloaded.</p><p>When the user agent is to perform <dfn id="an-overridden-reload">an overridden
+  reload</dfn>, it must act as follows:</p><ol><li><p>Let <var title="">source</var> be the value of the
+   <a href="browsers.html#browsing-context">browsing context</a>'s <a href="browsers.html#active-document">active document</a>'s
+   <a href="#reload-override-buffer">reload override buffer</a>.</p></li>
+
+   <li><p><a href="history.html#navigate">Navigate</a><!--DONAV reload after d.open()--> the
+   <a href="browsers.html#browsing-context">browsing context</a> to a resource whose source is <var title="">source</var>. When the <a href="history.html#navigate">navigate</a> algorithm
+   creates a <code><a href="infrastructure.html#document">Document</a></code> object for this purpose, set that
+   <code><a href="infrastructure.html#document">Document</a></code>'s <a href="#reload-override-flag">reload override flag</a> and set
+   its <a href="#reload-override-buffer">reload override buffer</a> to <var title="">source</var>.</p></li>
+
+  </ol><h4 id="documents-in-the-dom"><span class="secno">3.1.1 </span>Documents in the DOM</h4><p>All <code><a href="infrastructure.html#document">Document</a></code> objects (in user agents implementing
   this specification) <span class="impl">must</span> also implement
   the <code><a href="#htmldocument">HTMLDocument</a></code> interface, available using
   binding-specific methods. (This is the case whether or not the
@@ -570,16 +585,19 @@
   attribute represents the cookies of the resource from which the
   <code><a href="infrastructure.html#document">Document</a></code> was created.</p>
 
-  <p>Some <code><a href="infrastructure.html#document">Document</a></code> objects are <dfn id="cookie-free-document-object" title="cookie-free&#10;  Document object">cookie-free <code>Document</code>
-  objects</dfn>. Any <code><a href="infrastructure.html#document">Document</a></code> object created by the <code title="">createDocument()</code> or <code title="dom-DOMHTMLImplementation-createHTMLDocument"><a href="#dom-domhtmlimplementation-createhtmldocument">createHTMLDocument()</a></code>
-  factory methods is a <a href="#cookie-free-document-object">cookie-free <code>Document</code>
-  object</a>. Any <code><a href="infrastructure.html#document">Document</a></code> whose <a href="#the-document-s-address" title="the&#10;  document's address">address</a> does not use a server-based
-  naming authority is a <a href="#cookie-free-document-object">cookie-free <code>Document</code>
-  object</a>. Other specifications can also define
-  <code><a href="infrastructure.html#document">Document</a></code> objects as being <a href="#cookie-free-document-object" title="cookie-free&#10;  Document object">cookie-free <code>Document</code>
-  objects</a>.</p>
+  <p>A <code><a href="infrastructure.html#document">Document</a></code> object that falls into one of the
+  following conditions is a <dfn id="cookie-free-document-object">cookie-free <code>Document</code>
+  object</dfn>:</p>
 
-  <p id="sandboxCookies">On getting, if the document is a
+  <ul><li>A <code><a href="infrastructure.html#document">Document</a></code> that has no <a href="browsers.html#browsing-context">browsing
+   context</a>.</li>
+
+   <li>A <code><a href="infrastructure.html#document">Document</a></code> whose <a href="#the-document-s-address" title="the document's&#10;   address">address</a> does not use a server-based naming
+   authority.</li>
+
+  </ul><!--Other specifications can also define <code>Document</code>
+  objects as being <span title="cookie-free Document
+  object">cookie-free <code>Document</code> objects</span>.--><p id="sandboxCookies">On getting, if the document is a
   <a href="#cookie-free-document-object">cookie-free <code>Document</code> object</a>, then the user
   agent must return the empty string. Otherwise, if the
   <code><a href="infrastructure.html#document">Document</a></code>'s <a href="origin-0.html#origin">origin</a> is not a

Index: rendering.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/rendering.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rendering.html	7 Dec 2010 09:46:08 -0000	1.5
+++ rendering.html	13 Dec 2010 08:06:45 -0000	1.6
@@ -414,7 +414,7 @@
   </ul><p class="note">Just being off-screen does not mean the element is
   not <a href="#being-rendered">being rendered</a>. The presence of the <code title="attr-hidden"><a href="editing.html#the-hidden-attribute">hidden</a></code> attribute normally means the
   element is not <a href="#being-rendered">being rendered</a>, though this might be
-  overriden by the style sheets.</p>
+  overridden by the style sheets.</p>
 
   </div><div class="impl">
 

Index: urls.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/urls.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- urls.html	7 Dec 2010 09:46:09 -0000	1.4
+++ urls.html	13 Dec 2010 08:06:45 -0000	1.5
@@ -486,15 +486,11 @@
      context</a>'s <a href="browsers.html#browsing-context-container">browsing context container</a>'s
      <code><a href="infrastructure.html#document">Document</a></code> instead.</p></li>
 
-     <li><p>If there is no <code><a href="semantics.html#the-base-element">base</a></code> element that is both a
-     child of <a href="dom.html#the-head-element">the <code>head</code> element</a> and has an
-     <code title="attr-base-href"><a href="semantics.html#attr-base-href">href</a></code> attribute, then the
+     <li><p>If there is no <code><a href="semantics.html#the-base-element">base</a></code> element that has an <code title="attr-base-href"><a href="semantics.html#attr-base-href">href</a></code> attribute, then the
      <a href="#document-base-url">document base URL</a> is <var title="">fallback base
-     url</var>.</p></li>
-
-     <li><p>Otherwise, let <var title="">url</var> be the value of the
-     <code title="attr-base-href"><a href="semantics.html#attr-base-href">href</a></code> attribute of the first
-     such element.</p></li>
+     url</var>. Otherwise, let <var title="">url</var> be the value of
+     the <code title="attr-base-href"><a href="semantics.html#attr-base-href">href</a></code> attribute of the
+     first such element.</p></li>
 
      <li><p><a href="#resolve-a-url" title="resolve a URL">Resolve</a> <var title="">url</var> relative to <var title="">fallback base
      url</var> (thus, the <code><a href="semantics.html#the-base-element">base</a></code> <code title="attr-base-href"><a href="semantics.html#attr-base-href">href</a></code> attribute isn't affected by

Index: tokenization.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/tokenization.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tokenization.html	7 Dec 2010 09:46:09 -0000	1.4
+++ tokenization.html	13 Dec 2010 08:06:45 -0000	1.5
@@ -4827,7 +4827,10 @@
        for this instance of the <a href="parsing.html#html-parser">HTML parser</a>, such that
        the <a href="webappapis.html#event-loop">event loop</a> will not run <a href="webappapis.html#concept-task" title="concept-task">tasks</a> that invoke the <a href="#tokenization" title="tokenization">tokenizer</a>.</p></li>
 
-       <li><p><a href="webappapis.html#spin-the-event-loop">Spin the event loop</a> until the parser's
+       <li><p>If the parser's <code><a href="infrastructure.html#document">Document</a></code> <a href="semantics.html#has-a-style-sheet-that-is-blocking-scripts">has a style
+       sheet that is blocking scripts</a> or <var title="">the
+       script</var>'s <a href="scripting-1.html#ready-to-be-parser-executed">"ready to be parser-executed"</a> flag
+       is not set: <a href="webappapis.html#spin-the-event-loop">spin the event loop</a> until the parser's
        <code><a href="infrastructure.html#document">Document</a></code> <a href="semantics.html#has-no-style-sheet-that-is-blocking-scripts">has no style sheet that is blocking
        scripts</a> and <var title="">the script</var>'s
        <a href="scripting-1.html#ready-to-be-parser-executed">"ready to be parser-executed"</a> flag is

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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- association-of-controls-and-forms.html	7 Dec 2010 09:46:06 -0000	1.5
+++ association-of-controls-and-forms.html	13 Dec 2010 08:06:45 -0000	1.6
@@ -700,11 +700,11 @@
   element is a <a href="forms.html#concept-submit-button" title="concept-submit-button">submit
   button</a> and has such an attribute; or the value of its
   <a href="#form-owner">form owner</a>'s <code title="attr-fs-target"><a href="#attr-fs-target">target</a></code>
-  attribute, if <em>it</em> has such an attribute; or, if one of the
-  child nodes of <a href="dom.html#the-head-element">the <code>head</code> element</a> is a
-  <code><a href="semantics.html#the-base-element">base</a></code> element with a <code title="attr-base-target"><a href="semantics.html#attr-base-target">target</a></code> attribute, then the value of
-  the <code title="attr-base-target"><a href="semantics.html#attr-base-target">target</a></code> attribute of the
-  first such <code><a href="semantics.html#the-base-element">base</a></code> element; or, if there is no such
+  attribute, if <em>it</em> has such an attribute; or, if the
+  <code><a href="infrastructure.html#document">Document</a></code> contains a <code><a href="semantics.html#the-base-element">base</a></code> element with a
+  <code title="attr-base-target"><a href="semantics.html#attr-base-target">target</a></code> attribute, then the
+  value of the <code title="attr-base-target"><a href="semantics.html#attr-base-target">target</a></code> attribute
+  of the first such <code><a href="semantics.html#the-base-element">base</a></code> element; or, if there is no such
   element, the empty string.</p><!-- c.f. hyperlink following --><hr/><p>The <dfn id="attr-fs-novalidate" title="attr-fs-novalidate"><code>novalidate</code></dfn>
   and <dfn id="attr-fs-formnovalidate" title="attr-fs-formnovalidate"><code>formnovalidate</code></dfn>
   content attributes are <a href="common-microsyntaxes.html#boolean-attribute" title="boolean attribute">boolean

Index: video.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/video.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- video.html	7 Dec 2010 09:46:09 -0000	1.5
+++ video.html	13 Dec 2010 08:06:45 -0000	1.6
@@ -2620,14 +2620,15 @@
 
     <p>If the <a href="#autoplaying-flag">autoplaying flag</a> is true, and the <code title="dom-media-paused"><a href="#dom-media-paused">paused</a></code> attribute is true, and the
     <a href="#media-element">media element</a> has an <code title="attr-media-autoplay"><a href="#attr-media-autoplay">autoplay</a></code> attribute specified,
-    and the <a href="#media-element">media element</a> is in a <code><a href="infrastructure.html#document">Document</a></code>
-    whose <a href="browsers.html#browsing-context">browsing context</a> did not have the
-    <a href="the-iframe-element.html#sandboxed-automatic-features-browsing-context-flag">sandboxed automatic features browsing context flag</a>
-    set when the <code><a href="infrastructure.html#document">Document</a></code> was created, then the user
-    agent may also set the <code title="dom-media-paused"><a href="#dom-media-paused">paused</a></code> attribute to false,
+    and the <a href="#media-element">media element</a>'s <code><a href="infrastructure.html#document">Document</a></code>'s
+    <a href="browsers.html#browsing-context">browsing context</a> did not have the <a href="the-iframe-element.html#sandboxed-automatic-features-browsing-context-flag">sandboxed
+    automatic features browsing context flag</a> set when the
+    <code><a href="infrastructure.html#document">Document</a></code> was created, then the user agent may also
+    set the <code title="dom-media-paused"><a href="#dom-media-paused">paused</a></code> attribute to
+    false, <a href="webappapis.html#queue-a-task">queue a task</a> to <a href="webappapis.html#fire-a-simple-event">fire a simple
+    event</a> named <code title="event-media-play"><a href="#event-media-play">play</a></code>, and
     <a href="webappapis.html#queue-a-task">queue a task</a> to <a href="webappapis.html#fire-a-simple-event">fire a simple event</a>
-    named <code title="event-media-play"><a href="#event-media-play">play</a></code>, and <a href="webappapis.html#queue-a-task">queue
-    a task</a> to <a href="webappapis.html#fire-a-simple-event">fire a simple event</a> named <code title="event-media-playing"><a href="#event-media-playing">playing</a></code>.</p>
+    named <code title="event-media-playing"><a href="#event-media-playing">playing</a></code>.</p>
 
     <p class="note">User agents are not required to autoplay, and it
     is suggested that user agents honor user preferences on the

Index: iana.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/iana.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- iana.html	7 Dec 2010 09:46:07 -0000	1.4
+++ iana.html	13 Dec 2010 08:06:45 -0000	1.5
@@ -506,6 +506,15 @@
     as <code><a href="#text-html-sandboxed">text/html-sandboxed</a></code> as regular
     <code><a href="#text-html">text/html</a></code> files, authors should avoid using the <code title="">.html</code> or <code title="">.htm</code> extensions for
     resources labeled as <code><a href="#text-html-sandboxed">text/html-sandboxed</a></code>.</p>
+    <p>Furthermore, since the <code><a href="#text-html-sandboxed">text/html-sandboxed</a></code> MIME
+    type impacts the origin security model, authors should be careful
+    to prevent tampering with the MIME type labeling mechanism itself
+    when documents are labeled as <code><a href="#text-html-sandboxed">text/html-sandboxed</a></code>. If
+    an attacker can cause a file to be served as
+    <code><a href="#text-html">text/html</a></code> instead of
+    <code><a href="#text-html-sandboxed">text/html-sandboxed</a></code>, then the sandboxing will not
+    take effect and a cross-site scripting attack will become
+    possible.</p>
     <p>Beyond this, the type is identical to <code><a href="#text-html">text/html</a></code>,
     and the same considerations apply.</p>
    </dd>

Index: content-models.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/content-models.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- content-models.html	7 Dec 2010 09:46:06 -0000	1.4
+++ content-models.html	13 Dec 2010 08:06:45 -0000	1.5
@@ -1184,7 +1184,7 @@
   overridden. The following table lists these elements<span class="impl"> and their <span>implicit ARIA semantics</span></span>,
   along with the restrictions that apply to those elements. Each
   language feature (element or attribute) in a cell in the first
-  column implies, unless otherwise overriden, the ARIA semantic (role,
+  column implies, unless otherwise overridden, the ARIA semantic (role,
   state, or property) given in the cell in the second column of the
   same row, but this semantic may be overridden under the conditions
   listed in the cell in the third column of that row. In addition, any

Index: apis-in-html-documents.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/apis-in-html-documents.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- apis-in-html-documents.html	7 Dec 2010 09:46:06 -0000	1.4
+++ apis-in-html-documents.html	13 Dec 2010 08:06:44 -0000	1.5
@@ -684,6 +684,10 @@
    <li><p>Change the <a href="dom.html#document-s-character-encoding">document's character encoding</a> to
    UTF-8.</p></li>
 
+   <li><p>Set the <code><a href="infrastructure.html#document">Document</a></code> object's <a href="dom.html#reload-override-flag">reload override
+   flag</a> and set the <code><a href="infrastructure.html#document">Document</a></code>'s <a href="dom.html#reload-override-buffer">reload
+   override buffer</a> to the empty string.</p></li>
+
    <li><p>Change <a href="dom.html#the-document-s-address">the document's address</a> to the
    <a href="browsers.html#entry-script">entry script</a>'s <a href="webappapis.html#script-s-document" title="script's&#10;   document">document</a>'s <a href="dom.html#the-document-s-address" title="the document's&#10;   address">address</a>.</p></li>
 
@@ -862,10 +866,10 @@
 
    <li>
 
-    <p>If the <a href="parsing.html#insertion-point">insertion point</a> is undefined, the <code title="dom-document-open"><a href="#dom-document-open">open()</a></code> method must be called
-    (with no arguments) on the <code title="Document"><a href="infrastructure.html#document">document</a></code>
-    object. If the user <a href="history.html#refused-to-allow-the-document-to-be-unloaded">refused to allow the document to be
-    unloaded</a>, then these steps must be aborted. Otherwise, the
+    <p>If the <a href="parsing.html#insertion-point">insertion point</a> is undefined, call the
+    <code title="dom-document-open"><a href="#dom-document-open">open()</a></code> method on the <code title="Document"><a href="infrastructure.html#document">document</a></code> object (with no arguments). If
+    the user <a href="history.html#refused-to-allow-the-document-to-be-unloaded">refused to allow the document to be
+    unloaded</a>, then abort these steps. Otherwise, the
     <a href="parsing.html#insertion-point">insertion point</a> will point at just before the end of
     the (empty) <a href="parsing.html#the-input-stream">input stream</a>.</p>
 
@@ -873,28 +877,30 @@
 
    <li>
 
-    <p>The string consisting of the concatenation of all the arguments
-    to the method must be inserted into the <a href="parsing.html#the-input-stream">input stream</a>
-    just before the <a href="parsing.html#insertion-point">insertion point</a>.</p>
+    <p>Insert the string consisting of the concatenation of all the
+    arguments to the method into the <a href="parsing.html#the-input-stream">input stream</a> just
+    before the <a href="parsing.html#insertion-point">insertion point</a>.</p>
 
    </li>
 
    <li>
 
-    <p>If there is a <a href="scripting-1.html#pending-parsing-blocking-script">pending parsing-blocking script</a>, then the
-    method must now return without further processing of the
-    <a href="parsing.html#the-input-stream">input stream</a>.</p>
+    <p>If the <code><a href="infrastructure.html#document">Document</a></code> object's <a href="dom.html#reload-override-flag">reload override
+    flag</a> is set, then append the string consisting of the
+    concatenation of all the arguments to the method to the
+    <code><a href="infrastructure.html#document">Document</a></code>'s <a href="dom.html#reload-override-buffer">reload override buffer</a>.</p>
 
    </li>
 
    <li>
 
-    <p>Otherwise, the tokenizer must process the characters that were
-    inserted, one at a time, processing resulting tokens as they are
-    emitted, and stopping when the tokenizer reaches the insertion
-    point or when the processing of the tokenizer is aborted by the
-    tree construction stage (this can happen if a <code><a href="scripting-1.html#script">script</a></code>
-    end tag token is emitted by the tokenizer).
+    <p>If there is no <a href="scripting-1.html#pending-parsing-blocking-script">pending parsing-blocking script</a>,
+    have the tokenizer process the characters that were inserted, one
+    at a time, processing resulting tokens as they are emitted, and
+    stopping when the tokenizer reaches the insertion point or when
+    the processing of the tokenizer is aborted by the tree
+    construction stage (this can happen if a <code><a href="scripting-1.html#script">script</a></code> end
+    tag token is emitted by the tokenizer).
 
     </p><p class="note">If the <code title="dom-document-write"><a href="#dom-document-write">document.write()</a></code> method was
     called from script executing inline (i.e. executing because the
@@ -906,7 +912,7 @@
 
    <li>
 
-    <p>Finally, the method must return.</p>
+    <p>Finally, return from the method.</p>
 
    </li>
 

Index: the-button-element.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/the-button-element.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- the-button-element.html	7 Dec 2010 09:46:08 -0000	1.4
+++ the-button-element.html	13 Dec 2010 08:06:45 -0000	1.5
@@ -2102,7 +2102,7 @@
   a list of the element's <code><a href="forms.html#the-label-element">label</a></code>s. The <code title="dom-fae-form"><a href="association-of-controls-and-forms.html#dom-fae-form">form</a></code> IDL attribute is part of the
   element's forms API.</p>
 
-  </div><h4 id="the-meter-element"><span class="secno">4.10.17 </span>The <dfn><code>meter</code></dfn> element</h4><p class="XXX annotation"><span><a href="http://www.w3.org/html/wg/tracker/issues/97">ISSUE-97</a> (meter) blocks progress to Last Call</span></p><!-- Keep this after <progress> and NOT close to <time> --><dl class="element"><dt>Categories</dt>
+  </div><h4 id="the-meter-element"><span class="secno">4.10.17 </span>The <dfn><code>meter</code></dfn> element</h4><!-- Keep this after <progress> and NOT close to <time> --><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="forms.html#category-label" title="category-label">Labelable</a> <a href="forms.html#form-associated-element">form-associated element</a>.</dd>

Index: dnd.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/dnd.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dnd.html	7 Dec 2010 09:46:06 -0000	1.4
+++ dnd.html	13 Dec 2010 08:06:45 -0000	1.5
@@ -2595,7 +2595,7 @@
   <h4 id="definitions-2"><span class="secno">7.8.1 </span>Definitions</h4>
 
   <p>The user agent must associate an <dfn id="undo-transaction-history">undo transaction
-  history</dfn> with each <code><a href="dom.html#htmldocument">HTMLDocument</a></code> object.</p>
+  history</dfn> with each <code><a href="infrastructure.html#document">Document</a></code> object.</p>
 
   <p>The <a href="#undo-transaction-history">undo transaction history</a> is a list of
   entries. The entries are of two types: <a href="#dom-changes">DOM changes</a> and
@@ -2609,7 +2609,7 @@
    node.</li>
 
    <li>Changes to the DOM hierarchy of nodes that are descendants of
-   the <code><a href="dom.html#htmldocument">HTMLDocument</a></code> object (<code title="dom-Node-parentNode"><a href="infrastructure.html#dom-node-parentnode">parentNode</a></code>, <code title="dom-Node-childNodes"><a href="infrastructure.html#dom-node-childnodes">childNodes</a></code>).</li>
+   the <code><a href="infrastructure.html#document">Document</a></code> object (<code title="dom-Node-parentNode"><a href="infrastructure.html#dom-node-parentnode">parentNode</a></code>, <code title="dom-Node-childNodes"><a href="infrastructure.html#dom-node-childnodes">childNodes</a></code>).</li>
 
    <li>Changes to internal state, such as a form control's <a href="association-of-controls-and-forms.html#concept-fe-value" title="concept-fe-value">value</a> or <a href="the-input-element.html#concept-input-checked-dirty-flag" title="concept-input-checked-dirty-flag">dirty checkedness
    flag</a>.</li>
@@ -2704,8 +2704,8 @@
   <p>The <dfn id="dom-undomanager" title="dom-undoManager"><code>undoManager</code></dfn>
   attribute of the <code><a href="browsers.html#window">Window</a></code> interface must return the
   object implementing the <code><a href="#undomanager">UndoManager</a></code> interface for that
-  <code><a href="browsers.html#window">Window</a></code> object's associated
-  <code><a href="dom.html#htmldocument">HTMLDocument</a></code> object.</p>
+  <code><a href="browsers.html#window">Window</a></code> object's associated <code><a href="infrastructure.html#document">Document</a></code>
+  object.</p>
 
   <p><code><a href="#undomanager">UndoManager</a></code> objects represent their document's
   <a href="#undo-transaction-history">undo transaction history</a>. Only <a href="#undo-object">undo object</a>

Index: links.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/links.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- links.html	7 Dec 2010 09:46:07 -0000	1.4
+++ links.html	13 Dec 2010 08:06:45 -0000	1.5
@@ -482,15 +482,16 @@
   as the browsing context to be navigated.</p>
 
   <p>Otherwise, if the element is an <code><a href="text-level-semantics.html#the-a-element">a</a></code> or
-  <code><a href="the-map-element.html#the-area-element">area</a></code> element with no <code title="attr-hyperlink-target"><a href="#attr-hyperlink-target">target</a></code> attribute, but one of
-  the child nodes of <a href="dom.html#the-head-element">the <code>head</code> element</a> is a
-  <code><a href="semantics.html#the-base-element">base</a></code> element with a <code title="attr-base-target"><a href="semantics.html#attr-base-target">target</a></code> attribute, then the browsing
-  context that is navigated must be chosen by applying <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 the value of the <code title="attr-base-target"><a href="semantics.html#attr-base-target">target</a></code> attribute of the first such
+  <code><a href="the-map-element.html#the-area-element">area</a></code> element with no <code title="attr-hyperlink-target"><a href="#attr-hyperlink-target">target</a></code> attribute, but the
+  <code><a href="infrastructure.html#document">Document</a></code> contains a <code><a href="semantics.html#the-base-element">base</a></code> element with a
+  <code title="attr-base-target"><a href="semantics.html#attr-base-target">target</a></code> attribute, then the
+  browsing context that is navigated must be chosen by applying
+  <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 the value of the <code title="attr-base-target"><a href="semantics.html#attr-base-target">target</a></code> attribute of the first such
   <code><a href="semantics.html#the-base-element">base</a></code> element as the browsing context name. If these
   rules result in the creation of a new <a href="browsers.html#browsing-context">browsing context</a>,
   it must be navigated with <a href="history.html#replacement-enabled">replacement enabled</a>.</p>
+  <!-- c.f. concept-fs-target -->
 
   <p>Otherwise, the browsing context that must be navigated is the
   same browsing context as the one which the element itself is in.</p>

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/spec.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- spec.html	7 Dec 2010 09:46:08 -0000	1.5
+++ spec.html	13 Dec 2010 08:06:45 -0000	1.6
@@ -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.4573.
+This is revision 1.4582.
    </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

Index: acknowledgements.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/acknowledgements.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- acknowledgements.html	7 Dec 2010 09:46:05 -0000	1.5
+++ acknowledgements.html	13 Dec 2010 08:06:44 -0000	1.6
@@ -822,6 +822,7 @@
   Roy Fielding,
   Ruud Steltenpool,
   Ryan King,
+  Ryosuke Niwa,
   S. Mike Dierken,
   Salvatore Loreto,
   Sam Dutton,

Index: syntax.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/syntax.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- syntax.html	7 Dec 2010 09:46:08 -0000	1.4
+++ syntax.html	13 Dec 2010 08:06:45 -0000	1.5
@@ -489,6 +489,7 @@
    <code><a href="the-button-element.html#the-keygen-element">keygen</a></code>, <code><a href="semantics.html#the-link-element">link</a></code>, <code><a href="semantics.html#meta">meta</a></code>,
    <code><a href="the-iframe-element.html#the-param-element">param</a></code>, <code><a href="video.html#the-source-element">source</a></code>, <code><a href="video.html#the-track-element">track</a></code>,
    <code><a href="text-level-semantics.html#the-wbr-element">wbr</a></code></dd>
+   <!-- see also other places that say VOIDLIST -->
 
    <dt><dfn id="raw-text-elements">Raw text elements</dfn></dt>
 

Index: webappapis.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/webappapis.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- webappapis.html	7 Dec 2010 09:46:09 -0000	1.4
+++ webappapis.html	13 Dec 2010 08:06:46 -0000	1.5
@@ -794,11 +794,14 @@
    <code><a href="infrastructure.html#document">Document</a></code>s are not <a href="browsers.html#fully-active">fully active</a>. The user
    agent may pick any <a href="#task-queue">task queue</a>.</p></li>
 
+   <!-- warning! if you renumber these steps, make sure to update the
+   "spin the event loop" algorith below! -->
+
    <li><p>If the <a href="#storage-mutex">storage mutex</a> is now owned by the
    <a href="#event-loop">event loop</a>, release it so that it is once again
-   free.</p>
+   free.</p></li>
 
-   </li><li><p>Remove that task from its <a href="#task-queue">task queue</a>.</p></li>
+   <li><p>Remove that task from its <a href="#task-queue">task queue</a>.</p></li>
 
    <li><p>If any asynchronously-running algorithms are <dfn id="await-a-stable-state" title="await a stable state">awaiting a stable state</dfn>, then
    run their <dfn id="synchronous-section">synchronous section</dfn> and then resume running
@@ -824,9 +827,16 @@
   <ol><li><p>Let <var title="">task source</var> be the <a href="#task-source">task
    source</a> of the currently running <a href="#concept-task" title="concept-task">task</a>.</p></li>
 
-   <li><p>Stop the currently running <a href="#concept-task" title="concept-task">task</a>, allowing the <a href="#event-loop">event
-   loop</a> to resume, but continue these steps
-   asynchronously.</p></li>
+   <li>
+
+    <p>Stop the currently running <a href="#concept-task" title="concept-task">task</a>, allowing the <a href="#event-loop">event
+    loop</a> to resume, but continue these steps
+    asynchronously.</p>
+
+    <p class="note">This causes the <a href="#event-loop">event loop</a> to move on
+    to the second step of its processing model (defined above).</p>
+
+   </li>
 
    <li><p>Wait until the condition <var title="">goal</var> is
    met.</p></li>
@@ -840,15 +850,27 @@
 
   </ol><hr/><p>Some of the algorithms in this specification, for historical
   reasons, require the user agent to <dfn id="pause">pause</dfn> while running a
-  <a href="#concept-task" title="concept-task">task</a> until some condition has been
-  met. While a user agent has a paused <a href="#concept-task" title="concept-task">task</a>, the corresponding <a href="#event-loop">event
-  loop</a> must not run further <a href="#concept-task" title="concept-task">tasks</a>, and any script in the currently
-  running <a href="#concept-task" title="concept-task">task</a> must block. User
-  agents should remain responsive to user input while paused, however,
-  albeit in a reduced capacity since the <a href="#event-loop">event loop</a> will
-  not be doing anything.</p>
+  <a href="#concept-task" title="concept-task">task</a> until a condition <var title="">goal</var> is met. This means running the following
+  steps:</p>
 
-  <hr/><p>When a user agent is to <dfn id="obtain-the-storage-mutex">obtain the storage mutex</dfn> as
+  <ol><li><p>If any asynchronously-running algorithms are <a href="#await-a-stable-state" title="await a stable state">awaiting a stable state</a>, then
+   run their <a href="#synchronous-section">synchronous section</a> and then resume running
+   their asynchronous algorithm. (See the <a href="#event-loop">event loop</a>
+   processing model definition above for details.)</p>
+
+   </li><li><p>If necessary, update the rendering or user interface of any
+   <code><a href="infrastructure.html#document">Document</a></code> or <a href="browsers.html#browsing-context">browsing context</a> to reflect
+   the current state.</p></li>
+
+   <li><p>Wait until the condition <var title="">goal</var> is met.
+   While a user agent has a paused <a href="#concept-task" title="concept-task">task</a>, the corresponding <a href="#event-loop">event
+   loop</a> must not run further <a href="#concept-task" title="concept-task">tasks</a>, and any script in the currently
+   running <a href="#concept-task" title="concept-task">task</a> must block. User
+   agents should remain responsive to user input while paused,
+   however, albeit in a reduced capacity since the <a href="#event-loop">event
+   loop</a> will not be doing anything.</p></li>
+
+  </ol><hr/><p>When a user agent is to <dfn id="obtain-the-storage-mutex">obtain the storage mutex</dfn> as
   part of running a <a href="#concept-task" title="concept-task">task</a>, it must
   run through the following steps:</p>
 
Received on Monday, 13 December 2010 08:06:53 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Monday, 13 December 2010 08:13:09 GMT