W3C home > Mailing lists > Public > public-html-commits@w3.org > April 2011

html5/markup/html5-spec Overview.html,1.10,1.11 acknowledgements.html,1.9,1.10 apis-in-html-documents.html,1.8,1.9 association-of-controls-and-forms.html,1.9,1.10 browsers.html,1.8,1.9 commands.html,1.7,1.8 common-dom-interfaces.html,1.7,1.8 common-input-element-attributes.html,1.7,1.8 common-microsyntaxes.html,1.7,1.8 content-models.html,1.8,1.9 dnd.html,1.8,1.9 dom.html,1.8,1.9 editing.html,1.8,1.9 edits.html,1.7,1.8 elements.html,1.8,1.9 embedded-content-1.html,1.7,1.8 fetching-resources.html,1.7,1.8 forms.html,1.7,1.8 grouping-content.html,1.7,1.8 history.html,1.9,1.10 iana.html,1.8,1.9 index.html,1.7,1.8 infrastructure.html,1.8,1.9 interactive-elements.html,1.7,1.8 introduction.html,1.7,1.8 links.html,1.8,1.9 named-character-references.html,1.7,1.8 namespaces.html,1.7,1.8 number-state.html,1.7,1.8 obsolete.html,1.7,1.8 offline.html,1.8,1.9 origin-0.html,1.9,1.10 parsing.html,1.7,1.8 references.html,1.8,1.9 rendering.html,1.9,1.10 scripting-1.html,1.7,1.8 sections.html,1.7,1.8 semantics.html,1.8

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Sat, 30 Apr 2011 11:35:49 +0000
To: Message-Id: <E1QG8TE-00031m-80@lionel-hutz.w3.org>
Update of /sources/public/html5/markup/html5-spec
In directory hutz:/tmp/cvs-serv11471/html5-spec

Modified Files:
	Overview.html acknowledgements.html 
	apis-in-html-documents.html 
	association-of-controls-and-forms.html browsers.html 
	commands.html common-dom-interfaces.html 
	common-input-element-attributes.html common-microsyntaxes.html 
	content-models.html dnd.html dom.html editing.html edits.html 
	elements.html embedded-content-1.html fetching-resources.html 
	forms.html grouping-content.html history.html iana.html 
	index.html infrastructure.html interactive-elements.html 
	introduction.html links.html named-character-references.html 
	namespaces.html number-state.html obsolete.html offline.html 
	origin-0.html parsing.html references.html rendering.html 
	scripting-1.html sections.html semantics.html spec.html 
	states-of-the-type-attribute.html syntax.html 
	tabular-data.html text-level-semantics.html 
	the-button-element.html the-canvas-element.html the-end.html 
	the-iframe-element.html the-input-element.html 
	the-map-element.html the-xhtml-syntax.html timers.html 
	toc-status.html tokenization.html urls.html video.html 
	webappapis.html 
Log Message:
prune vendor-prefixes CSS props. b=12379


Index: infrastructure.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/infrastructure.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- infrastructure.html	25 Feb 2011 07:05:29 -0000	1.8
+++ infrastructure.html	30 Apr 2011 11:35:45 -0000	1.9
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>2 Common infrastructure &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -352,7 +348,7 @@
   <ol class="toc"><li><a href="infrastructure.html#infrastructure"><span class="secno">2 </span>Common infrastructure</a>
   <ol><li><a href="infrastructure.html#terminology"><span class="secno">2.1 </span>Terminology</a>
     <ol><li><a href="infrastructure.html#resources"><span class="secno">2.1.1 </span>Resources</a></li><li><a href="infrastructure.html#xml"><span class="secno">2.1.2 </span>XML</a></li><li><a href="infrastructure.html#dom-trees"><span class="secno">2.1.3 </span>DOM trees</a></li><li><a href="infrastructure.html#scripting-0"><span class="secno">2.1.4 </span>Scripting</a></li><li><a href="infrastructure.html#plugins"><span class="secno">2.1.5 </span>Plugins</a></li><li><a href="infrastructure.html#character-encodings"><span class="secno">2.1.6 </span>Character encodings</a></li></ol></li><li><a href="infrastructure.html#conformance-requirements"><span class="secno">2.2 </span>Conformance requirements</a>
-    <ol><li><a href="infrastructure.html#dependencies"><span class="secno">2.2.1 </span>Dependencies</a></li><li><a href="infrastructure.html#extensibility"><span class="secno">2.2.2 </span>Extensibility</a></li></ol></li><li><a href="infrastructure.html#case-sensitivity-and-string-comparison"><span class="secno">2.3 </span>Case-sensitivity and string comparison</a></li><li><a href="infrastructure.html#utf-8"><span class="secno">2.4 </span>UTF-8</a></li></ol></li></ol></div><h2 id="infrastructure"><span class="secno">2 </span>Common infrastructure</h2><h3 id="terminology"><span class="secno">2.1 </span>Terminology</h3><p>This specification refers to both HTML and XML attributes and IDL
+    <ol><li><a href="infrastructure.html#conformance-classes"><span class="secno">2.2.1 </span>Conformance classes</a></li><li><a href="infrastructure.html#dependencies"><span class="secno">2.2.2 </span>Dependencies</a></li><li><a href="infrastructure.html#extensibility"><span class="secno">2.2.3 </span>Extensibility</a></li></ol></li><li><a href="infrastructure.html#case-sensitivity-and-string-comparison"><span class="secno">2.3 </span>Case-sensitivity and string comparison</a></li><li><a href="infrastructure.html#utf-8"><span class="secno">2.4 </span>UTF-8</a></li></ol></li></ol></div><h2 id="infrastructure"><span class="secno">2 </span>Common infrastructure</h2><h3 id="terminology"><span class="secno">2.1 </span>Terminology</h3><p>This specification refers to both HTML and XML attributes and IDL
   attributes, often in the same context. When it is not clear which is
   being referred to, they are referred to as <dfn title="">content
   attributes</dfn> for HTML and XML attributes, and <dfn title="">IDL
@@ -377,7 +373,8 @@
   implies that A called B. Upon returning to A, the implementation
   must continue from where it left off in calling B.</p>
 
-  </div><h4 id="resources"><span class="secno">2.1.1 </span>Resources</h4><p>The specification uses the term <dfn title="">supported</dfn>
+  </div><p>The term "transparent black" refers to the color with red, green,
+  blue, and alpha channels all set to zero.</p><h4 id="resources"><span class="secno">2.1.1 </span>Resources</h4><p>The specification uses the term <dfn title="">supported</dfn>
   when referring to whether a user agent has an implementation capable
   of decoding the semantics of an external resource. A format or type
   is said to be <i>supported</i> if the implementation can process an
@@ -479,8 +476,7 @@
   operate on the actual underlying data, not a snapshot of the
   data.</p><p>The terms <dfn title="">fire</dfn> and <dfn title="">dispatch</dfn> are used interchangeably in the context of
   events, as in the DOM Events specifications. The term <dfn id="concept-events-trusted" title="concept-events-trusted">trusted event</dfn> is used as
-  defined by the DOM Events specification. <!--
-  http://krijnhoetmer.nl/irc-logs/webapps/20091218 --> <a href="references.html#refsDOMEVENTS">[DOMEVENTS]</a></p><h4 id="plugins"><span class="secno">2.1.5 </span>Plugins</h4><p>The term <dfn id="plugin">plugin</dfn> refers to a user-agent defined set of
+  defined by the DOM Events specification.  <a href="references.html#refsDOMEVENTS">[DOMEVENTS]</a></p><h4 id="plugins"><span class="secno">2.1.5 </span>Plugins</h4><p>The term <dfn id="plugin">plugin</dfn> refers to a user-agent defined set of
   content handlers used by the user agent that can take part in the
   user agent's rendering of a <code><a href="#document">Document</a></code> object, but that
   neither act as <a href="browsers.html#child-browsing-context" title="child browsing context">child browsing
@@ -491,10 +487,7 @@
 
   <p>A user agent must not consider the types <code>text/plain</code>
   and <code>application/octet-stream</code> as having a registered
-  <a href="#plugin">plugin</a>.</p> <!-- because of the way <object> handles
-  those types, if nothing else (it also doesn't make any sense to have
-  a plugin registered for those types, of course) -->
-
+  <a href="#plugin">plugin</a>.</p> 
   </div><p class="example">One example of a plugin would be a PDF viewer
   that is instantiated in a <a href="browsers.html#browsing-context">browsing context</a> when the
   user navigates to a PDF file. This would count as a plugin
@@ -516,51 +509,76 @@
   third-party software become as dangerous as those in the user
   agent.</p>
 
-  </div><h4 id="character-encodings"><span class="secno">2.1.6 </span>Character encodings</h4><p class="XXX annotation"><span><a href="http://www.w3.org/html/wg/tracker/issues/101">ISSUE-101</a> (us-ascii-ref) blocks progress to Last Call</span></p><p>The <dfn id="preferred-mime-name">preferred MIME name</dfn> of a character encoding is the
+  </div><h4 id="character-encodings"><span class="secno">2.1.6 </span>Character encodings</h4><p>The <dfn id="preferred-mime-name">preferred MIME name</dfn> of a character encoding is the
   name or alias labeled as "preferred MIME name" in the IANA
   <cite>Character Sets</cite> registry, if there is one, or the
   encoding's name, if none of the aliases are so labeled. <a href="references.html#refsIANACHARSET">[IANACHARSET]</a></p><p>An <dfn id="ascii-compatible-character-encoding">ASCII-compatible character encoding</dfn> is a
   single-byte or variable-length encoding in which the bytes 0x09,
   0x0A, 0x0C, 0x0D, 0x20 - 0x22, 0x26, 0x27, 0x2C - 0x3F, 0x41 - 0x5A,
-  and 0x61 - 0x7A<!-- is that list ok? do any character sets we want
-  to support do things outside that range?  -->, ignoring bytes that
+  and 0x61 - 0x7A, ignoring bytes that
   are the second and later bytes of multibyte sequences, all
   correspond to single-byte sequences that map to the same Unicode
   characters as those bytes in ANSI_X3.4-1968 (US-ASCII). <a href="references.html#refsRFC1345">[RFC1345]</a></p><p class="note">This includes such encodings as Shift_JIS,
   HZ-GB-2312, and variants of ISO-2022, even though it is possible in
   these encodings for bytes like 0x70 to be part of longer sequences
   that are unrelated to their interpretation as ASCII. It excludes
-  such encodings as UTF-7, UTF-16, GSM03.38, and EBCDIC variants.</p><!--
-   We'll have to change that if anyone comes up with a way to have a
-   document that is valid as two different encodings at once, with
-   different <meta charset> elements applying in each case.
-  --><p>The term <dfn title="">Unicode character</dfn> is used to mean a
+  such encodings as UTF-7, UTF-16, GSM03.38, and EBCDIC variants.</p><p>The term <dfn title="">Unicode character</dfn> is used to mean a
   <i title="">Unicode scalar value</i> (i.e. any Unicode code point
   that is not a surrogate code point). <a href="references.html#refsUNICODE">[UNICODE]</a></p><h3 id="conformance-requirements"><span class="secno">2.2 </span>Conformance requirements</h3><p>All diagrams, examples, and notes in this specification are
   non-normative, as are all sections explicitly marked non-normative.
-  Everything else in this specification is normative.</p><p>The key words "MUST", "MUST NOT", "REQUIRED", <!--"SHALL", "SHALL
-  NOT",--> "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and
+  Everything else in this specification is normative.</p><p>The key words "MUST", "MUST NOT", "REQUIRED",  "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and
   "OPTIONAL" in the normative parts of this document are to be
   interpreted as described in RFC2119. For readability, these words do
-  not appear in all uppercase letters in this specification. <a href="references.html#refsRFC2119">[RFC2119]</a></p><p class="impl">Requirements phrased in the imperative as part of
-  algorithms (such as "strip any leading space characters" or "return
-  false and abort these steps") are to be interpreted with the meaning
-  of the key word ("must", "should", "may", etc) used in introducing
-  the algorithm.</p><p>This specification describes the conformance criteria for <span class="impl">user agents (relevant to implementors) and</span>
+  not appear in all uppercase letters in this specification. <a href="references.html#refsRFC2119">[RFC2119]</a></p><div class="impl">
+
+  <p>Requirements phrased in the imperative as part of algorithms
+  (such as "strip any leading space characters" or "return false and
+  abort these steps") are to be interpreted with the meaning of the
+  key word ("must", "should", "may", etc) used in introducing the
+  algorithm.</p>
+
+  <p>Conformance requirements phrased as algorithms or specific steps
+  may be implemented in any manner, so long as the end result is
+  equivalent. (In particular, the algorithms defined in this
+  specification are intended to be easy to follow, and not intended to
+  be performant.)</p>
+
+  </div><div class="impl">
+
+  <h4 id="conformance-classes"><span class="secno">2.2.1 </span>Conformance classes</h4>
+
+  <p>This specification describes the conformance criteria for <span class="impl">user agents (relevant to implementors) and</span>
   documents<span class="impl"> (relevant to authors and authoring tool
-  implementors)</span>.</p><p><dfn id="conforming-documents">Conforming documents</dfn> are those that comply with all
+  implementors)</span>.</p>
+
+  <p><dfn id="conforming-html5-documents">Conforming
+  HTML5
+  documents</dfn> are those that comply with all
   the conformance criteria for documents. For readability, some of
   these conformance requirements are phrased as conformance
   requirements on authors; such requirements are implicitly
   requirements on documents: by definition, all documents are assumed
   to have had an author. (In some cases, that author may itself be a
   user agent &#x2014; such user agents are subject to additional rules,
-  as explained below.)</p><p class="example">For example, if a requirement states that
+  as explained below.)</p>
+
+  <p class="example">For example, if a requirement states that
   "authors must not use the <code title="">foobar</code> element", it
   would imply that documents are not allowed to contain elements named
-  <code title="">foobar</code>.</p><div class="impl">
+  <code title="">foobar</code>.</p>
 
+  <p class="note">the conformance requirements for documents include
+  syntax (the &lt;table&gt; element is conforming as a child of
+  &lt;body&gt;, but not as a child ot &lt;title&gt;), and semantics (the
+  &lt;table&gt; elements denotes a multi-dimensional data table, not a
+  piece of furniture).</p>
 
+  <p class="note impl">There is no implied relationship between
+  document conformance requirements and implementation conformance
+  requirements. User agents are not free to handle non-conformant
+  documents as they please; the processing model described in this
+  specification applies to implementations regardless of the
+  conformity of the input documents.</p>
 
   <p>User agents fall into several (overlapping) categories with
   different conformance requirements.</p>
@@ -624,6 +642,21 @@
 
    </dd>
 
+   <dt id="renderingUA">Visual user agents that support the suggested default rendering</dt>
+
+   <dd>
+
+    <p>User agents, whether interactive or not, may be designated
+    (possibly as a user option) as supporting the suggested default
+    rendering defined by this specification.</p>
+
+    <p>User agents that are designated as supporting the suggested
+    default rendering must implement the rules in <a href="rendering.html#rendering">the rendering section</a> that that section
+    defines as the behavior that user agents are <em>expected</em> to
+    implement.</p>
+
+   </dd>
+
    <dt><dfn id="non-scripted">User agents with no scripting support</dfn></dt>
 
    <dd>
@@ -643,6 +676,7 @@
 
    </dd>
 
+
    <dt>Conformance checkers</dt>
 
    <dd id="conformance-checkers">
@@ -699,6 +733,7 @@
     </div>
    </dd>
 
+
    <dt>Data mining tools</dt>
 
    <dd id="data-mining">
@@ -714,13 +749,16 @@
 
    </dd>
 
+
    <dt id="editors">Authoring tools and markup generators</dt>
 
    <dd>
 
     <p>Authoring tools and markup generators must generate
-    <a href="#conforming-documents">conforming documents</a>. Conformance criteria that apply
-    to authors also apply to authoring tools, where appropriate.</p>
+    <a href="#conforming-html5-documents">conforming
+    HTML5
+    documents</a>. Conformance criteria that apply to authors also
+    apply to authoring tools, where appropriate.</p>
 
     <p>Authoring tools are exempt from the strict requirements of
     using elements only for their specified purpose, but only to the
@@ -775,7 +813,31 @@
 
    </dd>
 
-  </dl><p>Some conformance requirements are phrased as requirements on
+  </dl><p id="hardwareLimitations">User agents may impose
+  implementation-specific limits on otherwise unconstrained inputs,
+  e.g. to prevent denial of service attacks, to guard against running
+  out of memory, or to work around platform-specific limitations.</p>
+
+  <p>For compatibility with existing content and prior specifications,
+  this specification describes two authoring formats: one based on XML
+  (referred to as <a href="the-xhtml-syntax.html#the-xhtml-syntax">the XHTML syntax</a>), and one using a <a href="syntax.html#writing">custom format</a> inspired by SGML (referred to as
+  <a href="syntax.html#syntax">the HTML syntax</a>). Implementations must support at least
+  one of these two formats, although supporting both is
+  encouraged.</p>
+
+  <p id="entity-references">The language in this specification assumes
+  that the user agent expands all entity references, and therefore
+  does not include entity reference nodes in the DOM. If user agents
+  do include entity reference nodes in the DOM, then user agents must
+  handle them as if they were fully expanded when implementing this
+  specification. For example, if a requirement talks about an
+  element's child text nodes, then any text nodes that are children of
+  an entity reference that is a child of that element would be used as
+  well. Entity references to unknown entities must be treated as if
+  they contained just an empty text node for the purposes of the
+  algorithms defined in this specification.</p>
+
+  <p>Some conformance requirements are phrased as requirements on
   elements, attributes, methods or objects. Such requirements fall
   into two categories: those describing content model restrictions,
   and those describing implementation behavior. Those in the former
@@ -787,41 +849,9 @@
   specification does not distinguish between conformance criteria on
   authors and conformance criteria on documents.)</p>
 
-  <p>Conformance requirements phrased as algorithms or specific steps
-  may be implemented in any manner, so long as the end result is
-  equivalent. (In particular, the algorithms defined in this
-  specification are intended to be easy to follow, and not intended to
-  be performant.)</p>
-
-  <p id="hardwareLimitations">User agents may impose
-  implementation-specific limits on otherwise unconstrained inputs,
-  e.g. to prevent denial of service attacks, to guard against running
-  out of memory, or to work around platform-specific limitations.</p>
-
-  </div><p class="note impl">There is no implied relationship between
-  document conformance requirements and implementation conformance
-  requirements. User agents are not free to handle non-conformant
-  documents as they please; the processing model described in this
-  specification applies to implementations regardless of the
-  conformity of the input documents.</p><p>For compatibility with existing content and prior specifications,
-  this specification describes two authoring formats: one based on XML
-  (referred to as <a href="the-xhtml-syntax.html#the-xhtml-syntax">the XHTML syntax</a>), and one using a <a href="syntax.html#writing">custom format</a> inspired by SGML (referred to as
-  <a href="syntax.html#syntax">the HTML syntax</a>). <span class="impl">Implementations
-  must support at least one of these two formats, although supporting
-  both is encouraged.</span></p><p class="impl" id="entity-references">The language in this
-  specification assumes that the user agent expands all entity
-  references, and therefore does not include entity reference nodes in
-  the DOM. If user agents do include entity reference nodes in the
-  DOM, then user agents must handle them as if they were fully
-  expanded when implementing this specification. For example, if a
-  requirement talks about an element's child text nodes, then any text
-  nodes that are children of an entity reference that is a child of
-  that element would be used as well. Entity references to unknown
-  entities must be treated as if they contained just an empty text
-  node for the purposes of the algorithms defined in this
-  specification.</p><div class="impl">
+  </div><div class="impl">
 
-  <h4 id="dependencies"><span class="secno">2.2.1 </span>Dependencies</h4>
+  <h4 id="dependencies"><span class="secno">2.2.2 </span>Dependencies</h4>
 
   <p>This specification relies on several other underlying
   specifications.</p>
@@ -1020,7 +1050,7 @@
   requirements on character encodings, image formats, audio formats,
   and video formats in the respective sections.</p>
 
-  </div><h4 id="extensibility"><span class="secno">2.2.2 </span>Extensibility</h4><p>HTML has a wide number of extensibility mechanisms that can be
+  </div><h4 id="extensibility"><span class="secno">2.2.3 </span>Extensibility</h4><p>HTML has a wide number of extensibility mechanisms that can be
   used for adding semantics in a safe manner:</p><ul><li>Authors can use the <code title="attr-class"><a href="elements.html#classes">class</a></code>
    attribute to extend elements, effectively creating their own
    elements, while using the most applicable existing "real" HTML
@@ -1117,7 +1147,7 @@
 
   <div class="example">
 
-   <p>For example, if a user agent called "Pleas<!--e h-->old" were to
+   <p>For example, if a user agent called "Pleasold" were to
    add an event to indicate when the user is going up in an elevator,
    it could use the prefix "<code title="">pleasold</code>" and thus
    name the event "<code title="">pleasoldgoingup</code>", possibly
@@ -1127,7 +1157,7 @@
 
   <p>All extensions must be defined so that the use of extensions
   neither contradicts nor causes the non-conformance of functionality
-  defined in the specification.</p> <!-- thanks to QA Framework -->
+  defined in the specification.</p> 
 
   <div class="example">
 
@@ -1154,19 +1184,40 @@
   specification to their activities decides that they will recognize
   the requirements of such an extension specification, it becomes an
   <dfn id="other-applicable-specifications" title="other applicable specifications">applicable
-  specification</dfn> for the purposes of conformance requirements in
-  this specification.</p>
-  <!-- http://www.w3.org/mid/17E341CD-E790-422C-9F9A-69347EE01CEB@iki.fi -->
+  specification</dfn>.
 
-  <p class="note">Someone could write a specification that defines any
-  arbitrary byte stream as conforming, and then claim that their
-  random junk is conforming. However, that does not mean that their
-  random junk actually is conforming for everyone's purposes: if
-  someone else decides that that specification does not apply to their
-  work, then they can quite legitimately say that the aforementioned
-  random junk is just that, junk, and not conforming at all. As far as
-  conformance goes, what matters in a particular community is what
-  that community <em>agrees</em> is applicable.</p>
+  </p><p>The conformance terminology for documents depends on the nature
+  of the changes introduced by such applicable specificactions, and on
+  the content and intended interpretation of the document. Applicable
+  specifications MAY define new document content (e.g. a foobar
+  element), MAY prohibit certain otherwise conforming content (e.g.
+  prohibit use of &lt;table&gt;s), or MAY change the semantics, DOM
+  mappings, or other processing rules for content defined in this
+  specification. Whether a document is or is not a <a href="#conforming-documents">conforming HTML5 document</a> does not
+  depend on the use of applicable specifications: if the syntax and
+  semantics of a given <a href="#conforming-documents">conforming
+  HTML5 document </a>document is unchanged by the use of applicable
+  specification(s), then that document remains a <a href="#conforming-documents">conforming HTML5 document</a>. If the
+  semantics or processing of a given (otherwise conforming) document
+  is changed by use of applicable specification(s), then it is not a
+  <a href="#conforming-documents">conforming HTML5 document</a>. For
+  such cases, the applicable specifications SHOULD define conformance
+  terminology.</p>
+
+  <p class="note">As a suggested but not required convention, such
+  specifications might define conformance terminology such as:
+  "Conforming HTML5+XXX document", where XXX is a short
+  name for the applicable specification. (Example: "Conforming
+  HTML5+AutomotiveExtensions document").</p>
+ 
+  <p class="note">a consequence of the rule given above is that
+  certain syntactically correct HTML5 documents may not be <a href="#conforming-documents">conforming HTML5 documents</a> in the
+  presence of applicable specifications. (Example: the applicable
+  specification defines &lt;table&gt; to be a piece of furniture &#x2014;
+  a document written to that specification and containing a &lt;table&gt;
+  element is NOT a <a href="#conforming-documents">conforming HTML5
+  document</a>, even if the element happens to be syntactically
+  correct HTML5.)</p>
 
   <hr/><p>User agents must treat elements and attributes that they do not
   understand as semantically neutral; leaving them in the DOM (for DOM
@@ -1221,39 +1272,47 @@
 
   </p><dl class="switch"><dt>One byte in the range FE to FF</dt>
 
+
    <dt><a href="#overlong-form" title="overlong form">Overlong forms</a> (e.g. F0 80 80 A0)</dt>
 
-   <dt>One byte in the range C0 to C1, followed by one byte in the range 80 to BF</dt>
+   <dt>One byte in the range C0 to C1, followed by one byte in the range 80 to BF</dt> 
+
 
    <dt>One byte in the range F0 to F4, followed by three bytes in the range 80 to BF that represent a code point above U+10FFFF</dt>
 
-   <dt>One byte in the range F5 to F7, followed by three bytes in the range 80 to BF</dt>
+   <dt>One byte in the range F5 to F7, followed by three bytes in the range 80 to BF</dt> 
 
-   <dt>One byte in the range F8 to FB, followed by four bytes in the range 80 to BF</dt>
+   <dt>One byte in the range F8 to FB, followed by four bytes in the range 80 to BF</dt> 
 
-   <dt>One byte in the range FC to FD, followed by five bytes in the range 80 to BF</dt>
+   <dt>One byte in the range FC to FD, followed by five bytes in the range 80 to BF</dt> 
 
-   <dt>One byte in the range E0 to FD, followed by a byte in the range 80 to BF, not followed by a byte in the range 80 to BF</dt>
 
-   <dt>One byte in the range F0 to FD, followed by two bytes in the range 80 to BF, not followed by a byte in the range 80 to BF</dt>
+   <dt>One byte in the range C0 to FD that is not followed by a byte in the range 80 to BF</dt> 
 
-   <dt>One byte in the range F5 to FD, followed by three bytes in the range 80 to BF, not followed by a byte in the range 80 to BF</dt>
+   <dt>One byte in the range E0 to FD, followed by a byte in the range 80 to BF that is not followed by a byte in the range 80 to BF</dt> 
 
-   <dt>One byte in the range FC to FD, followed by four bytes in the range 80 to BF, not followed by a byte in the range 80 to BF</dt>
+   <dt>One byte in the range F0 to FD, followed by two bytes in the range 80 to BF, the last of which is not followed by a byte in the range 80 to BF</dt> 
 
+   <dt>One byte in the range F8 to FD, followed by three bytes in the range 80 to BF, the last of which is not followed by a byte in the range 80 to BF</dt> 
 
-   <dd>The whole sequence must be replaced by a single U+FFFD
+   <dt>One byte in the range FC to FD, followed by four bytes in the range 80 to BF, the last of which is not followed by a byte in the range 80 to BF</dt> 
+
+
+   <dt>Any byte sequence that represents a code point in the range U+D800 to U+DFFF</dt> 
+
+
+   <dd>The whole matched sequence must be replaced by a single U+FFFD
    REPLACEMENT CHARACTER.</dd>
 
 
    <dt>One byte in the range 80 to BF not preceded by a byte in the range 80 to FD</dt>
 
-   <dt>A sequence of bytes in the range 80 to BF that does not follow a byte in the range C0 to FD</dt>
+   <dt>One byte in the range 80 to BF preceded by a byte that is part of a complete UTF-8 sequence that does not include this byte</dt>
 
-   <dt>One byte in the range C0 to FD not followed by a byte in the range 80 to BF</dt>
+   <dt>One byte in the range 80 to BF preceded by a byte that is part of a sequence that has been replaced by a U+FFFD REPLACEMENT CHARACTER, either alone or as port of a sequence</dt>
 
+   <dd>Each such byte must be replaced with a U+FFFD REPLACEMENT CHARACTER.</dd>
 
-   <dd>Each byte must be replaced with a U+FFFD REPLACEMENT CHARACTER.</dd>
 
   </dl><p>For the purposes of the above requirements, an <dfn id="overlong-form">overlong
   form</dfn> in UTF-8 is a sequence that encodes a code point using

Index: text-level-semantics.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/text-level-semantics.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- text-level-semantics.html	25 Feb 2011 07:05:30 -0000	1.7
+++ text-level-semantics.html	30 Apr 2011 11:35:46 -0000	1.8
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>4.6 Text-level semantics &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -350,7 +346,7 @@
    <a href="spec.html#contents">Table of contents</a> &#x2013;
    <a href="edits.html" class="next">4.7 Edits</a>
   <ol class="toc"><li><ol><li><a href="text-level-semantics.html#text-level-semantics"><span class="secno">4.6 </span>Text-level semantics</a>
-    <ol><li><a href="text-level-semantics.html#the-a-element"><span class="secno">4.6.1 </span>The <code>a</code> element</a></li><li><a href="text-level-semantics.html#the-em-element"><span class="secno">4.6.2 </span>The <code>em</code> element</a></li><li><a href="text-level-semantics.html#the-strong-element"><span class="secno">4.6.3 </span>The <code>strong</code> element</a></li><li><a href="text-level-semantics.html#the-small-element"><span class="secno">4.6.4 </span>The <code>small</code> element</a></li><li><a href="text-level-semantics.html#the-s-element"><span class="secno">4.6.5 </span>The <code>s</code> element</a></li><li><a href="text-level-semantics.html#the-cite-element"><span class="secno">4.6.6 </span>The <code>cite</code> element</a></li><li><a href="text-level-semantics.html#the-q-element"><span class="secno">4.6.7 </span>The <code>q</code> element</a></li><li><a href="text-level-semantics.html#the-dfn-element"><span class="secno">4.6.8 </span>The <code>dfn</code> element</a></li><li><a href="text-level-semantics.html#the-abbr-element"><span class="secno">4.6.9 </span>The <code>abbr</code> element</a></li><li><a href="text-level-semantics.html#the-time-element"><span class="secno">4.6.10 </span>The <code>time</code> element</a></li><li><a href="text-level-semantics.html#the-code-element"><span class="secno">4.6.11 </span>The <code>code</code> element</a></li><li><a href="text-level-semantics.html#the-var-element"><span class="secno">4.6.12 </span>The <code>var</code> element</a></li><li><a href="text-level-semantics.html#the-samp-element"><span class="secno">4.6.13 </span>The <code>samp</code> element</a></li><li><a href="text-level-semantics.html#the-kbd-element"><span class="secno">4.6.14 </span>The <code>kbd</code> element</a></li><li><a href="text-level-semantics.html#the-sub-and-sup-elements"><span class="secno">4.6.15 </span>The <code>sub</code> and <code>sup</code> elements</a></li><li><a href="text-level-semantics.html#the-i-element"><span class="secno">4.6.16 </span>The <code>i</code> element</a></li><li><a href="text-level-semantics.html#the-b-element"><span class="secno">4.6.17 </span>The <code>b</code> element</a></li><li><a href="text-level-semantics.html#the-mark-element"><span class="secno">4.6.18 </span>The <code>mark</code> element</a></li><li><a href="text-level-semantics.html#the-ruby-element"><span class="secno">4.6.19 </span>The <code>ruby</code> element</a></li><li><a href="text-level-semantics.html#the-rt-element"><span class="secno">4.6.20 </span>The <code>rt</code> element</a></li><li><a href="text-level-semantics.html#the-rp-element"><span class="secno">4.6.21 </span>The <code>rp</code> element</a></li><li><a href="text-level-semantics.html#the-bdi-element"><span class="secno">4.6.22 </span>The <code>bdi</code> element</a></li><li><a href="text-level-semantics.html#the-bdo-element"><span class="secno">4.6.23 </span>The <code>bdo</code> element</a></li><li><a href="text-level-semantics.html#the-span-element"><span class="secno">4.6.24 </span>The <code>span</code> element</a></li><li><a href="text-level-semantics.html#the-br-element"><span class="secno">4.6.25 </span>The <code>br</code> element</a></li><li><a href="text-level-semantics.html#the-wbr-element"><span class="secno">4.6.26 </span>The <code>wbr</code> element</a></li><li><a href="text-level-semantics.html#usage-summary"><span class="secno">4.6.27 </span>Usage summary</a></li></ol></li></ol></li></ol></div><h3 id="text-level-semantics"><span class="secno">4.6 </span>Text-level semantics</h3><h4 id="the-a-element"><span class="secno">4.6.1 </span>The <dfn><code>a</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
+    <ol><li><a href="text-level-semantics.html#the-a-element"><span class="secno">4.6.1 </span>The <code>a</code> element</a></li><li><a href="text-level-semantics.html#the-em-element"><span class="secno">4.6.2 </span>The <code>em</code> element</a></li><li><a href="text-level-semantics.html#the-strong-element"><span class="secno">4.6.3 </span>The <code>strong</code> element</a></li><li><a href="text-level-semantics.html#the-small-element"><span class="secno">4.6.4 </span>The <code>small</code> element</a></li><li><a href="text-level-semantics.html#the-s-element"><span class="secno">4.6.5 </span>The <code>s</code> element</a></li><li><a href="text-level-semantics.html#the-cite-element"><span class="secno">4.6.6 </span>The <code>cite</code> element</a></li><li><a href="text-level-semantics.html#the-q-element"><span class="secno">4.6.7 </span>The <code>q</code> element</a></li><li><a href="text-level-semantics.html#the-dfn-element"><span class="secno">4.6.8 </span>The <code>dfn</code> element</a></li><li><a href="text-level-semantics.html#the-abbr-element"><span class="secno">4.6.9 </span>The <code>abbr</code> element</a></li><li><a href="text-level-semantics.html#the-time-element"><span class="secno">4.6.10 </span>The <code>time</code> element</a></li><li><a href="text-level-semantics.html#the-code-element"><span class="secno">4.6.11 </span>The <code>code</code> element</a></li><li><a href="text-level-semantics.html#the-var-element"><span class="secno">4.6.12 </span>The <code>var</code> element</a></li><li><a href="text-level-semantics.html#the-samp-element"><span class="secno">4.6.13 </span>The <code>samp</code> element</a></li><li><a href="text-level-semantics.html#the-kbd-element"><span class="secno">4.6.14 </span>The <code>kbd</code> element</a></li><li><a href="text-level-semantics.html#the-sub-and-sup-elements"><span class="secno">4.6.15 </span>The <code>sub</code> and <code>sup</code> elements</a></li><li><a href="text-level-semantics.html#the-i-element"><span class="secno">4.6.16 </span>The <code>i</code> element</a></li><li><a href="text-level-semantics.html#the-b-element"><span class="secno">4.6.17 </span>The <code>b</code> element</a></li><li><a href="text-level-semantics.html#the-u-element"><span class="secno">4.6.18 </span>The <code>u</code> element</a></li><li><a href="text-level-semantics.html#the-mark-element"><span class="secno">4.6.19 </span>The <code>mark</code> element</a></li><li><a href="text-level-semantics.html#the-ruby-element"><span class="secno">4.6.20 </span>The <code>ruby</code> element</a></li><li><a href="text-level-semantics.html#the-rt-element"><span class="secno">4.6.21 </span>The <code>rt</code> element</a></li><li><a href="text-level-semantics.html#the-rp-element"><span class="secno">4.6.22 </span>The <code>rp</code> element</a></li><li><a href="text-level-semantics.html#the-bdi-element"><span class="secno">4.6.23 </span>The <code>bdi</code> element</a></li><li><a href="text-level-semantics.html#the-bdo-element"><span class="secno">4.6.24 </span>The <code>bdo</code> element</a></li><li><a href="text-level-semantics.html#the-span-element"><span class="secno">4.6.25 </span>The <code>span</code> element</a></li><li><a href="text-level-semantics.html#the-br-element"><span class="secno">4.6.26 </span>The <code>br</code> element</a></li><li><a href="text-level-semantics.html#the-wbr-element"><span class="secno">4.6.27 </span>The <code>wbr</code> element</a></li><li><a href="text-level-semantics.html#usage-summary"><span class="secno">4.6.28 </span>Usage summary</a></li></ol></li></ol></li></ol></div><h3 id="text-level-semantics"><span class="secno">4.6 </span>Text-level semantics</h3><h4 id="the-a-element"><span class="secno">4.6.1 </span>The <dfn><code>a</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
    <dd><a href="content-models.html#flow-content">Flow content</a>.</dd>
    <dd>When the element only contains <a href="content-models.html#phrasing-content">phrasing content</a>: <a href="content-models.html#phrasing-content">phrasing content</a>.</dd>
    <dd><a href="content-models.html#interactive-content">Interactive content</a>.</dd>
@@ -392,11 +388,7 @@
    </dd>
   </dl><p>If the <code><a href="#the-a-element">a</a></code> element has an <code title="attr-hyperlink-href"><a href="links.html#attr-hyperlink-href">href</a></code> attribute, then it
   <a href="rendering.html#represents">represents</a> a <a href="links.html#hyperlink">hyperlink</a> (a hypertext
-  anchor).</p><!-- v2: Eric Meyer requests the ability to nest links so that a big
-  hyperlink, e.g. representing a calendar event, can be clickable,
-  while within it there are subareas that represent links to distinct
-  areas, e.g. a link to see photos of the event, or to edit the event,
-  or some such. --><p>If the <code><a href="#the-a-element">a</a></code> element has no <code title="attr-hyperlink-href"><a href="links.html#attr-hyperlink-href">href</a></code> attribute, then the element
+  anchor).</p><p>If the <code><a href="#the-a-element">a</a></code> element has no <code title="attr-hyperlink-href"><a href="links.html#attr-hyperlink-href">href</a></code> attribute, then the element
   <a href="rendering.html#represents">represents</a> a placeholder for where a link might
   otherwise have been placed, if it had been relevant.</p><p>The <code title="attr-hyperlink-target"><a href="links.html#attr-hyperlink-target">target</a></code>,
   <code title="attr-hyperlink-rel"><a href="links.html#attr-hyperlink-rel">rel</a></code>, <code title="attr-hyperlink-media"><a href="links.html#attr-hyperlink-media">media</a></code>, <code title="attr-hyperlink-hreflang"><a href="links.html#attr-hyperlink-hreflang">hreflang</a></code>, and <code title="attr-hyperlink-type"><a href="links.html#attr-hyperlink-type">type</a></code> attributes must be omitted
@@ -440,7 +432,7 @@
    event is an <code><a href="embedded-content-1.html#the-img-element">img</a></code> element with an <code title="attr-img-ismap"><a href="embedded-content-1.html#attr-img-ismap">ismap</a></code> attribute specified, then
    server-side image map processing must be performed, as follows:</p>
 
-    <ol><!-- http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20html%3E%0A...%3Ca%20href%3D%22%23%22%3E%3Cimg%20ismap%20usemap%3D%22%23a%22%20src%3D/resources/images/smallcats%3E%3C/a%3E%0A%3Cmap%20name%3Da%3E%3Carea%20shape%3Drect%20coords%3D0%2C0%2C50%2C50%20href%3Db%3E%3C/map%3E --><li>If the <code title="event-click"><a href="infrastructure.html#event-click">click</a></code> event was a
+    <ol><li>If the <code title="event-click"><a href="infrastructure.html#event-click">click</a></code> event was a
      real pointing-device-triggered <code title="event-click"><a href="infrastructure.html#event-click">click</a></code> event on the <code><a href="embedded-content-1.html#the-img-element">img</a></code>
      element, then let <var title="">x</var> be the distance in CSS
      pixels from the left edge of the image's left border, if it has
@@ -595,17 +587,7 @@
    importance; for that purpose, the <code><a href="#the-strong-element">strong</a></code> element is
    more appropriate.</p>
 
-   <!--
-
-    Thus the following is a bad use of <em>:
-
-      <p><em>Note</em>: ...</p>
-
-    You should use <strong> or <i> for this instead (depending on
-    exactly what you're doing).
-
-   -->
-
+   
   </div><h4 id="the-strong-element"><span class="secno">4.6.3 </span>The <dfn><code>strong</code></dfn> element</h4><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>
@@ -626,7 +608,7 @@
   sentence.</p><div class="example">
    <p>Here is an example of a warning notice in a game, with the
    various parts marked up according to how important they are:</p>
-   <!-- DO NOT REFLOW THIS EXAMPLE it has been carefully balanced -->
+   
    <pre>&lt;p&gt;&lt;strong&gt;Warning.&lt;/strong&gt; This dungeon is dangerous.
 &lt;strong&gt;Avoid the ducks.&lt;/strong&gt; Take any gold you find.
 &lt;strong&gt;&lt;strong&gt;Do not take any of the diamonds&lt;/strong&gt;,
@@ -767,11 +749,7 @@
   gossip article where the names of famous people are keywords
   rendered with a different style to draw attention to them. In other
   cases, if an element is <em>really</em> needed, the
-  <code><a href="#the-span-element">span</a></code> element can be used.)</p><!--(some people argue a ship is a work)
-  <p>A ship is similarly not a work, and the element must not be used
-  to mark up ship names (the <code>i</code> element can be used for
-  that purpose).</p>
---><div class="example">
+  <code><a href="#the-span-element">span</a></code> element can be used.)</p><div class="example">
 
    <p>This next example shows a typical use of the <code><a href="#the-cite-element">cite</a></code>
    element:</p>
@@ -930,7 +908,7 @@
   element is an <code><a href="#the-abbr-element">abbr</a></code> element with a <code title="attr-abbr-title"><a href="#attr-abbr-title">title</a></code> attribute, then the exact value
   of <em>that</em> attribute is the term being defined. Otherwise, it
   is the exact <code><a href="infrastructure.html#textcontent">textContent</a></code> of the <code><a href="#the-dfn-element">dfn</a></code>
-  element that gives the term being defined.</p><!-- note that this means <dfn>x \n x</dfn> won't match <span>x x</span> --><p>If the <code title="attr-dfn-title"><a href="#attr-dfn-title">title</a></code> attribute of the
+  element that gives the term being defined.</p><p>If the <code title="attr-dfn-title"><a href="#attr-dfn-title">title</a></code> attribute of the
   <code><a href="#the-dfn-element">dfn</a></code> element is present, then it must contain only the
   term being defined.</p><p class="note">The <code title="attr-title"><a href="elements.html#the-title-attribute">title</a></code> attribute
   of ancestor elements does not affect <code><a href="#the-dfn-element">dfn</a></code> elements.</p><p>An <code><a href="#the-a-element">a</a></code> element that links to a <code><a href="#the-dfn-element">dfn</a></code>
@@ -1071,13 +1049,7 @@
   offset. <a href="references.html#refsGREGORIAN">[GREGORIAN]</a></p><p>This element is intended as a way to encode modern dates and
   times in a machine-readable way so that, for example, user agents
   can offer to add birthday reminders or scheduled events to the
-  user's calendar.</p><!-- it's also intended for restyling to local conventions
-  (2000-12-31 vs 31-12-2000 vs 12-31-2000), but CSS doesn't support
-  that yet. Once CSS does support that, we should update this to also
-  support year and year-month cases, since in Japanese those need
-  special styling also. See #2 in:
-     http://lists.whatwg.org/htdig.cgi/whatwg-whatwg.org/2010-August/028025.html
-  ...for details. --><div class="note">
+  user's calendar.</p><div class="note">
 
    <p>The <code><a href="#the-time-element">time</a></code> element is not intended for encoding times
    for which a precise date or time cannot be established. For
@@ -1151,7 +1123,8 @@
    dates or times. In the following snippet, the time is encoded using
    <code><a href="#the-time-element">time</a></code>, so that it can be restyled (e.g. using XBL2) to
    match local conventions, while the year is not marked up at all,
-   since marking it up would not be particularly useful.</p>
+   since marking it up would not be particularly useful, and doing so
+   is thus not allowed.</p>
 
    <pre>&lt;p&gt;I usually have a snack at &lt;time&gt;16:00&lt;/time&gt;.&lt;/p&gt;
 &lt;p&gt;I've liked model trains since at least 1983.&lt;/p&gt;</pre>
@@ -1235,10 +1208,7 @@
    <dd>The null value.</dd>
 
   </dl><p>When a <code>Date</code> object is to be returned, a new one must
-  be constructed.</p> <!-- yes, this means .valueAsDate !=
-  .valueAsDate, but the object is mutable, so it'd be weird if we
-  didn't do that -->
-
+  be constructed.</p> 
   </div><div class="example">
 
    <p>In the following snippet:</p>
@@ -1248,7 +1218,7 @@
    <p>...the <code><a href="#the-time-element">time</a></code> element's <code title="dom-time-valueAsDate"><a href="#dom-time-valueasdate">valueAsDate</a></code> attribute would
    have the value 1,158,969,600,000ms.</p>
 
-  </div><!-- <pre>&lt;p>We stopped talking at &lt;time datetime="2006-09-24T05:00-07:00">5am the next morning&lt;/time>.&lt;/p></pre> --><div class="example">
+  </div><div class="example">
 
    <p>In the following snippet:</p>
 
@@ -1508,9 +1478,9 @@
   </dl><p>The <code><a href="#the-i-element">i</a></code> element <a href="rendering.html#represents">represents</a> a span of text
   in an alternate voice or mood, or otherwise offset from the normal
   prose, such as a taxonomic designation, a technical term, an
-  idiomatic phrase from another language, a thought, a ship name, or
-  some other prose whose typical typographic presentation is
-  italicized.</p><p>Terms in languages different from the main text should be
+  idiomatic phrase from another language, a thought, a ship name in
+  Western texts, or some other prose whose typical typographic
+  presentation is italicized.</p><p>Terms in languages different from the main text should be
   annotated with <code title="attr-lang"><a href="elements.html#attr-lang">lang</a></code> attributes (or,
   in XML, <a href="elements.html#attr-xml-lang" title="attr-xml-lang"><code title="">lang</code>
   attributes in the <span>XML namespace</span></a>).</p><div class="example">
@@ -1594,7 +1564,7 @@
   </div><p class="note">Style sheets can be used to format <code><a href="#the-b-element">b</a></code>
   elements, just like any other element can be restyled. Thus, it is
   not the case that content in <code><a href="#the-b-element">b</a></code> elements will
-  necessarily be boldened.</p><h4 id="the-mark-element"><span class="secno">4.6.18 </span>The <dfn><code>mark</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
+  necessarily be boldened.</p><h4 id="the-u-element"><span class="secno">4.6.18 </span>The <dfn><code>u</code></dfn> element</h4><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>
    <dt>Contexts in which this element can be used:</dt>
@@ -1605,7 +1575,34 @@
    <dd><a href="elements.html#global-attributes">Global attributes</a></dd>
    <dt>DOM interface:</dt>
    <dd>Uses <code><a href="elements.html#htmlelement">HTMLElement</a></code>.</dd>
-  </dl><!-- v2: attribute that means "highlight this on the scrollbar" --><p>The <code><a href="#the-mark-element">mark</a></code> element <a href="rendering.html#represents">represents</a> a run of
+  </dl><p>The <code><a href="#the-u-element">u</a></code> element <a href="rendering.html#represents">represents</a> a span of text
+  with an unarticulated, though explicitly rendered, non-textual
+  annotation, such as labeling the text as being a proper name in
+  Chinese text (a Chinese proper name mark), or labeling the text as
+  being misspelt.</p><p>In most cases, another element is likely to be more appropriate:
+  for marking stress emphasis, the <code><a href="#the-em-element">em</a></code> element should be
+  used; for marking key words or phrases either the <code><a href="#the-b-element">b</a></code>
+  element or the <code><a href="#the-mark-element">mark</a></code> element should be used, depending
+  on the context; for marking book titles, the <code><a href="#the-cite-element">cite</a></code>
+  element should be used; for labeling text with explicit textual
+  annotations, the <code><a href="#the-ruby-element">ruby</a></code> element should be used; for
+  labeling ship names in Western texts, the <code><a href="#the-i-element">i</a></code> element
+  should be used.</p><p class="note">The default rendering of the <code><a href="#the-u-element">u</a></code> element
+  in visual presentations clashes with the conventional rendering of
+  hyperlinks (underlining). Authors are encouraged to avoid using the
+  <code><a href="#the-u-element">u</a></code> element where it could be confused for a
+  hyperlink.</p><h4 id="the-mark-element"><span class="secno">4.6.19 </span>The <dfn><code>mark</code></dfn> element</h4><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>
+   <dt>Contexts in which this element can be used:</dt>
+   <dd>Where <a href="content-models.html#phrasing-content">phrasing content</a> is expected.</dd>
+   <dt>Content model:</dt>
+   <dd><a href="content-models.html#phrasing-content">Phrasing content</a>.</dd>
+   <dt>Content attributes:</dt>
+   <dd><a href="elements.html#global-attributes">Global attributes</a></dd>
+   <dt>DOM interface:</dt>
+   <dd>Uses <code><a href="elements.html#htmlelement">HTMLElement</a></code>.</dd>
+  </dl><p>The <code><a href="#the-mark-element">mark</a></code> element <a href="rendering.html#represents">represents</a> a run of
   text in one document marked or highlighted for reference purposes,
   due to its relevance in another context. When used in a quotation or
   other block of text referred to from the prose, it indicates a
@@ -1625,6 +1622,9 @@
 &lt;/blockquote&gt;
 &lt;p lang="en-US"&gt;As we can tell from the &lt;em&gt;spelling&lt;/em&gt; of the word,
 the person writing this quote is clearly not American.&lt;/p&gt;</pre>
+   <p>(If the goal was to mark the element as misspelt, however, the
+   <code><a href="#the-u-element">u</a></code> element, possibly with a class, would be more
+   appropriate.</p>
   </div><div class="example">
 
    <p>Another example of the <code><a href="#the-mark-element">mark</a></code> element is highlighting
@@ -1724,7 +1724,7 @@
 &lt;p&gt;&lt;mark&gt;An obstruction in a gate will prevent it from accepting a
 wormhole connection.&lt;/mark&gt;&lt;/p&gt;</pre>
 
-  </div><h4 id="the-ruby-element"><span class="secno">4.6.19 </span>The <dfn><code>ruby</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
+  </div><h4 id="the-ruby-element"><span class="secno">4.6.20 </span>The <dfn><code>ruby</code></dfn> element</h4><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>
    <dt>Contexts in which this element can be used:</dt>
@@ -1746,8 +1746,8 @@
   phrasing content have associated annotations created using the
   <code><a href="#the-rt-element">rt</a></code> element.</p><div class="example">
 
-   <!-- this is the hiragana for the word "kanji" ("chinese character") in japanese -->
-   <!-- in japanese, ruby-like typography is called "furigana" -->
+   
+   
 
    <p>In this example, each ideograph in the Japanese text <span lang="ja" title="">&#x6F22;&#x5B57;</span> is annotated with its
    reading in hiragana.</p>
@@ -1762,7 +1762,7 @@
 
   </div><div class="example">
 
-   <!-- this is the bopomofo for the word "hanzi" ("chinese character") in traditional chinese, as used in taiwan -->
+   
 
    <p>In this example, each ideograph in the traditional Chinese text
    <span lang="zh-TW" title="">&#x6F22;&#x5B57;</span> is annotated
@@ -1776,7 +1776,7 @@
 
   </div><div class="example">
 
-   <!-- this is the pinyin for the word "hanzi" ("chinese character") in simplified chinese, as used in mainland china -->
+   
 
    <p>In this example, each ideograph in the simplified Chinese text
    <span lang="zh-CN" title="">&#x6C49;&#x5B57;</span> is annotated
@@ -1788,7 +1788,7 @@
 
    <p><img alt="The two main ideographs, each with its pinyin annotation rendered in a smaller font above it." height="79" src="http://dev.w3.org/html5/spec/images/sample-ruby-pinyin.png" width="173"/></p>
 
-  </div><!-- Note: Examples are 32px/16px Stone Sans Sem ITC TT --><h4 id="the-rt-element"><span class="secno">4.6.20 </span>The <dfn><code>rt</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
+  </div><h4 id="the-rt-element"><span class="secno">4.6.21 </span>The <dfn><code>rt</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
    <dd>None.</dd>
    <dt>Contexts in which this element can be used:</dt>
    <dd>As a child of a <code><a href="#the-ruby-element">ruby</a></code> element.</dd>
@@ -1809,16 +1809,12 @@
   <code><a href="#the-ruby-element">ruby</a></code> element represents the same thing as its
   children.</p>
 
-  </div><h4 id="the-rp-element"><span class="secno">4.6.21 </span>The <dfn><code>rp</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
+  </div><h4 id="the-rp-element"><span class="secno">4.6.22 </span>The <dfn><code>rp</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
    <dd>None.</dd>
    <dt>Contexts in which this element can be used:</dt>
    <dd>As a child of a <code><a href="#the-ruby-element">ruby</a></code> element, either immediately before or immediately after an <code><a href="#the-rt-element">rt</a></code> element.</dd>
    <dt>Content model:</dt>
    <dd><a href="content-models.html#phrasing-content">Phrasing content</a>.</dd>
-<!--
-   <dd>If the <code>rp</code> element is immediately after an <code>rt</code> element that is immediately preceded by another <code>rp</code> element: a single character from Unicode character class Pe.</dd>
-   <dd>Otherwise: a single character from Unicode character class Ps.</dd>
--->
    <dt>Content attributes:</dt>
    <dd><a href="elements.html#global-attributes">Global attributes</a></dd>
    <dt>DOM interface:</dt>
@@ -1849,7 +1845,7 @@
 
    <pre lang="ja">... &#x6F22; (&#x304B;&#x3093;) &#x5B57; (&#x3058;) ...</pre>
 
-  </div><h4 id="the-bdi-element"><span class="secno">4.6.22 </span>The <dfn><code>bdi</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
+  </div><h4 id="the-bdi-element"><span class="secno">4.6.23 </span>The <dfn><code>bdi</code></dfn> element</h4><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>
    <dt>Contexts in which this element can be used:</dt>
@@ -1902,7 +1898,7 @@
  &lt;li&gt;User &lt;bdi&gt;<bdo dir="rtl">&#x625;&#x64A;&#x627;&#x646;</bdo>&lt;/bdi&gt;: 3 posts.
 &lt;/ul&gt;</pre>
 
-  </div><h4 id="the-bdo-element"><span class="secno">4.6.23 </span>The <dfn><code>bdo</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
+  </div><h4 id="the-bdo-element"><span class="secno">4.6.24 </span>The <dfn><code>bdo</code></dfn> element</h4><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>
    <dt>Contexts in which this element can be used:</dt>
@@ -1942,7 +1938,7 @@
   these requirements by implementing the CSS 'unicode-bidi' property.
   <a href="references.html#refsCSS">[CSS]</a></p>
 
-  </div><h4 id="the-span-element"><span class="secno">4.6.24 </span>The <dfn><code>span</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
+  </div><h4 id="the-span-element"><span class="secno">4.6.25 </span>The <dfn><code>span</code></dfn> element</h4><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>
    <dt>Contexts in which this element can be used:</dt>
@@ -1964,7 +1960,7 @@
    <code><a href="#the-span-element">span</a></code> elements and <code title="attr-class"><a href="elements.html#classes">class</a></code> attributes so that its keywords and
    identifiers can be color-coded from CSS:</p>
 
-   <!-- extract from http://www.cs.cmu.edu/~dst/DeCSS/Gallery/vlc-dvd_css-c.txt -->
+   
 
    <pre>&lt;pre&gt;&lt;code class="lang-c"&gt;&lt;span class="keyword"&gt;for&lt;/span&gt; (&lt;span class="ident"&gt;j&lt;/span&gt; = 0; &lt;span class="ident"&gt;j&lt;/span&gt; &amp;lt; 256; &lt;span class="ident"&gt;j&lt;/span&gt;++) {
   &lt;span class="ident"&gt;i_t3&lt;/span&gt; = (&lt;span class="ident"&gt;i_t3&lt;/span&gt; &amp; 0x1ffff) | (&lt;span class="ident"&gt;j&lt;/span&gt; &amp;lt;&amp;lt; 17);
@@ -1973,7 +1969,7 @@
     &lt;span class="keyword"&gt;break&lt;/span&gt;;
 }&lt;/code&gt;&lt;/pre&gt;</pre>
 
-  </div><h4 id="the-br-element"><span class="secno">4.6.25 </span>The <dfn><code>br</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
+  </div><h4 id="the-br-element"><span class="secno">4.6.26 </span>The <dfn><code>br</code></dfn> element</h4><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>
    <dt>Contexts in which this element can be used:</dt>
@@ -2036,7 +2032,7 @@
   implementing the CSS 'unicode-bidi' property. <a href="references.html#refsBIDI">[BIDI]</a> <a href="references.html#refsCSS">[CSS]</a></p>
 
 
-  </div><h4 id="the-wbr-element"><span class="secno">4.6.26 </span>The <dfn><code>wbr</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
+  </div><h4 id="the-wbr-element"><span class="secno">4.6.27 </span>The <dfn><code>wbr</code></dfn> element</h4><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>
    <dt>Contexts in which this element can be used:</dt>
@@ -2064,7 +2060,7 @@
   <p>Any content inside <code><a href="#the-wbr-element">wbr</a></code> elements must not be
   considered part of the surrounding text.</p>
 
-  </div><h4 id="usage-summary"><span class="secno">4.6.27 </span>Usage summary</h4><p><i>This section is non-normative.</i></p><table><thead><tr><th>Element
+  </div><h4 id="usage-summary"><span class="secno">4.6.28 </span>Usage summary</h4><p><i>This section is non-normative.</i></p><table><thead><tr><th>Element
      </th><th>Purpose
      </th><th>Example
    </th></tr></thead><tbody><tr><td><code><a href="#the-a-element">a</a></code>
@@ -2139,6 +2135,10 @@
      </td><td>Keywords
      </td><td><pre class="example">Take a <strong>&lt;b&gt;lemon&lt;/b&gt;</strong> and squeeze it with a <strong>&lt;b&gt;juicer&lt;/b&gt;</strong>.</pre>
 
+    </td></tr><tr><td><code><a href="#the-u-element">u</a></code>
+     </td><td>Annotations
+     </td><td><pre class="example">The mixture of apple juice and &lt;u class="spelling"&gt;eldeflower&lt;/u&gt; juice is very pleasant.</pre>
+
     </td></tr><tr><td><code><a href="#the-mark-element">mark</a></code>
      </td><td>Highlight
      </td><td><pre class="example">Elderflower cordial, with one <strong>&lt;mark&gt;part&lt;/mark&gt;</strong> cordial to ten <strong>&lt;mark&gt;part&lt;/mark&gt;</strong>s water, stands a<strong>&lt;mark&gt;part&lt;/mark&gt;</strong> from the rest.</pre>

Index: scripting-1.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/scripting-1.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- scripting-1.html	25 Feb 2011 07:05:30 -0000	1.7
+++ scripting-1.html	30 Apr 2011 11:35:46 -0000	1.8
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>4.3 Scripting &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -450,16 +446,15 @@
   therefore by necessity scattered throughout the specification. The
   algorithms below (in this section) describe the core of this
   processing, but these algorithms reference and are referenced by the
-  parsing rules for <code><a href="#script">script</a></code> <a href="tokenization.html#scriptTag">start</a>
-  and <a href="tokenization.html#scriptEndTag">end</a> tags in HTML, <a href="tokenization.html#scriptForeignEndTag">in foreign content</a>, and <a href="the-xhtml-syntax.html#scriptTagXML">in XML</a>, the rules for the <code title="dom-document-write"><a href="apis-in-html-documents.html#dom-document-write">document.write()</a></code> method, the
+  parsing rules for <code><a href="#script">script</a></code> <a href="tree-construction.html#scriptTag">start</a>
+  and <a href="tree-construction.html#scriptEndTag">end</a> tags in HTML, <a href="tree-construction.html#scriptForeignEndTag">in foreign content</a>, and <a href="the-xhtml-syntax.html#scriptTagXML">in XML</a>, the rules for the <code title="dom-document-write"><a href="apis-in-html-documents.html#dom-document-write">document.write()</a></code> method, the
   handling of <a href="webappapis.html#scripting">scripting</a>, etc.</p><p>The <code title="attr-script-defer"><a href="#attr-script-defer">defer</a></code> attribute may be
   specified even if the <code title="attr-script-async"><a href="#attr-script-async">async</a></code>
   attribute is specified, to cause legacy Web browsers that only
   support <code title="attr-script-defer"><a href="#attr-script-defer">defer</a></code> (and not <code title="attr-script-async"><a href="#attr-script-async">async</a></code>) to fall back to the <code title="attr-script-defer"><a href="#attr-script-defer">defer</a></code> behavior instead of the
   synchronous blocking behavior that is the default.</p><p>Changing the <code title="attr-script-src"><a href="#attr-script-src">src</a></code>, <code title="attr-script-type"><a href="#attr-script-type">type</a></code>, <code title="attr-script-charset"><a href="#attr-script-charset">charset</a></code>, <code title="attr-script-async"><a href="#attr-script-async">async</a></code>, and <code title="attr-script-defer"><a href="#attr-script-defer">defer</a></code> attributes dynamically has no
   direct effect; these attribute are only used at specific times
-  described below.</p><!-- by implication, changes to the base URL
-  also have no effect --><div class="impl">
+  described below.</p><div class="impl">
 
   <p>A <code><a href="#script">script</a></code> element has several associated pieces of
   state.</p>
@@ -484,10 +479,7 @@
   and the <a href="the-xhtml-syntax.html#xml-parser">XML parser</a> on <code><a href="#script">script</a></code> elements they
   insert. In addition, whenever a <code><a href="#script">script</a></code> element whose
   <a href="#force-async">"force-async"</a> flag is set has a <code title="attr-script-async"><a href="#attr-script-async">async</a></code> content attribute added, the
-  element's <a href="#force-async">"force-async"</a> flag must be unset.</p> <!--
-  there's no need to unset it when the attribute is removed since you
-  can't have the attribute and the flag set at once. -->
-
+  element's <a href="#force-async">"force-async"</a> flag must be unset.</p> 
   <p>The fourth is a flag indicating whether or not the script block is
   <dfn id="ready-to-be-parser-executed">"ready to be parser-executed"</dfn>. Initially,
   <code><a href="#script">script</a></code> elements must have this flag unset (script
@@ -542,7 +534,7 @@
     scripting language, another script can later mutate them and cause
     them to run again.</p>
 
-    <!-- q.v. http://hsivonen.iki.fi/test/moz/script-setting-src-on-parser-inserted-script.html -->
+    
 
    </li>
 
@@ -602,10 +594,7 @@
 
     <p>Otherwise, the element has a non-empty <code title="attr-script-language"><a href="obsolete.html#attr-script-language">language</a></code> attribute; let
     <var><a href="#the-script-block-s-type">the script block's type</a></var> for this <code><a href="#script">script</a></code>
-    element be the concatenation of the string "<code title="">text/</code>" followed by the value of the <code title="attr-script-language"><a href="obsolete.html#attr-script-language">language</a></code> attribute.</p> <!--
-    user agents already support, e.g., type="text/javascript1.3", so
-    we don't have to support that separately. -->
-
+    element be the concatenation of the string "<code title="">text/</code>" followed by the value of the <code title="attr-script-language"><a href="obsolete.html#attr-script-language">language</a></code> attribute.</p> 
     <p class="note">The <code title="attr-script-language"><a href="obsolete.html#attr-script-language">language</a></code> attribute is never
     conforming, and is always ignored if there is a <code title="attr-script-type"><a href="#attr-script-type">type</a></code> attribute present.</p>
 
@@ -658,13 +647,9 @@
     that, amongst others, the following scripts will not execute:
     scripts in <code>XMLHttpRequest</code>'s <code title="dom-XMLHttpRequest-responseXML">responseXML</code>
     documents, scripts in <code>DOMParser</code>-created
-    documents, <!--scripts in documents created by
-    <code>XSLTProcessor</code>'s <code
-    title="dom-XSLTProcessor-transformToDocument">transformToDocument</code>
-    feature,--> and scripts that are first inserted by a script into a
+    documents,  and scripts that are first inserted by a script into a
     <code><a href="infrastructure.html#document">Document</a></code> that was created using the <code title="dom-DOMImplementation-createDocument"><a href="infrastructure.html#dom-domimplementation-createdocument">createDocument()</a></code>
-    API. <a href="references.html#refsXHR">[XHR]</a> <a href="references.html#refsDOMPARSER">[DOMPARSER]</a> <!--<a
-    href="#refsXSLTP">[XSLTP]</a>--> <a href="references.html#refsDOMCORE">[DOMCORE]</a></p>
+    API. <a href="references.html#refsXHR">[XHR]</a> <a href="references.html#refsDOMPARSER">[DOMPARSER]</a>  <a href="references.html#refsDOMCORE">[DOMCORE]</a></p>
 
 
    </li>
@@ -714,7 +699,7 @@
     relative to the element, and if that is successful, the specified
     resource must then be <a href="fetching-resources.html#fetch" title="fetch">fetched</a>, from the
     <a href="origin-0.html#origin">origin</a> of the element's <code><a href="infrastructure.html#document">Document</a></code>.</p>
-    <!-- not http-origin privacy sensitive -->
+    
 
     <p>If the <code title="attr-script-src"><a href="#attr-script-src">src</a></code> attribute's
     value is the empty string or if it could not be resolved, then the
@@ -735,15 +720,13 @@
     the element is <a href="infrastructure.html#insert-an-element-into-a-document" title="insert an element into a&#10;    document">inserted into the document</a>, the load must have
     started. If the UA performs such prefetching, but the element is
     never inserted in the document, or the <code title="attr-script-src"><a href="#attr-script-src">src</a></code> attribute is dynamically
-    changed,<!-- or the base URL is dynamically changed,--> then the
+    changed, then the
     user agent will not execute the script, and the fetching process
     will have been effectively wasted.</p>
 
    </li>
 
-   <!-- at this point if the element is "parser-inserted" then we know
-   it is not "force-async". -->
-
+   
    <li>
 
     <p>Then, the first of the following options that describes the
@@ -879,7 +862,7 @@
 
     </dl></li>
 
-  </ol><!-- similar text in various places --><p>Fetching an external script must <a href="the-end.html#delay-the-load-event">delay the load
+  </ol><p>Fetching an external script must <a href="the-end.html#delay-the-load-event">delay the load
   event</a> of the element's document until the <a href="webappapis.html#concept-task" title="concept-task">task</a> that is <a href="webappapis.html#queue-a-task" title="queue a&#10;  task">queued</a> by the <a href="webappapis.html#networking-task-source">networking task source</a> once
   the resource has been <a href="fetching-resources.html#fetch" title="fetch">fetched</a> (defined
   above) has been run.</p>
@@ -900,14 +883,7 @@
   blocks the parser until the style sheets are all loaded, at which
   time the script executes and the parser is unblocked).</p>
 
-  <!-- also (and this would be worth testing): the way the spec is
-  written, if you do not have a style sheet that is blocking scripts,
-  then you parse a <script src>, then while waiting for the script to
-  load you insert an external style sheet, the script will delay until
-  the sheet is loaded, because there's just a binary "are style sheets
-  blocking scripts" state, things aren't defined in terms of which
-  style sheets are blocking which scripts -->
-
+  
   <p>When the user agent is required to <dfn id="execute-the-script-block" title="execute the script&#10;  block">execute a script block</dfn>, it must run the following
   steps:</p>
 
@@ -935,7 +911,7 @@
      <!-- SCRIPT EXEC -->
      <dd>
 
-      <p>Executing the script block must consists of running the
+      <p>Executing the script block must consist of running the
       following steps. For the purposes of these steps, the script is
       considered to be from an <i>external file</i> if, while the
       <a href="#prepare-a-script">prepare a script</a> algorithm above was running for
@@ -977,28 +953,16 @@
            the cell in the second column of that row, and jump to the
            bottom step in this series of steps:</p>
 
-            <!-- this table is present in several forms in this file; keep them in sync -->
+            
             <table id="table-script-bom"><thead><tr><th>Bytes in Hexadecimal
                </th><th>Encoding
-             </th></tr></thead><tbody><!-- nobody uses this
-              <tr>
-               <td>00 00 FE FF
-               <td>UTF-32BE
-              <tr>
-               <td>FF FE 00 00
-               <td>UTF-32LE
-    --><tr><td>FE FF
+             </th></tr></thead><tbody><tr><td>FE FF
                </td><td>Big-endian UTF-16
               </td></tr><tr><td>FF FE
                </td><td>Little-endian UTF-16
               </td></tr><tr><td>EF BB BF
                </td><td>UTF-8
-    <!-- nobody uses this
-              <tr>
-               <td>DD 73 66 73
-               <td>UTF-EBCDIC
-    -->
-            </td></tr></tbody></table><p class="note">This step looks for Unicode Byte Order
+                </td></tr></tbody></table><p class="note">This step looks for Unicode Byte Order
             Marks (BOMs).</p>
 
            </li>
@@ -1181,16 +1145,16 @@
   &lt;legend&gt;Work out the price of your car&lt;/legend&gt;
   &lt;p&gt;Base cost: &#xA3;52000.&lt;/p&gt;
   &lt;p&gt;Select additional options:&lt;/p&gt;
-  &lt;ul&gt;
+  &lt;ul onchange="calculate(form)"&gt;
    &lt;li&gt;&lt;label&gt;&lt;input type=checkbox name=brakes&gt; Ceramic brakes (&#xA3;1000)&lt;/label&gt;&lt;/li&gt;
    &lt;li&gt;&lt;label&gt;&lt;input type=checkbox name=radio&gt; Satellite radio (&#xA3;2500)&lt;/label&gt;&lt;/li&gt;
    &lt;li&gt;&lt;label&gt;&lt;input type=checkbox name=turbo&gt; Turbo charger (&#xA3;5000)&lt;/label&gt;&lt;/li&gt;
    &lt;li&gt;&lt;label&gt;&lt;input type=checkbox name=sticker&gt; "XZ" sticker (&#xA3;250)&lt;/label&gt;&lt;/li&gt;
   &lt;/ul&gt;
-  &lt;p&gt;Total: &#xA3;&lt;output name=result onformchange="calculate(form)"&gt;&lt;/output&gt;&lt;/p&gt;
+  &lt;p&gt;Total: &#xA3;&lt;output name=result&gt;&lt;/output&gt;&lt;/p&gt;
  &lt;/fieldset&gt;
  &lt;script&gt;
-  document.forms.pricecalc.dispatchFormChange();
+  calculate(document.forms.pricecalc);
  &lt;/script&gt;
 &lt;/form&gt;</pre>
 
@@ -1228,7 +1192,7 @@
   <p>User agents may support other <a href="infrastructure.html#mime-type" title="MIME type">MIME
   types</a> and other languages.</p>
 
-  <!-- this paragraph is also present in the <style type="text/css"> section -->
+  
   <p>When examining types to determine if they support the language,
   user agents must not ignore unknown MIME parameters &#x2014; types
   with unknown parameters must be assumed to be unsupported. The <code title="">charset</code> parameter must be treated as an unknown
@@ -1241,10 +1205,10 @@
 escape        = "&lt;!--" data2 *( script-start data3 script-end data2 )
 
 data1         = &lt;any string that doesn't contain a substring that matches not-data1&gt;
-not-data1     = <!-- script-end / -->"&lt;!--"             <!-- the script-end is redundant here since it would close the element -->
+not-data1     = "&lt;!--"             
 
 data2         = &lt;any string that doesn't contain a substring that matches not-data2&gt;
-not-data2     = <!-- script-end / -->script-start / "--&gt;"  <!-- the script-end is redundant here since it would close the element -->
+not-data2     = script-start / "--&gt;"  
 
 data3         = &lt;any string that doesn't contain a substring that matches not-data3&gt;
 not-data3     = script-end / "--&gt;"
@@ -1347,7 +1311,7 @@
 
    <dd><p>The <code><a href="#the-noscript-element">noscript</a></code> element must contain only text,
    except that invoking the <a href="the-end.html#html-fragment-parsing-algorithm">HTML fragment parsing
-   algorithm</a> <!-- (which disables <script type="text/javascript"> execution) --> with
+   algorithm</a>  with
    the <code><a href="#the-noscript-element">noscript</a></code> element as the <var title="">context</var> element and the text contents as the <var title="">input</var> must result in a list of nodes that consists
    only of <code><a href="semantics.html#the-link-element">link</a></code>, <code><a href="semantics.html#the-style-element">style</a></code>, and
    <code><a href="semantics.html#meta">meta</a></code> elements that would be conforming if they were

Index: the-map-element.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/the-map-element.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- the-map-element.html	25 Feb 2011 07:05:30 -0000	1.7
+++ the-map-element.html	30 Apr 2011 11:35:46 -0000	1.8
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>4.8.12 The map element &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -535,9 +531,7 @@
   described by the <code title="attr-area-shape"><a href="#attr-area-shape">shape</a></code>
   attribute. <span class="impl">The processing for this attribute is
   described as part of the <a href="#image-map">image map</a> processing
-  model.</span></p><!-- v2: It was suggested by John S. Urban that coords should
-  support percentages as well as pixels, so that one could use the
-  same image map for images of various sizes. --><p>In the <dfn id="attr-area-shape-circle" title="attr-area-shape-circle">circle state</dfn>,
+  model.</span></p><p>In the <dfn id="attr-area-shape-circle" title="attr-area-shape-circle">circle state</dfn>,
   <code><a href="#the-area-element">area</a></code> elements must have a <code title="attr-area-coords"><a href="#attr-area-coords">coords</a></code> attribute present, with three
   integers, the last of which must be non-negative. The first integer
   must be the distance in CSS pixels from the left edge of the image
@@ -619,12 +613,7 @@
   same as setting the element's <code title="attr-hyperlink-href"><a href="links.html#attr-hyperlink-href">href</a></code> attribute to the new output
   value.</p>
 
-  </div><h4 id="image-maps"><span class="secno">4.8.14 </span>Image maps</h4><!-- TESTS
-  http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20html%3E%0A%3Cimg%20src%3D%22http%3A//hixie.ch/resources/images/smallcats%22%20usemap%3D%23a%20onclick%3Dw%28%27img%27%29%3E%0A%3Cmap%20name%3Da%3E%0A%20%3Carea%20onclick%3Dw%28%271%27%29%20coords%3D%270%25%200%25%20100%25%20100%25%27%20href%3Djavascript%3A%3E%0A%3C/map%3E
-  http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20html%3E%0A%3Cbody%20onfocus%3D%22w%28document.activeElement.tagName%29%22%3E%0A%3Cimg%20src%3D%22http%3A//hixie.ch/resources/images/smallcats%22%20usemap%3D%23a%20onclick%3Dw%28%27img%27%29%20onfocus%3D%22w%28document.activeElement.tagName%29%22%3E%0A%3Cimg%20src%3D%22http%3A//hixie.ch/resources/images/sample%22%20usemap%3D%23a%20onclick%3Dw%28%27img%27%29%20onfocus%3D%22w%28document.activeElement.tagName%29%22%3E%0A%3Cmap%20name%3Da%20onfocus%3D%22w%28document.activeElement.tagName%29%22%3E%0A%20%3Carea%20onclick%3Dw%28%271%27%29%20coords%3D%270%200%2050%2050%27%20href%3Djavascript%3A%20onfocus%3D%22w%28document.activeElement.tagName%29%22%3E%0A%3C/map%3E%0A%3Cscript%3E%0A%20var%20x%20%3D%20document.getElementsByTagName%28%27img%27%29%5B0%5D%3B%0A%20x.parentNode.appendChild%28x%29%3B%0A%20document.getElementsByTagName%28%27area%27%29%5B0%5D.focus%28%29%3B%0A%3C/script%3E
-  http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20html%3Ex%3Cmap%3E%3Carea%20shape%3Dpolyg%20coords%3D%221%2C2%203%22%3E%3C/map%3E%0A%3Cscript%3Ex%20%3D%20document.getElementsByTagName%28%27area%27%29%5B0%5D%3B%20w%28x.shape%20+%20%27%20%27%20+%20x.coords%29%3C/script%3E
-  http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20html%3E%0D%0A%3Cp%3E%3Cimg%20src%3D%22http%3A//hixie.ch/resources/images/astrophy/128%22%20usemap%3D%23a%3E%0D%0A%3Cmap%20name%3Da%3E%3Carea%20shape%3Dcirc%20coords%3D%2220%2C20%2C10%25%22%20href%3D%23%3E%3Carea%20shape%3Dcirc%20coords%3D%2220%2C20%2C10%22%20href%3D%23%3E%3C/map%3E%0D%0A%3Cscript%3Edocument.write%28document.getElementsByTagName%28%27area%27%29%5B0%5D.coords%29%3C/script%3E
-  --><div class="impl">
+  </div><h4 id="image-maps"><span class="secno">4.8.14 </span>Image maps</h4><div class="impl">
 
   <h5 id="authoring"><span class="secno">4.8.14.1 </span>Authoring</h5>
 
@@ -809,11 +798,7 @@
       <p>The shape is a polygon whose vertices are given by <var title="">the coordinates</var>, and whose interior is
       established using the even-odd rule. <a href="references.html#refsGRAPHICS">[GRAPHICS]</a></p>
 
-      <!--
-        browsers implement the even-odd rule / even winding rule:
-        http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20html%3E%0A%3Cimg%20usemap%3D%22%23x%22%20src%3D%22/resources/images/sample%22%3E%0A%3Cmap%20name%3D%22x%22%3E%0A%20%20%3Carea%20shape%3Dpolygon%20coords%3D%220%2C0%200%2C100%20100%2C100%20100%2C2%201%2C2%202%2C1%202%2C99%2099%2C99%2099%2C0%22%20href%3Da%3E%0A%3C/map%3E%0A
-       -->
-
+      
      </dd>
 
      <dt><a href="#attr-area-shape-rect" title="attr-area-shape-rect">Rectangle state</a></dt>
@@ -862,7 +847,7 @@
   categories for the purposes of the content models in this
   specification.</p><div class="impl">
 
-  <!-- apparently we get to define error handling, so: -->
+  
 
   <p>User agents must handle text other than <a href="content-models.html#inter-element-whitespace">inter-element
   whitespace</a> found in MathML elements whose content models do
@@ -935,7 +920,7 @@
   <a href="namespaces.html#svg-namespace">SVG namespace</a> inside <a href="dom.html#html-documents">HTML documents</a> is
   <a href="content-models.html#phrasing-content">phrasing content</a>. (This further constrains the
   requirements given in the SVG specification.)</p><p>The semantics of SVG elements are defined by the SVG
-  specification and <a href="infrastructure.html#other-applicable-specifications">other applicable specifications</a>. <a href="references.html#refsSVG">[SVG]</a></p><!-- The following paragraph is for bug 7510 --><p>The SVG specification includes requirements regarding the
+  specification and <a href="infrastructure.html#other-applicable-specifications">other applicable specifications</a>. <a href="references.html#refsSVG">[SVG]</a></p><p>The SVG specification includes requirements regarding the
   handling of elements in the DOM that are not in the SVG namespace,
   that are in SVG fragments, and that are not included in a
   <code title="">foreignObject</code> element. <em>This</em>

Index: the-canvas-element.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/the-canvas-element.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- the-canvas-element.html	25 Feb 2011 07:05:30 -0000	1.8
+++ the-canvas-element.html	30 Apr 2011 11:35:46 -0000	1.9
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>4.8.11 The canvas element &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -368,10 +364,7 @@
            attribute unsigned long <a href="#dom-canvas-width" title="dom-canvas-width">width</a>;
            attribute unsigned long <a href="#dom-canvas-height" title="dom-canvas-height">height</a>;
 
-  DOMString <a href="#dom-canvas-todataurl" title="dom-canvas-toDataURL">toDataURL</a>(in optional DOMString type, in any... args);<!--
-  v5:
-  void <span title="dom-canvas-toBlob">toBlob</span>(in <span>FileCallback</span>, in optional DOMString type, in any... args);-->
-
+  DOMString <a href="#dom-canvas-todataurl" title="dom-canvas-toDataURL">toDataURL</a>(in optional DOMString type, in any... args);
   object <a href="#dom-canvas-getcontext" title="dom-canvas-getContext">getContext</a>(in DOMString contextId, in any... args);
 };</pre>
    </dd>
@@ -481,7 +474,9 @@
   that element. When created, a <code><a href="#the-canvas-element">canvas</a></code> element must not
   have a <a href="#primary-context">primary context</a>.</p>
 
-  <p>The <dfn id="dom-canvas-getcontext" title="dom-canvas-getContext"><code>getContext(<var title="">contextId</var>, <var title="">args...</var>)</code></dfn>
+  <p>The most commonly used primary context is the <a href="http://dev.w3.org/html5/2dcontext/">HTML Canvas 2D Context</a>.
+
+  </p><p>The <dfn id="dom-canvas-getcontext" title="dom-canvas-getContext"><code>getContext(<var title="">contextId</var>, <var title="">args...</var>)</code></dfn>
   method of the <code><a href="#the-canvas-element">canvas</a></code> element, when invoked, must run
   the following steps:</p>
 
@@ -559,7 +554,7 @@
 
    </dd>
 
-   <!-- v5: toBlob -->
+   
 
   </dl><div class="impl">
 
@@ -567,10 +562,6 @@
   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>
 
-<!--
-  v5:
-  void <span title="dom-canvas-toBlob">toBlob</span>(in <span>FileCallback</span>, in optional DOMString type, in any... args);
--->
 
   <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
@@ -634,10 +625,7 @@
   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.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- tabular-data.html	25 Feb 2011 07:05:30 -0000	1.8
+++ tabular-data.html	30 Apr 2011 11:35:46 -0000	1.9
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>4.9 Tabular data &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -350,7 +346,8 @@
    <a href="spec.html#contents">Table of contents</a> &#x2013;
    <a href="forms.html" class="next">4.10 Forms</a>
   <ol class="toc"><li><ol><li><a href="tabular-data.html#tabular-data"><span class="secno">4.9 </span>Tabular data</a>
-    <ol><li><a href="tabular-data.html#the-table-element"><span class="secno">4.9.1 </span>The <code>table</code> element</a></li><li><a href="tabular-data.html#the-caption-element"><span class="secno">4.9.2 </span>The <code>caption</code> element</a></li><li><a href="tabular-data.html#the-colgroup-element"><span class="secno">4.9.3 </span>The <code>colgroup</code> element</a></li><li><a href="tabular-data.html#the-col-element"><span class="secno">4.9.4 </span>The <code>col</code> element</a></li><li><a href="tabular-data.html#the-tbody-element"><span class="secno">4.9.5 </span>The <code>tbody</code> element</a></li><li><a href="tabular-data.html#the-thead-element"><span class="secno">4.9.6 </span>The <code>thead</code> element</a></li><li><a href="tabular-data.html#the-tfoot-element"><span class="secno">4.9.7 </span>The <code>tfoot</code> element</a></li><li><a href="tabular-data.html#the-tr-element"><span class="secno">4.9.8 </span>The <code>tr</code> element</a></li><li><a href="tabular-data.html#the-td-element"><span class="secno">4.9.9 </span>The <code>td</code> element</a></li><li><a href="tabular-data.html#the-th-element"><span class="secno">4.9.10 </span>The <code>th</code> element</a></li><li><a href="tabular-data.html#attributes-common-to-td-and-th-elements"><span class="secno">4.9.11 </span>Attributes common to <code>td</code> and <code>th</code> elements</a></li><li><a href="tabular-data.html#processing-model-0"><span class="secno">4.9.12 </span>Processing model</a>
+    <ol><li><a href="tabular-data.html#the-table-element"><span class="secno">4.9.1 </span>The <code>table</code> element</a>
+      <ol><li><a href="tabular-data.html#table-descriptions-techniques"><span class="secno">4.9.1.1 </span>Techniques for describing tables</a></li><li><a href="tabular-data.html#table-layout-techniques"><span class="secno">4.9.1.2 </span>Techniques for table layout</a></li></ol></li><li><a href="tabular-data.html#the-caption-element"><span class="secno">4.9.2 </span>The <code>caption</code> element</a></li><li><a href="tabular-data.html#the-colgroup-element"><span class="secno">4.9.3 </span>The <code>colgroup</code> element</a></li><li><a href="tabular-data.html#the-col-element"><span class="secno">4.9.4 </span>The <code>col</code> element</a></li><li><a href="tabular-data.html#the-tbody-element"><span class="secno">4.9.5 </span>The <code>tbody</code> element</a></li><li><a href="tabular-data.html#the-thead-element"><span class="secno">4.9.6 </span>The <code>thead</code> element</a></li><li><a href="tabular-data.html#the-tfoot-element"><span class="secno">4.9.7 </span>The <code>tfoot</code> element</a></li><li><a href="tabular-data.html#the-tr-element"><span class="secno">4.9.8 </span>The <code>tr</code> element</a></li><li><a href="tabular-data.html#the-td-element"><span class="secno">4.9.9 </span>The <code>td</code> element</a></li><li><a href="tabular-data.html#the-th-element"><span class="secno">4.9.10 </span>The <code>th</code> element</a></li><li><a href="tabular-data.html#attributes-common-to-td-and-th-elements"><span class="secno">4.9.11 </span>Attributes common to <code>td</code> and <code>th</code> elements</a></li><li><a href="tabular-data.html#processing-model-0"><span class="secno">4.9.12 </span>Processing model</a>
       <ol><li><a href="tabular-data.html#forming-a-table"><span class="secno">4.9.12.1 </span>Forming a table</a></li><li><a href="tabular-data.html#header-and-data-cell-semantics"><span class="secno">4.9.12.2 </span>Forming relationships between data cells and header cells</a></li></ol></li><li><a href="tabular-data.html#examples"><span class="secno">4.9.13 </span>Examples</a></li></ol></li></ol></li></ol></div><h3 id="tabular-data"><span class="secno">4.9 </span>Tabular data</h3><p class="XXX annotation"><span><a href="http://www.w3.org/html/wg/tracker/issues/32">ISSUE-32</a> (table-summary) blocks progress to Last Call</span></p><h4 id="the-table-element"><span class="secno">4.9.1 </span>The <dfn><code>table</code></dfn> element</h4><p class="XXX annotation"><span><a href="http://www.w3.org/html/wg/tracker/issues/92">ISSUE-92</a> (cleanuptable) and <a href="http://www.w3.org/html/wg/tracker/issues/130">ISSUE-130</a> (table-layout) block progress to Last Call</span></p><dl class="element"><dt>Categories</dt>
    <dd><a href="content-models.html#flow-content">Flow content</a>.</dd>
    <dt>Contexts in which this element can be used:</dt>
@@ -366,7 +363,7 @@
    total).</dd>
    <dt>Content attributes:</dt>
    <dd><a href="elements.html#global-attributes">Global attributes</a></dd>
-   <dd><code title="attr-table-summary"><a href="#attr-table-summary">summary</a></code> (but see prose)</dd>
+   <dd><code title="attr-table-border"><a href="#attr-table-border">border</a></code></dd>
    <dt>DOM interface:</dt>
    <dd>
 <pre class="idl">interface <dfn id="htmltableelement">HTMLTableElement</dfn> : <a href="elements.html#htmlelement">HTMLElement</a> {
@@ -384,267 +381,82 @@
   readonly attribute <a href="common-dom-interfaces.html#htmlcollection">HTMLCollection</a> <a href="#dom-table-rows" title="dom-table-rows">rows</a>;
   <a href="elements.html#htmlelement">HTMLElement</a> <a href="#dom-table-insertrow" title="dom-table-insertRow">insertRow</a>(in optional long index);
   void <a href="#dom-table-deleterow" title="dom-table-deleteRow">deleteRow</a>(in long index);
-           attribute DOMString <a href="#dom-table-summary" title="dom-table-summary">summary</a>;
+           attribute DOMString <a href="#dom-table-border" title="dom-table-border">border</a>;
 };</pre>
    </dd>
   </dl><p>The <code><a href="#the-table-element">table</a></code> element <a href="rendering.html#represents">represents</a> data with
   more than one dimension, in the form of a <a href="#concept-table" title="concept-table">table</a>.</p><div class="impl">
-
   <p>The <code><a href="#the-table-element">table</a></code> element takes part in the <a href="#table-model">table
   model</a>.</p>
-
-  </div><p>Tables must not be used as layout aids. Historically, some Web
-  authors have misused tables in HTML as a way to control their page
-  layout. This usage is non-conforming, because tools attempting to
-  extract tabular data from such documents would obtain very confusing
-  results. In particular, users of accessibility tools like screen
-  readers are likely to find it very difficult to navigate pages with
-  tables used for layout.</p><p class="note">There are a variety of alternatives to using HTML
-  tables for layout, primarily using CSS positioning and the CSS table
-  model.</p><div class="impl">
-
-  <p>User agents that do table analysis on arbitrary content are
-  encouraged to find heuristics to determine which tables actually
-  contain data and which are merely being used for layout. This
-  specification does not define a precise heuristic.</p>
-
   </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
-  explanatory information introducing the table. This information is
-  useful for all users, but is especially useful for users who cannot
-  see the table, e.g. users of screen readers.</p><p>Such explanatory information should introduce the purpose of the
-  table, outline its basic cell structure, highlight any trends or
-  patterns, and generally teach the user how to use the table.</p><div class="example">
-
-   <p>For instance, the following table:</p>
-
-   <table><caption>Characteristics with positive and negative sides</caption>
-    <thead><tr><th id="n"> Negative
-      </th><th> Characteristic
-      </th><th> Positive
-    </th></tr></thead><tbody><tr><td headers="n r1"> Sad
-      </td><th id="r1"> Mood
-      </th><td> Happy
-     </td></tr><tr><td headers="n r2"> Failing
-      </td><th id="r2"> Grade
-      </th><td> Passing
-   </td></tr></tbody></table><p>...might benefit from a description explaining the way the table
-   is laid out, something like "Characteristics are given in the
-   second column, with the negative side in the left column and the
-   positive side in the right column".</p>
-
-  </div><p>There are a variety of ways to include this information, such as:</p><dl><dt>In prose, surrounding the table</dt>
-
-   <dd>
-    <div class="example"><pre>&lt;p&gt;In the following table, characteristics are given in the second
-column, with the negative side in the left column and the positive
-side in the right column.&lt;/p&gt;
-&lt;table&gt;
- &lt;caption&gt;Characteristics with positive and negative sides&lt;/caption&gt;
- &lt;thead&gt;
-  &lt;tr&gt;
-   &lt;th id="n"&gt; Negative
-   &lt;th&gt; Characteristic
-   &lt;th&gt; Positive
- &lt;tbody&gt;
-  &lt;tr&gt;
-   &lt;td headers="n r1"&gt; Sad
-   &lt;th id="r1"&gt; Mood
-   &lt;td&gt; Happy
-  &lt;tr&gt;
-   &lt;td headers="n r2"&gt; Failing
-   &lt;th id="r2"&gt; Grade
-   &lt;td&gt; Passing
-&lt;/table&gt;</pre></div>
-   </dd>
-
-   <dt>In the table's <code><a href="#the-caption-element">caption</a></code></dt>
-
-   <dd>
-    <div class="example"><pre>&lt;table&gt;
- &lt;caption&gt;
-  &lt;strong&gt;Characteristics with positive and negative sides.&lt;/strong&gt;
-  &lt;p&gt;Characteristics are given in the second column, with the
-  negative side in the left column and the positive side in the right
-  column.&lt;/p&gt;
- &lt;/caption&gt;
- &lt;thead&gt;
-  &lt;tr&gt;
-   &lt;th id="n"&gt; Negative
-   &lt;th&gt; Characteristic
-   &lt;th&gt; Positive
- &lt;tbody&gt;
-  &lt;tr&gt;
-   &lt;td headers="n r1"&gt; Sad
-   &lt;th id="r1"&gt; Mood
-   &lt;td&gt; Happy
-  &lt;tr&gt;
-   &lt;td headers="n r2"&gt; Failing
-   &lt;th id="r2"&gt; Grade
-   &lt;td&gt; Passing
-&lt;/table&gt;</pre></div>
-   </dd>
-
-   <dt>In the table's <code><a href="#the-caption-element">caption</a></code>, in a <code><a href="interactive-elements.html#the-details-element">details</a></code> element</dt>
-
-   <dd>
-    <div class="example"><pre>&lt;table&gt;
- &lt;caption&gt;
-  &lt;strong&gt;Characteristics with positive and negative sides.&lt;/strong&gt;
-  &lt;details&gt;
-   &lt;summary&gt;Help&lt;/summary&gt;
-   &lt;p&gt;Characteristics are given in the second column, with the
-   negative side in the left column and the positive side in the right
-   column.&lt;/p&gt;
-  &lt;/details&gt;
- &lt;/caption&gt;
- &lt;thead&gt;
-  &lt;tr&gt;
-   &lt;th id="n"&gt; Negative
-   &lt;th&gt; Characteristic
-   &lt;th&gt; Positive
- &lt;tbody&gt;
-  &lt;tr&gt;
-   &lt;td headers="n r1"&gt; Sad
-   &lt;th id="r1"&gt; Mood
-   &lt;td&gt; Happy
-  &lt;tr&gt;
-   &lt;td headers="n r2"&gt; Failing
-   &lt;th id="r2"&gt; Grade
-   &lt;td&gt; Passing
-&lt;/table&gt;</pre></div>
-   </dd>
-
-   <dt>Next to the table, in the same <code><a href="grouping-content.html#the-figure-element">figure</a></code></dt>
-
-   <dd>
-    <div class="example"><pre>&lt;figure&gt;
- &lt;figcaption&gt;Characteristics with positive and negative sides&lt;/figcaption&gt;
- &lt;p&gt;Characteristics are given in the second column, with the
- negative side in the left column and the positive side in the right
- column.&lt;/p&gt;
- &lt;table&gt;
-  &lt;thead&gt;
-   &lt;tr&gt;
-    &lt;th id="n"&gt; Negative
-    &lt;th&gt; Characteristic
-    &lt;th&gt; Positive
-  &lt;tbody&gt;
-   &lt;tr&gt;
-    &lt;td headers="n r1"&gt; Sad
-    &lt;th id="r1"&gt; Mood
-    &lt;td&gt; Happy
-   &lt;tr&gt;
-    &lt;td headers="n r2"&gt; Failing
-    &lt;th id="r2"&gt; Grade
-    &lt;td&gt; Passing
- &lt;/table&gt;
-&lt;/figure&gt;</pre></div>
-   </dd>
-
-   <dt>Next to the table, in a <code><a href="grouping-content.html#the-figure-element">figure</a></code>'s <code><a href="grouping-content.html#the-figcaption-element">figcaption</a></code></dt>
-
-   <dd>
-    <div class="example"><pre>&lt;figure&gt;
- &lt;figcaption&gt;
-  &lt;strong&gt;Characteristics with positive and negative sides&lt;/strong&gt;
-  &lt;p&gt;Characteristics are given in the second column, with the
-  negative side in the left column and the positive side in the right
-  column.&lt;/p&gt;
- &lt;/figcaption&gt;
- &lt;table&gt;
-  &lt;thead&gt;
-   &lt;tr&gt;
-    &lt;th id="n"&gt; Negative
-    &lt;th&gt; Characteristic
-    &lt;th&gt; Positive
-  &lt;tbody&gt;
-   &lt;tr&gt;
-    &lt;td headers="n r1"&gt; Sad
-    &lt;th id="r1"&gt; Mood
-    &lt;td&gt; Happy
-   &lt;tr&gt;
-    &lt;td headers="n r2"&gt; Failing
-    &lt;th id="r2"&gt; Grade
-    &lt;td&gt; Passing
- &lt;/table&gt;
-&lt;/figure&gt;</pre></div>
-   </dd>
-
-  </dl><p>Authors may also use other techniques, or combinations of the
-  above techniques, as appropriate.</p><p>The best option, of course, rather than writing a description
-  explaining the way the table is laid out, is to adjust the table
-  such that no explanation is needed.</p><div class="example">
+  cover that grid without overlap.</p><div class="impl">
+  <p class="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>.</p>
+  </div><hr/><p>Authors are encouraged to provide information describing how to
+  interpret complex tables. Guidance on how <a href="#table-descriptions-techniques">provide such information</a>
+  is given below.</p><div class="impl">
+  <p>If a <code><a href="#the-table-element">table</a></code> element has a <code title="attr-table-summary"><a href="obsolete.html#attr-table-summary">summary</a></code> attribute, and the user
+  agent has not classified the table as a layout table, the user agent
+  may report the contents of that attribute to the user.</p>
+  </div><hr/><p>Tables should not be used as layout aids.
 
-   <p>In the case of the table used in the examples above, a simple
-   rearrangement of the table so that the headers are on the top and
-   left sides removes the need for an explanation as well as removing
-   the need for the use of <code title="attr-tdth-headers"><a href="#attr-tdth-headers">headers</a></code> attributes:</p>
+  Historically, many Web authors have tables in HTML as a way to
+  control their page layout making it difficult to extract tabular
+  data from such documents.
 
-   <pre>&lt;table&gt;
- &lt;caption&gt;Characteristics with positive and negative sides&lt;/caption&gt;
- &lt;thead&gt;
-  &lt;tr&gt;
-   &lt;th&gt; Characteristic
-   &lt;th&gt; Negative
-   &lt;th&gt; Positive
- &lt;tbody&gt;
-  &lt;tr&gt;
-   &lt;th&gt; Mood
-   &lt;td&gt; Sad
-   &lt;td&gt; Happy
-  &lt;tr&gt;
-   &lt;th&gt; Grade
-   &lt;td&gt; Failing
-   &lt;td&gt; Passing
-&lt;/table&gt;</pre>
+  In particular, users of accessibility tools, like screen readers,
+  are likely to find it very difficult to navigate pages with tables
+  used for layout.
 
-  </div><p>The <dfn id="attr-table-summary" title="attr-table-summary"><code>summary</code></dfn>
-  attribute on <code><a href="#the-table-element">table</a></code> elements was suggested in earlier
-  versions of the language as a technique for providing explanatory
-  text for complex tables for users of screen readers. One of the <a href="#table-descriptions">techniques</a> described <!--in the
-  <code>table</code> section--> above should be used
-  instead. <!--Authors should not specify the <code
-  title="attr-table-summary">summary</code> attribute on
-  <code>table</code> elements. --> <!-- 2.65% pages --></p><p class="note">In particular, authors are encouraged to consider
-  whether their explanatory text for tables is likely to be useful to
-  the visually impaired: if their text would not be useful, then it is
-  best to not include a <code title="attr-table-summary"><a href="#attr-table-summary">summary</a></code> attribute. Similarly, if
-  their explanatory text could help someone who is not visually
-  impaired, e.g. someone who is seeing the table for the first time,
-  then the text would be more useful before the table or in the
-  <code><a href="#the-caption-element">caption</a></code>. For example, describing the conclusions of the
-  data in a table is useful to everyone; explaining how to read the
-  table, if not obvious from the headers alone, is useful to everyone;
-  describing the structure of the table, if it is easy to grasp
-  visually, might not be useful to everyone, but it might also not be
-  useful to users who can quickly navigate the table with an
-  accessibility tool.</p><!--
-  <p class="note">Use of the <code
-  title="attr-table-summary">summary</code> attribute is discouraged
-  because in practice it is poorly understood. Because the attribute
-  is not exposed in visual user agents, authors who have included it
-  have typically not been able to test it, and have therefore set the
-  attribute to values that are of no use to users of accessibility
-  tools. This has lead to accessibility tools introducing heuristics
-  to try to avoid exposing such usage of the attribute to users. Even
-  the few authors who have made the best use of the attribute have
-  often misused it, for example by including text that would in fact
-  be useful for all users, or that is redundant with other information
-  on the page separate from the table.</p>
-  --><div class="impl">
+  If a table is to be used for layout it must be marked with the
+  attribute role="presentation" for a user agent to properly represent
+  the table to an assistive technology and to properly convey the
+  intent of the author to tools that wish to extract tabular data from
+  the document.</p><p class="note">There are a variety of alternatives to using HTML
+  tables for layout, primarily using CSS positioning and the CSS table
+  model.</p><p>The <dfn id="attr-table-border" title="attr-table-border"><code>border</code></dfn>
+  attribute may be specified on a <code><a href="#the-table-element">table</a></code> element to
+  explicitly indicate that the <code><a href="#the-table-element">table</a></code> element is not being
+  used for layout purposes. If specified, the attribute's value must
+  either be the empty string or the value "<code title="">1</code>".
+  The attribute is used by certain user agents as an indication that
+  borders should be drawn around cells of the table.</p><div class="impl">
+  <p>Tables can be complicated to understand and navigate. To help
+  users with this, user agents should clearly dilineate cells in a
+  table from each other, unless the user agent has classified the
+  table as a
+  layout table.</p>
+  </div><p class="note">Authors <span class="impl">and implementors</span>
+  are encouraged to consider using some of the <a href="#table-layout-techniques">table layout techniques</a>
+  described below to make tables easier to navigate for users.</p><div class="impl">
 
-  <p>If a <code><a href="#the-table-element">table</a></code> element has a <code title="attr-table-summary"><a href="#attr-table-summary">summary</a></code> attribute, the user agent
-  may report the contents of that attribute to the user.</p>
+  <p>User agents, especially those that do table analysis on arbitrary
+  content, are encouraged to find heuristics to determine which tables
+  actually contain data and which are merely being used for layout.
+  This specification does not define a precise heuristic, but the
+  following are suggested as possible indicators:</p>
 
-  </div><dl class="domintro"><dt><var title="">table</var> . <code title="dom-table-caption"><a href="#dom-table-caption">caption</a></code> [ = <var title="">value</var> ]</dt>
+  <table><thead><tr><th>Feature
+     </th><th>Indication
+   </th></tr></thead><tbody><tr><td>The use of the <code title="attr-aria-role">role</code> attribute with the value <code title="attr-aria-role-presentation">presentation</code>
+     </td><td>Probably a layout table
+    </td></tr><tr><td>The use of the <code title="attr-table-border"><a href="#attr-table-border">border</a></code> attribute with the non-conforming value 0
+     </td><td>Probably a layout table
+    </td></tr><tr><td>The use of the non-conforming <code title="attr-table-cellspacing"><a href="obsolete.html#attr-table-cellspacing">cellspacing</a></code> and <code title="attr-table-cellpadding"><a href="obsolete.html#attr-table-cellpadding">cellpadding</a></code> attributes with the value 0
+     </td><td>Probably a layout table
+   </td></tr></tbody><tbody><tr><td>The use of <code><a href="#the-caption-element">caption</a></code>, <code><a href="#the-thead-element">thead</a></code>, or <code><a href="#the-th-element">th</a></code> elements        
+     </td><td>Probably a non-layout table
+    </td></tr><tr><td>The use of the <code title="attr-tdth-headers"><a href="#attr-tdth-headers">headers</a></code> and <code title="attr-th-scope"><a href="#attr-th-scope">scope</a></code> attributes
+     </td><td>Probably a non-layout table
+    </td></tr><tr><td>The use of the <code title="attr-table-border"><a href="#attr-table-border">border</a></code> attribute with a value other than 0
+     </td><td>Probably a non-layout table
+    </td></tr><tr><td>Explicit visible borders set using CSS
+     </td><td>Probably a non-layout table
+   </td></tr></tbody><tbody><tr><td>The use of the <code title="attr-table-summary"><a href="obsolete.html#attr-table-summary">summary</a></code> attribute
+     </td><td>Not a good indicator (both layout and non-layout tables have historically been given this attribute)
+  </td></tr></tbody></table></div><hr/><dl class="domintro"><dt><var title="">table</var> . <code title="dom-table-caption"><a href="#dom-table-caption">caption</a></code> [ = <var title="">value</var> ]</dt>
    <dd>
     <p>Returns the table's <code><a href="#the-caption-element">caption</a></code> element.</p>
     <p>Can be set, to replace the <code><a href="#the-caption-element">caption</a></code> element. If the
@@ -892,7 +704,7 @@
 
    <li><p>Otherwise, the method must remove the <var title="">index</var>th element in the <code title="dom-table-rows"><a href="#dom-table-rows">rows</a></code> collection from its parent.</p>
 
-  </li></ol><p>The <dfn id="dom-table-summary" title="dom-table-summary"><code>summary</code></dfn> IDL
+  </li></ol><p>The <dfn id="dom-table-border" title="dom-table-border"><code>border</code></dfn> IDL
   attribute must <a href="common-dom-interfaces.html#reflect">reflect</a> the content attribute of the
   same name.</p>
 
@@ -904,7 +716,7 @@
 
    <pre>&lt;section&gt;
  &lt;style scoped&gt;
-  table { border-collapse: collapse; border: solid thick }
+  table { border-collapse: collapse; border: solid thick; }
   colgroup, tbody { border: solid medium; }
   td { border: solid thin; height: 1.4em; width: 1.4em; text-align: center; padding: 0; }
  &lt;/style&gt;
@@ -928,6 +740,206 @@
  &lt;/table&gt;
 &lt;/section&gt;</pre>
 
+  </div><h5 id="table-descriptions-techniques"><span class="secno">4.9.1.1 </span>Techniques for describing tables</h5><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
+  explanatory information introducing the table. This information is
+  useful for all users, but is especially useful for users who cannot
+  see the table, e.g. users of screen readers.</p><p>Such explanatory information should introduce the purpose of the
+  table, outline its basic cell structure, highlight any trends or
+  patterns, and generally teach the user how to use the table.</p><p>For instance, the following table:</p><table><caption>Characteristics with positive and negative sides</caption>
+   <thead><tr><th id="n"> Negative
+     </th><th> Characteristic
+     </th><th> Positive
+   </th></tr></thead><tbody><tr><td headers="n r1"> Sad
+     </td><th id="r1"> Mood
+     </th><td> Happy
+    </td></tr><tr><td headers="n r2"> Failing
+     </td><th id="r2"> Grade
+     </th><td> Passing
+  </td></tr></tbody></table><p>...might benefit from a description explaining the way the table
+  is laid out, something like "Characteristics are given in the
+  second column, with the negative side in the left column and the
+  positive side in the right column".</p><p>There are a variety of ways to include this information, such as:</p><dl><dt>In prose, surrounding the table</dt>
+
+   <dd>
+    <div class="example"><pre>&lt;p&gt;In the following table, characteristics are given in the second
+column, with the negative side in the left column and the positive
+side in the right column.&lt;/p&gt;
+&lt;table&gt;
+ &lt;caption&gt;Characteristics with positive and negative sides&lt;/caption&gt;
+ &lt;thead&gt;
+  &lt;tr&gt;
+   &lt;th id="n"&gt; Negative
+   &lt;th&gt; Characteristic
+   &lt;th&gt; Positive
+ &lt;tbody&gt;
+  &lt;tr&gt;
+   &lt;td headers="n r1"&gt; Sad
+   &lt;th id="r1"&gt; Mood
+   &lt;td&gt; Happy
+  &lt;tr&gt;
+   &lt;td headers="n r2"&gt; Failing
+   &lt;th id="r2"&gt; Grade
+   &lt;td&gt; Passing
+&lt;/table&gt;</pre></div>
+   </dd>
+
+   <dt>In the table's <code><a href="#the-caption-element">caption</a></code></dt>
+
+   <dd>
+    <div class="example"><pre>&lt;table&gt;
+ &lt;caption&gt;
+  &lt;strong&gt;Characteristics with positive and negative sides.&lt;/strong&gt;
+  &lt;p&gt;Characteristics are given in the second column, with the
+  negative side in the left column and the positive side in the right
+  column.&lt;/p&gt;
+ &lt;/caption&gt;
+ &lt;thead&gt;
+  &lt;tr&gt;
+   &lt;th id="n"&gt; Negative
+   &lt;th&gt; Characteristic
+   &lt;th&gt; Positive
+ &lt;tbody&gt;
+  &lt;tr&gt;
+   &lt;td headers="n r1"&gt; Sad
+   &lt;th id="r1"&gt; Mood
+   &lt;td&gt; Happy
+  &lt;tr&gt;
+   &lt;td headers="n r2"&gt; Failing
+   &lt;th id="r2"&gt; Grade
+   &lt;td&gt; Passing
+&lt;/table&gt;</pre></div>
+   </dd>
+
+   <dt>In the table's <code><a href="#the-caption-element">caption</a></code>, in a <code><a href="interactive-elements.html#the-details-element">details</a></code> element</dt>
+
+   <dd>
+    <div class="example"><pre>&lt;table&gt;
+ &lt;caption&gt;
+  &lt;strong&gt;Characteristics with positive and negative sides.&lt;/strong&gt;
+  &lt;details&gt;
+   &lt;summary&gt;Help&lt;/summary&gt;
+   &lt;p&gt;Characteristics are given in the second column, with the
+   negative side in the left column and the positive side in the right
+   column.&lt;/p&gt;
+  &lt;/details&gt;
+ &lt;/caption&gt;
+ &lt;thead&gt;
+  &lt;tr&gt;
+   &lt;th id="n"&gt; Negative
+   &lt;th&gt; Characteristic
+   &lt;th&gt; Positive
+ &lt;tbody&gt;
+  &lt;tr&gt;
+   &lt;td headers="n r1"&gt; Sad
+   &lt;th id="r1"&gt; Mood
+   &lt;td&gt; Happy
+  &lt;tr&gt;
+   &lt;td headers="n r2"&gt; Failing
+   &lt;th id="r2"&gt; Grade
+   &lt;td&gt; Passing
+&lt;/table&gt;</pre></div>
+   </dd>
+
+   <dt>Next to the table, in the same <code><a href="grouping-content.html#the-figure-element">figure</a></code></dt>
+
+   <dd>
+    <div class="example"><pre>&lt;figure&gt;
+ &lt;figcaption&gt;Characteristics with positive and negative sides&lt;/figcaption&gt;
+ &lt;p&gt;Characteristics are given in the second column, with the
+ negative side in the left column and the positive side in the right
+ column.&lt;/p&gt;
+ &lt;table&gt;
+  &lt;thead&gt;
+   &lt;tr&gt;
+    &lt;th id="n"&gt; Negative
+    &lt;th&gt; Characteristic
+    &lt;th&gt; Positive
+  &lt;tbody&gt;
+   &lt;tr&gt;
+    &lt;td headers="n r1"&gt; Sad
+    &lt;th id="r1"&gt; Mood
+    &lt;td&gt; Happy
+   &lt;tr&gt;
+    &lt;td headers="n r2"&gt; Failing
+    &lt;th id="r2"&gt; Grade
+    &lt;td&gt; Passing
+ &lt;/table&gt;
+&lt;/figure&gt;</pre></div>
+   </dd>
+
+   <dt>Next to the table, in a <code><a href="grouping-content.html#the-figure-element">figure</a></code>'s <code><a href="grouping-content.html#the-figcaption-element">figcaption</a></code></dt>
+
+   <dd>
+    <div class="example"><pre>&lt;figure&gt;
+ &lt;figcaption&gt;
+  &lt;strong&gt;Characteristics with positive and negative sides&lt;/strong&gt;
+  &lt;p&gt;Characteristics are given in the second column, with the
+  negative side in the left column and the positive side in the right
+  column.&lt;/p&gt;
+ &lt;/figcaption&gt;
+ &lt;table&gt;
+  &lt;thead&gt;
+   &lt;tr&gt;
+    &lt;th id="n"&gt; Negative
+    &lt;th&gt; Characteristic
+    &lt;th&gt; Positive
+  &lt;tbody&gt;
+   &lt;tr&gt;
+    &lt;td headers="n r1"&gt; Sad
+    &lt;th id="r1"&gt; Mood
+    &lt;td&gt; Happy
+   &lt;tr&gt;
+    &lt;td headers="n r2"&gt; Failing
+    &lt;th id="r2"&gt; Grade
+    &lt;td&gt; Passing
+ &lt;/table&gt;
+&lt;/figure&gt;</pre></div>
+   </dd>
+
+  </dl><p>Authors may also use other techniques, or combinations of the
+  above techniques, as appropriate.</p><p>The best option, of course, rather than writing a description
+  explaining the way the table is laid out, is to adjust the table
+  such that no explanation is needed.</p><div class="example">
+
+   <p>In the case of the table used in the examples above, a simple
+   rearrangement of the table so that the headers are on the top and
+   left sides removes the need for an explanation as well as removing
+   the need for the use of <code title="attr-tdth-headers"><a href="#attr-tdth-headers">headers</a></code> attributes:</p>
+
+   <pre>&lt;table&gt;
+ &lt;caption&gt;Characteristics with positive and negative sides&lt;/caption&gt;
+ &lt;thead&gt;
+  &lt;tr&gt;
+   &lt;th&gt; Characteristic
+   &lt;th&gt; Negative
+   &lt;th&gt; Positive
+ &lt;tbody&gt;
+  &lt;tr&gt;
+   &lt;th&gt; Mood
+   &lt;td&gt; Sad
+   &lt;td&gt; Happy
+  &lt;tr&gt;
+   &lt;th&gt; Grade
+   &lt;td&gt; Failing
+   &lt;td&gt; Passing
+&lt;/table&gt;</pre>
+
+  </div><h5 id="table-layout-techniques"><span class="secno">4.9.1.2 </span>Techniques for table layout</h5><p>Good table layout is key to making tables more readable and usable.</p><p>In visual media, providing column and row borders and alternating
+  row backgrounds can be very effective to make complicated tables
+  more readable.</p><p>For tables with large volumes of numeric content, using
+  monospaced fonts can help users see patterns, especially in
+  situations where a user agent does not render the borders.
+  (Unfortunately, for historical reasons, not rendering borders on
+  tables is a common default.)</p><p>In speech media, table cells can be distinguished by reporting
+  the corresponding headers before reading the cell's contents, and by
+  allowing users to navigate the table in a grid fashion, rather than
+  serialising the entire contents of the table in source order.</p><p>Authors are encouraged to use CSS to achieve these effects.</p><div class="impl">
+  <p>User agents are encouraged to render tables using these
+  techniques whenever the page does not use CSS and the table is not
+  classified as a layout table.</p>
   </div><h4 id="the-caption-element"><span class="secno">4.9.2 </span>The <dfn><code>caption</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
    <dd>None.</dd>
    <dt>Contexts in which this element can be used:</dt>
@@ -1019,7 +1031,7 @@
    <dt>Content attributes:</dt>
    <dd><a href="elements.html#global-attributes">Global attributes</a></dd>
    <dd><code title="attr-col-span"><a href="#attr-col-span">span</a></code></dd>
-   <!-- v2: char, to specify the decimal character used in numeric data cells in the column (not header cells) -->
+   
    <dt>DOM interface:</dt>
    <dd>
     <p><code><a href="#htmltablecolelement">HTMLTableColElement</a></code>, same as for
@@ -1360,7 +1372,7 @@
    <dd><code title="attr-tdth-colspan"><a href="#attr-tdth-colspan">colspan</a></code></dd>
    <dd><code title="attr-tdth-rowspan"><a href="#attr-tdth-rowspan">rowspan</a></code></dd>
    <dd><code title="attr-tdth-headers"><a href="#attr-tdth-headers">headers</a></code></dd>
-   <!-- v2 char, to specify the decimal character used in numeric cells -->
+   
    <dt>DOM interface:</dt>
    <dd>
     <pre class="idl">interface <dfn id="htmltabledatacellelement">HTMLTableDataCellElement</dfn> : <a href="#htmltablecellelement">HTMLTableCellElement</a> {};</pre>
@@ -1474,8 +1486,8 @@
    <p>The remaining headers apply just to the cells to the right of
    them.</p>
 
-   <!-- image source: http://software.hixie.ch/utilities/js/live-dom-viewer/saved/151 -->
-   <img alt="" height="256" src="http://dev.w3.org/html5/spec/images/table-scope-diagram.png" width="459"/><!-- (alt is empty because the diagram is completely described by the previous paragraphs) --></div><h4 id="attributes-common-to-td-and-th-elements"><span class="secno">4.9.11 </span>Attributes common to <code><a href="#the-td-element">td</a></code> and <code><a href="#the-th-element">th</a></code> elements</h4><p>The <code><a href="#the-td-element">td</a></code> and <code><a href="#the-th-element">th</a></code> elements may have a <dfn id="attr-tdth-colspan" title="attr-tdth-colspan"><code>colspan</code></dfn> content
+   
+   <img alt="" height="256" src="http://dev.w3.org/html5/spec/images/table-scope-diagram.png" width="459"/></div><h4 id="attributes-common-to-td-and-th-elements"><span class="secno">4.9.11 </span>Attributes common to <code><a href="#the-td-element">td</a></code> and <code><a href="#the-th-element">th</a></code> elements</h4><p>The <code><a href="#the-td-element">td</a></code> and <code><a href="#the-th-element">th</a></code> elements may have a <dfn id="attr-tdth-colspan" title="attr-tdth-colspan"><code>colspan</code></dfn> content
   attribute specified, whose value must be a <a href="common-microsyntaxes.html#valid-non-negative-integer">valid non-negative
   integer</a> greater than zero.</p><p>The <code><a href="#the-td-element">td</a></code> and <code><a href="#the-th-element">th</a></code> elements may also have a
   <dfn id="attr-tdth-rowspan" title="attr-tdth-rowspan"><code>rowspan</code></dfn> content
@@ -1483,9 +1495,7 @@
   integer</a>.</p><p>These attributes give the number of columns and rows respectively
   that the cell is to span. These attributes must not be used to
   overlap cells<span class="impl">, as described in the description of
-  the <a href="#table-model">table model</a></span>.</p><!-- conformance criteria
-  for determining when this is violated are given in the processing
-  model --><hr/><p>The <code><a href="#the-td-element">td</a></code> and <code><a href="#the-th-element">th</a></code> element may have a <dfn id="attr-tdth-headers" title="attr-tdth-headers"><code>headers</code></dfn> content
+  the <a href="#table-model">table model</a></span>.</p><hr/><p>The <code><a href="#the-td-element">td</a></code> and <code><a href="#the-th-element">th</a></code> element may have a <dfn id="attr-tdth-headers" title="attr-tdth-headers"><code>headers</code></dfn> content
   attribute specified. The <code title="attr-tdth-headers"><a href="#attr-tdth-headers">headers</a></code> attribute, if specified,
   must contain a string consisting of an <a href="common-microsyntaxes.html#unordered-set-of-unique-space-separated-tokens">unordered set of unique
   space-separated tokens</a> that are <a href="infrastructure.html#case-sensitive">case-sensitive</a>,
@@ -1657,11 +1667,7 @@
 
    <li>
 
-    <!-- this step is here just so that we can be sure to have a first
-    element in the next step, so that we can set up the "advance"
-    exception-handling thingy below; otherwise it'd be more
-    complicated. it's not a perf optimization per se. -->
-
+    
     <p>If the <code><a href="#the-table-element">table</a></code> element has no children elements,
     then return <var title="">the table</var> (which will be empty),
     and abort these steps.</p>
@@ -1980,7 +1986,7 @@
 
    <li>
 
-    <!-- if we added any rows, make them part of a row group -->
+    
     <p>If <span title=""><var title="">y<sub title="">height</sub></var>&#xA0;&gt;&#xA0;<var title="">y<sub title="">start</sub></var></span>, then let all the last <a href="#concept-row" title="concept-row">rows</a> in <var title="">the table</var>
     from <span title="">y=<var title="">y<sub title="">start</sub></var></span>
     to <span title="">y=<var title="">y<sub title="">height</sub></var>-1</span> form a new <a href="#concept-row-group" title="concept-row-group">row group</a>, anchored at the slot
@@ -2241,8 +2247,8 @@
 
        <li>
 
-        <!-- support headers="" to <td> for legacy compat -->
-        <!-- note that it's not conforming though -->
+        
+        
         <p>For each token in the <var title="">id list</var>, if the
         first element in the <code><a href="infrastructure.html#document">Document</a></code> with an <a href="elements.html#concept-id" title="concept-id">ID</a> equal to
         the token is a cell in the same <a href="#concept-table" title="concept-table">table</a>, and that cell is not the
@@ -2314,7 +2320,7 @@
         <span title=""><var title="">principal<sub title="">y</sub></var>+<var title="">principal<sub title="">height</sub></var>-1</span> to
         <var title="">header list</var>.</p>
 
-        <!-- this might introduce principal accidentally; fixed below -->
+        
 
        </li>
 
@@ -2330,7 +2336,7 @@
         less than or equal to <span title=""><var title="">principal<sub title="">x</sub></var>+<var title="">principal<sub title="">width</sub></var>-1</span> and a <var title="">y</var>-coordinate less than or equal to <span title=""><var title="">principal<sub title="">y</sub></var>+<var title="">principal<sub title="">height</sub></var>-1</span> to
         <var title="">header list</var>.</p>
 
-        <!-- this might introduce principal accidentally; fixed below -->
+        
 
        </li>
 
@@ -2357,9 +2363,7 @@
 
    <li>
 
-    <p>Remove <var title="">principal cell</var> from the <var title="">header list</var> if it is there.</p> <!-- see "might
-    introduce principal accidentally" above -->
-
+    <p>Remove <var title="">principal cell</var> from the <var title="">header list</var> if it is there.</p> 
    </li>
 
    <li>
@@ -2548,7 +2552,7 @@
 
   </div><h4 id="examples"><span class="secno">4.9.13 </span>Examples</h4><p><i>This section is non-normative.</i></p><p>The following shows how might one mark up the bottom part of
   table 45 of the <cite>Smithsonian physical tables, Volume
-  71</cite>:</p><!-- Smithsonian physical tables, Volume 71: By Smithsonian Institution, Frederick Eugene Fowle; page 76 --><!-- from the reprint of the seventh revised edition; publication 2539, published 1921 --><pre>&lt;table&gt;
+  71</cite>:</p><pre>&lt;table&gt;
  &lt;caption&gt;Specification values: &lt;b&gt;Steel&lt;/b&gt;, &lt;b&gt;Castings&lt;/b&gt;,
  Ann. A.S.T.M. A27-16, Class B;* P max. 0.06; S max. 0.05.&lt;/caption&gt;
  &lt;thead&gt;

Index: the-iframe-element.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/the-iframe-element.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- the-iframe-element.html	25 Feb 2011 07:05:30 -0000	1.8
+++ the-iframe-element.html	30 Apr 2011 11:35:46 -0000	1.9
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>4.8.2 The iframe element &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -429,9 +425,7 @@
   <a href="browsers.html#nested-browsing-context">nested browsing context</a> but with no <code title="attr-iframe-srcdoc"><a href="#attr-iframe-srcdoc">srcdoc</a></code> attribute specified has its
   <code title="attr-iframe-src"><a href="#attr-iframe-src">src</a></code> attribute set, changed, or
   removed, the user agent must <a href="#process-the-iframe-attributes">process the <code>iframe</code>
-  attributes</a>.</p> <!-- It doesn't happen when the base URL is
-  changed, though. -->
-
+  attributes</a>.</p> 
   <p>When the user agent is to <dfn id="process-the-iframe-attributes">process the <code>iframe</code>
   attributes</dfn>, it must run the first appropriate steps from the
   following list:</p>
@@ -439,7 +433,7 @@
   <dl class="switch"><dt>If the <code title="attr-iframe-srcdoc"><a href="#attr-iframe-srcdoc">srcdoc</a></code> attribute
    is specified</dt>
 
-   <dd><p><a href="history.html#navigate">Navigate</a><!--DONAV iframe--> the element's
+   <dd><p><a href="history.html#navigate">Navigate</a> the element's
    <a href="browsers.html#browsing-context">browsing context</a> to a resource whose
    <a href="fetching-resources.html#content-type">Content-Type</a> is <code><a href="iana.html#text-html">text/html</a></code>, whose
    <a href="urls.html#url">URL</a> is <code><a href="urls.html#about:srcdoc">about:srcdoc</a></code>, and whose data
@@ -470,7 +464,7 @@
      first time, <code><a href="fetching-resources.html#about:blank">about:blank</a></code> is loaded
      normally.)</p></li>
 
-     <li><p><a href="history.html#navigate">Navigate</a><!--DONAV iframe--> the element's
+     <li><p><a href="history.html#navigate">Navigate</a> the element's
      <a href="browsers.html#browsing-context">browsing context</a> to the resulting <a href="urls.html#absolute-url">absolute
      URL</a>.</p></li>
 
@@ -507,9 +501,7 @@
   <code><a href="infrastructure.html#document">Document</a></code> created when the <a href="browsers.html#browsing-context">browsing context</a>
   was created, then any <a href="history.html#navigate" title="navigate">navigation</a>
   required of the user agent in that algorithm must be completed with
-  <a href="history.html#replacement-enabled">replacement enabled</a>.</p> <!-- see also the note near
-  similar text for the location.assign() method -->
-
+  <a href="history.html#replacement-enabled">replacement enabled</a>.</p> 
   </div><p class="note">If, when the element is created, the <code title="attr-iframe-srcdoc"><a href="#attr-iframe-srcdoc">srcdoc</a></code> attribute is not set, and
   the <code title="attr-iframe-src"><a href="#attr-iframe-src">src</a></code> attribute is either
   also not set or set but its value cannot be <a href="urls.html#resolve-a-url" title="resolve a&#10;  url">resolved</a>, the browsing context will remain at the
@@ -663,13 +655,7 @@
   damage that can be caused by hostile HTML content, it should be
   served using the <code><a href="iana.html#text-html-sandboxed">text/html-sandboxed</a></code> MIME type.</p><div class="impl">
 
-  <!-- v2: Add a new attribute that enables new restrictions, e.g.:
-       - disallow cross-origin loads of any kind (networking
-         override that only allows same-origin URLs or about:,
-         javascript:, data:)
-       - block access to 'parent.frames' from sandbox
-  -->
-
+  
   <p>While the <code title="attr-iframe-sandbox"><a href="#attr-iframe-sandbox">sandbox</a></code>
   attribute is specified, the <code><a href="#the-iframe-element">iframe</a></code> element's
   <a href="browsers.html#nested-browsing-context">nested browsing context</a> must have the flags given in
@@ -742,7 +728,7 @@
     of other pages on the same site (in particular, pages that contain
     user-sensitive information).</p>
 
-    <!-- http://lists.w3.org/Archives/Public/public-web-security/2009Dec/thread.html#msg51 -->
+    
 
    </dd>
 
@@ -931,9 +917,7 @@
   <code><a href="#the-iframe-element">iframe</a></code>'s <code><a href="infrastructure.html#document">Document</a></code>, then a script in the
   "sandboxed" iframe could just reach out, remove the <code title="attr-iframe-sandbox"><a href="#attr-iframe-sandbox">sandbox</a></code> attribute, and then
   reload itself, effectively breaking out of the sandbox
-  altogether.</p><hr/><!-- v2: Might be interesting to have a value on seamless that
-  allowed event propagation of some sort, maybe based on the WICD
-  work: http://www.w3.org/TR/WICD/ --><p>The <dfn id="attr-iframe-seamless" title="attr-iframe-seamless"><code>seamless</code></dfn>
+  altogether.</p><hr/><p>The <dfn id="attr-iframe-seamless" title="attr-iframe-seamless"><code>seamless</code></dfn>
   attribute is a <a href="common-microsyntaxes.html#boolean-attribute">boolean attribute</a>. When specified, it
   indicates that the <code><a href="#the-iframe-element">iframe</a></code> element's <a href="browsers.html#browsing-context">browsing
   context</a> is to be rendered in a manner that makes it appear to
@@ -1097,21 +1081,7 @@
    <pre>&lt;iframe src="http://ads.example.com/?customerid=923513721&amp;amp;format=banner"
         width="468" height="60"&gt;&lt;/iframe&gt;</pre>
 
-  </div><h4 id="the-embed-element"><span class="secno">4.8.3 </span>The <dfn><code>embed</code></dfn> element</h4><!-- (v2?)
- we have all kinds of quirks we should define if they come up during
- testing, as e.g. shown in:
- http://mxr.mozilla.org/mozilla-central/source/layout/generic/nsObjectFrame.cpp
- http://trac.webkit.org/browser/trunk/WebCore/html/HTMLEmbedElement.cpp
- http://trac.webkit.org/browser/trunk/WebCore/rendering/RenderPartObject.cpp (updateWidget)
- e.g. - 240x200 default
-      - the attributes/params are sent in a name/value pair list as follows (for Gecko):
-         + attributes of the element, in source order
-         + a synthesised 'src' attribute, if there was no 'src' but
-           there was a 'data', with the value of the 'data' attribute
-         + the params, in source order
-        (WebKit does something different still)
-      - the HIDDEN attribute (might be moot now)
---><dl class="element"><dt>Categories</dt>
+  </div><h4 id="the-embed-element"><span class="secno">4.8.3 </span>The <dfn><code>embed</code></dfn> element</h4><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>
@@ -1217,27 +1187,16 @@
     attribute, relative to the element. If that is successful, the
     user agent should <a href="fetching-resources.html#fetch">fetch</a> the resulting <a href="urls.html#absolute-url">absolute
     URL</a>, from the element's <a href="browsers.html#browsing-context-scope-origin">browsing context scope
-    origin</a> if it has one<!-- potentially http-origin privacy
-    sensitive -->. The <a href="webappapis.html#concept-task" title="concept-task">task</a> that is
+    origin</a> if it has one. The <a href="webappapis.html#concept-task" title="concept-task">task</a> that is
     <a href="webappapis.html#queue-a-task" title="queue a task">queued</a> by the <a href="webappapis.html#networking-task-source">networking
     task source</a> once the resource has been <a href="fetching-resources.html#fetch" title="fetch">fetched</a> must find and instantiate an
     appropriate <a href="infrastructure.html#plugin">plugin</a> based on the <a href="#concept-embed-type" title="concept-embed-type">content's type</a>, and hand that
     <a href="infrastructure.html#plugin">plugin</a> the content of the resource, replacing any
-    previously instantiated plugin for the element.</p> <!-- Note that
-    this doesn't happen when the base URL changes. -->
-
+    previously instantiated plugin for the element.</p> 
     <p>Fetching the resource must <a href="the-end.html#delay-the-load-event">delay the load event</a> of
     the element's document.</p>
-    <!-- if we add load/error events, then replace the previous
-    paragraph with the text one: -->
-    <!-- similar text in various places -->
-    <!--<p>Fetching the resource must <span>delay the load
-    event</span> of the element's document until the final <span
-    title="concept-task">task</span> that is <span title="queue a
-    task">queued</span> by the <span>networking task source</span>
-    once the resource has been <span title="fetch">fetched</span> has
-    been run.</p>-->
-
+        
+    
    </dd>
 
    <dt>If the element has no <code title="attr-embed-src"><a href="#attr-embed-src">src</a></code>
@@ -1265,10 +1224,7 @@
 
    <li>
 
-    <!-- if we get to this point we know we can successfully parsed
-    the URL, since this algorithm is only used after fetching the
-    resource in the steps above -->
-
+    
     <p>Otherwise, if the <a href="urls.html#url-path" title="url-path">&lt;path&gt;</a>
     component of the <a href="urls.html#url">URL</a> of the specified resource (after
     any redirects) matches a pattern that a <a href="infrastructure.html#plugin">plugin</a>
@@ -1279,8 +1235,8 @@
     handle resources with <a href="urls.html#url-path" title="url-path">&lt;path&gt;</a>
     components that end with the four character string "<code title="">.swf</code>".</p>
 
-    <!-- it's sad that we have to do extension sniffing. sigh. -->
-    <!-- see also <object> which has a similar step -->
+    
+    
 
    </li>
 
@@ -1291,7 +1247,7 @@
    <li><p>Otherwise, the content has no type and there can be no
    appropriate <a href="infrastructure.html#plugin">plugin</a> for it.</p></li>
 
-   <!-- This algorithm is a monument to bad design. Go legacy! -->
+   
 
   </ol><p>The <code><a href="#the-embed-element">embed</a></code> element has no <a href="content-models.html#fallback-content">fallback
   content</a>. If the user agent can't find a suitable plugin, then
@@ -1307,8 +1263,7 @@
   with error responses (e.g. HTTP 500 Internal Server Error codes can
   still contain plugin data).</p>
 
-  </div><p>Any namespace-less attribute other than <code title="attr-embed-name"><a href="obsolete.html#attr-embed-name">name</a></code>, <code title="attr-embed-align"><a href="obsolete.html#attr-embed-align">align</a></code>, <code title="attr-embed-hspace"><a href="obsolete.html#attr-embed-hspace">hspace</a></code>, and <code title="attr-embed-vspace"><a href="obsolete.html#attr-embed-vspace">vspace</a></code> <!-- when editing, see also
-  note below --> may be specified on the <code><a href="#the-embed-element">embed</a></code> element,
+  </div><p>Any namespace-less attribute other than <code title="attr-embed-name"><a href="obsolete.html#attr-embed-name">name</a></code>, <code title="attr-embed-align"><a href="obsolete.html#attr-embed-align">align</a></code>, <code title="attr-embed-hspace"><a href="obsolete.html#attr-embed-hspace">hspace</a></code>, and <code title="attr-embed-vspace"><a href="obsolete.html#attr-embed-vspace">vspace</a></code>  may be specified on the <code><a href="#the-embed-element">embed</a></code> element,
   so long as its name is <a href="infrastructure.html#xml-compatible">XML-compatible</a> and contains no
   characters in the range U+0041 to U+005A (LATIN CAPITAL LETTER A to
   LATIN CAPITAL LETTER Z). These attributes are then passed as
@@ -1361,7 +1316,7 @@
    <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>
-   <dd>If the element has a <code title="attr-hyperlink-usemap"><a href="the-map-element.html#attr-hyperlink-usemap">usemap</a></code> attribute: <a href="content-models.html#interactive-content">Interactive content</a>.</dd> <!-- also when showing a plugin or a nested browsing context, but checking that statically is hard...) -->
+   <dd>If the element has a <code title="attr-hyperlink-usemap"><a href="the-map-element.html#attr-hyperlink-usemap">usemap</a></code> attribute: <a href="content-models.html#interactive-content">Interactive content</a>.</dd> 
    <dd><a href="forms.html#category-listed" title="category-listed">Listed</a>,  <a href="forms.html#category-submit" title="category-submit">submittable</a>, <a href="forms.html#form-associated-element">form-associated element</a>.</dd>
    <dt>Contexts in which this element can be used:</dt>
    <dd>Where <a href="content-models.html#embedded-content">embedded content</a> is expected.</dd>
@@ -1432,9 +1387,7 @@
   to run the following steps to (re)determine what the
   <code><a href="#the-object-element">object</a></code> element represents. The <a href="webappapis.html#task-source">task source</a>
   for this <a href="webappapis.html#concept-task" title="concept-task">task</a> is the <a href="webappapis.html#dom-manipulation-task-source">DOM
-  manipulation task source</a>.</p> <!-- Changing the base URL
-  doesn't trigger this. -->
-
+  manipulation task source</a>.</p> 
   <ol><li>
 
     <p>If the user has indicated a preference that this
@@ -1464,9 +1417,7 @@
 
    <li>
 
-    <!-- what if it's not in the document? if that should prevent
-    plugin instantiation, then here just skip to the last step -->
-
+    
     <p>If the <code title="attr-object-classid"><a href="obsolete.html#attr-object-classid">classid</a></code>
     attribute is present, and has a value that isn't the empty string,
     then: if the user agent can find a <a href="infrastructure.html#plugin">plugin</a> suitable
@@ -1478,34 +1429,10 @@
     reports an error, jump to the last step in the overall set of
     steps (fallback).</p>
 
-    <!--
-     case insensitive:
-      is "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" -> application/x-shockwave-flash
-      is "clsid:cfcdaa03-8be4-11cf-b84b-0020afbbccfa" -> audio/x-pn-realaudio-plugin
-      is "clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b" -> video/quicktime
-      is "clsid:166b1bca-3f9c-11cf-8075-444553540000" -> application/x-director
-      is "clsid:6bf52a52-394a-11d3-b153-00c04f79faa6" -> application/x-mplayer2
-      starts with "java:"                             -> application/x-java-vm
-      starts with "clsid:"                            -> application/x-oleobject
-    -->
-
+    
    </li>
 
-   <!-- (v2?)
-   we may have to define magic fallback to <param> if it turns out to
-   be needed in testing:
-   <hyatt> apparently your url can come from <param>
-   <hyatt> not just the data attribute
-   <hyatt> our code looks for params with "src", "movie", "code" and "url"
-   <hyatt> and also tries to find the type on a param
-   <Hixie> oh that's you trying to have hacky activex support
-   <Hixie> opera does that too
-   <hyatt> yeah we support activex versions of plugins that are common
-   <hyatt> like flash and quicktime and realaudio
-   <Hixie> that would be a step 1b. if no data attribute, then look for a <param> to get you a URL instead.
-   <Hixie> and if you find one, carry on as if that was your data="".
-   -->
-
+   
    <li><p>If the <code title="attr-object-data"><a href="#attr-object-data">data</a></code> attribute
    is present and its value is not the empty string, then:</p>
 
@@ -1528,14 +1455,18 @@
 
       <p><a href="fetching-resources.html#fetch">Fetch</a> the resulting <a href="urls.html#absolute-url">absolute URL</a>,
       from the element's <a href="browsers.html#browsing-context-scope-origin">browsing context scope origin</a> if
-      it has one<!-- potentially http-origin privacy sensitive
-      -->.</p>
+      it has one.</p>
 
-      <!-- similar text in various places --> <p>Fetching the resource
+       <p>Fetching the resource
       must <a href="the-end.html#delay-the-load-event">delay the load event</a> of the element's document
       until the <a href="webappapis.html#concept-task" title="concept-task">task</a> that is <a href="webappapis.html#queue-a-task" title="queue a task">queued</a> by the <a href="webappapis.html#networking-task-source">networking task
       source</a> once the resource has been <a href="fetching-resources.html#fetch" title="fetch">fetched</a> (defined next) has been run.</p>
 
+      <p>For the purposes of the <a href="offline.html#application-cache">application cache</a>
+      networking model, this <a href="fetching-resources.html#fetch">fetch</a> operation is not for a
+      <a href="browsers.html#child-browsing-context">child browsing context</a> (though it might end up
+      being used for one after all, as defined below).</p>
+
      </li>
 
      <li><p>If the resource is not yet available (e.g. because the
@@ -1557,57 +1488,6 @@
 
       <p>Determine the <var title="">resource type</var>, as follows:</p>
 
-<!-- Hopefully this step is exactly equivalent to the following:
-
- START
-   |
-   V
- Is there a Content-Type and is the UA going to obey it blindly?
-   |                   |
-   | YES               | NO
-   |                   V                                                          YES
-   |                 Is there a type="" attribute whose value is a plugin type? ============================================-.
-   |                   |                                                                                                     |
-   |                   | NO                                                                                                  |
-   |                   V                        NO                                       YES                                 |
-   |                 Is there a Content type? ========-> Is there a type="" attribute? ==========> Let TYPE be type=""       |
-   |                   |                                                           |               attribute value           |
-   |                   | YES                                                       | NO                    |                 |
-   V            NO     V                                                           |                       V                 |
-   +-<============== Is it text/plain or application/octet-stream?                 `==> Let TYPE be  =====>+                 |
-   |                   |                                     |                          Sniffed type       |                 |
-   |                   | text/plain                          | octet-stream                                V                 |
-   |                   V                              YES    V                                          Is TYPE              |
-   |                 Does the page sniff as binary? ======> Is there a type="" attribute?       application/octet-stream?    |
-   |                   |                                     |              |                      |                |        |
-   |                   | NO                                  | YES          | NO                   | YES            | NO     |
-   |                   |                                     |       YES    V                      V                |        |
-   |                   |                  application/octet-stream? =====> Extension that is plugin type?           |        |
-   |                   |                                     |                          |          |                |        |
-   |                   |                                     | NO                       | NO       | YES            |        |
-   |                   |                                     V                          |          |                |        |
-   |                   |                           Type attribute is XML or     YES     V          |                |        |
-   |                   |                           doesn't start with image/* ======> FALLBACK     |                |        |
-   |                   |                           and is not a plugin type?                       |                |        |
-   |                   |                                          |                                |                |        |
-   |                   |                                          | NO                             |                |        V
-   V                   V                                          V                                V                V       Use
-  Use                 Use                                        Use it (will be                  Use              Use      type=""
-  Content-Type        text/plain                                 bitmap or plugin)                extension        TYPE     attribute
-   |                   |                                          |                                |                |        |
-   |                   V                                          V                                V                V        |
-   `================->-+========================================>-+==============>-+-<============-+-<==============+-<======'
-                                                                                   |
-                                                                                   V
-                                                                  Continue following rules in the spec, which might
-                                                                  result in a plugin, a browsing context, an image,
-                                                                  or using fallback, depending on the UA and the type.
-
-
-   "Extension that is plugin type?" means "Is there an extension that matches one that a plugin supports?".
-   Plugins are not allowed to register text/plain or application/octet-stream.
-
--->
 
       <ol><li>
 
@@ -1617,7 +1497,7 @@
 
        <li>
 
-        <!-- by request: http://www.w3.org/Bugs/Public/show_bug.cgi?id=8479 -->
+        
 
         <p>If the user agent is configured to strictly obey
         Content-Type headers for this resource, and the resource has
@@ -1745,10 +1625,7 @@
 
        <li>
 
-        <!-- if we get to this point we know we can successfully
-        parsed the URL, since this algorithm is only used after
-        fetching the resource in the steps above -->
-
+        
         <p>If the <a href="urls.html#url-path" title="url-path">&lt;path&gt;</a> component
         of the <a href="urls.html#url">URL</a> of the specified resource (after any
         redirects) matches a pattern that a <a href="infrastructure.html#plugin">plugin</a>
@@ -1759,8 +1636,8 @@
         handle resources with <a href="urls.html#url-path" title="url-path">&lt;path&gt;</a> components that end with
         the four character string "<code title="">.swf</code>".</p>
 
-        <!-- it's sad that we have to do extension sniffing. sigh. -->
-        <!-- see also <embed> which has a similar step -->
+        
+        
 
        </li>
 
@@ -1793,7 +1670,7 @@
 
        <dt>If the <var title="">resource type</var> is an <a href="infrastructure.html#xml-mime-type">XML MIME
        type</a>, or
-       <!-- (redundant with the next one) if the <var title="">resource type</var> is HTML, or -->
+       
        if the <var title="">resource type</var> does not start with
        "<code>image/</code>"</dt>
 
@@ -1805,7 +1682,7 @@
 
         <p>If the <a href="urls.html#url">URL</a> of the given resource is not
         <code><a href="fetching-resources.html#about:blank">about:blank</a></code>, the element's <a href="browsers.html#nested-browsing-context">nested browsing
-        context</a> must then be <a href="history.html#navigate" title="navigate">navigated</a><!--DONAV object--> to that
+        context</a> must then be <a href="history.html#navigate" title="navigate">navigated</a> to that
         resource, with <a href="history.html#replacement-enabled">replacement enabled</a>, and with the
         <code><a href="#the-object-element">object</a></code> element's document's <a href="browsers.html#browsing-context">browsing
         context</a> as the <a href="history.html#source-browsing-context">source browsing context</a>.
@@ -1828,14 +1705,21 @@
         to the value of this attribute; otherwise, the <a href="browsers.html#browsing-context-name">browsing
         context name</a> must be set to the empty string.</p>
 
-        <p class="note">It's possible that the <a href="history.html#navigate" title="navigate">navigation</a> of the <a href="browsers.html#browsing-context">browsing
-        context</a> will actually obtain the resource from a
-        different <a href="offline.html#application-cache">application cache</a>. Even if the resource
-        is then found to have a different type, it is still used as
-        part of a <a href="browsers.html#nested-browsing-context">nested browsing context</a>; this algorithm
-        doesn't restart with the new resource.</p>
+        <p class="note">In certain situations, e.g. if the resource
+        was <a href="fetching-resources.html#fetch" title="fetch">fetched</a> from an
+        <a href="offline.html#application-cache">application cache</a> but it is an HTML file with a
+        <code title="attr-html-manifest"><a href="semantics.html#attr-html-manifest">manifest</a></code> attribute
+        that points to a different <a href="offline.html#concept-appcache-manifest" title="concept-appcache-manifest">application cache
+        manifest</a>, the <a href="history.html#navigate" title="navigate">navigation</a>
+        of the <a href="browsers.html#browsing-context">browsing context</a> will be restarted so as
+        to load the resource afresh from the network or a different
+        <a href="offline.html#application-cache">application cache</a>. Even if the resource is then
+        found to have a different type, it is still used as part of a
+        <a href="browsers.html#nested-browsing-context">nested browsing context</a>: only the
+        <a href="history.html#navigate">navigate</a> algorithm is restarted, not this
+        <code><a href="#the-object-element">object</a></code> algorithm.</p>
 
-        <!-- note that malformed XML files don't cause fallback -->
+        
 
        </dd>
 
@@ -1883,8 +1767,7 @@
       <p>Once the resource is completely loaded, <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-load">load</code> at the element.</p>
 
-      <p>The <a href="webappapis.html#task-source">task source</a> for this task<!--tasks mentioned
-      in this section--> is the <a href="webappapis.html#dom-manipulation-task-source">DOM manipulation task
+      <p>The <a href="webappapis.html#task-source">task source</a> for this task is the <a href="webappapis.html#dom-manipulation-task-source">DOM manipulation task
       source</a>.</p>
 
      </li>

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/Overview.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Overview.html	25 Feb 2011 07:05:26 -0000	1.10
+++ Overview.html	30 Apr 2011 11:35:41 -0000	1.11
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie"><head><title>HTML5</title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -346,13 +342,14 @@
 
[...18700 lines suppressed...]
- v2  * make the spec consistent about whether the word "algorithm" is part of
-       an algorithm's name or not ("</dfn> algorithm", "</span> algorithm")
- v2  * make the spec more consistent about its use of "hexadecimal"
-       and "base-sixteen", the order that 0-9 A-Z a-z is mentioned,
-       and the detail to which the spec explains how to interpret a
-       string as a hexadecimal number.
- v2  * become more consistent about what markup we use to mark up
-       productions (nothing? <i>? <code>?)
- v2  * use <code>Document</code> consistently instead of 'document'.
- v2  * s/raise/throw/g
- v2  * be clearer about arrays/lists/collections being zero-based
-       despite using the term "/index/th".
- v2  * use the sample widgets:
-          <li><img alt="A text field with editable sections for each
-          value, with a button to pop up a dialog showing a calendar or
-          clock." src="sample-datetime-ui-2"></li>
-          <li><img alt="A calendar grid with a clock in the upper right
-          hand corner." src="sample-datetime-ui-3"></li>
---></body></html>
+  and support.</p></body></html>

Index: the-end.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/the-end.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- the-end.html	25 Feb 2011 07:05:30 -0000	1.9
+++ the-end.html	30 Apr 2011 11:35:46 -0000	1.10
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>8.2.6 The end &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -341,12 +337,12 @@
        document.getElementsByTagName('h2')[0].textContent += '; load: ' + (new Date() - loadTimer) + 'ms';
      fixBrokenLink();
    }
-  ]]></script><script src="link-fixup.js"/><link href="style.css" rel="stylesheet"/><link href="tokenization.html" title="8.2.4 Tokenization" rel="prev"/><link href="spec.html#contents" title="Table of contents" rel="index"/><link href="named-character-references.html" title="8.5 Named character references" rel="next"/></head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
+  ]]></script><script src="link-fixup.js"/><link href="style.css" rel="stylesheet"/><link href="tree-construction.html" title="8.2.5 Tree construction" rel="prev"/><link href="spec.html#contents" title="Table of contents" rel="index"/><link href="named-character-references.html" title="8.5 Named character references" rel="next"/></head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"/></a></p>
 
    <h1>HTML5</h1>
    </div><div>
-   <a href="tokenization.html" class="prev">8.2.4 Tokenization</a> &#x2013;
+   <a href="tree-construction.html" class="prev">8.2.5 Tree construction</a> &#x2013;
    <a href="spec.html#contents">Table of contents</a> &#x2013;
    <a href="named-character-references.html" class="next">8.5 Named character references</a>
   <ol class="toc"><li><ol><li><ol><li><a href="the-end.html#the-end"><span class="secno">8.2.6 </span>The end</a></li><li><a href="the-end.html#coercing-an-html-dom-into-an-infoset"><span class="secno">8.2.7 </span>Coercing an HTML DOM into an infoset</a></li><li><a href="the-end.html#an-introduction-to-error-handling-and-strange-cases-in-the-parser"><span class="secno">8.2.8 </span>An introduction to error handling and strange cases in the parser</a>
@@ -357,8 +353,8 @@
   <p>Once the user agent <dfn id="stop-parsing" title="stop parsing">stops parsing</dfn>
   the document, the user agent must run the following steps:</p>
 
-  <ol><!-- this happens as part of one of the tasks that runs the parser --><li><p>Set the <a href="dom.html#current-document-readiness">current document readiness</a> to
-   "interactive" <!-- this also synchronously fires an event --> and
+  <ol><li><p>Set the <a href="dom.html#current-document-readiness">current document readiness</a> to
+   "interactive"  and
    the <a href="parsing.html#insertion-point">insertion point</a> to undefined.</p></li>
 
    <li><p>Pop <em>all</em> the nodes off the <a href="parsing.html#stack-of-open-elements">stack of open
@@ -397,20 +393,13 @@
    <li><p><a href="webappapis.html#spin-the-event-loop">Spin the event loop</a> until the <a href="scripting-1.html#set-of-scripts-that-will-execute-as-soon-as-possible">set of
    scripts that will execute as soon as possible</a> and the
    <a href="scripting-1.html#list-of-scripts-that-will-execute-in-order-as-soon-as-possible">list of scripts that will execute in order as soon as
-   possible</a> are empty.</p></li> <!-- this step is not redundant
-   with the next one, since <script type="text/javascript"> nodes delay the load event of the
-   document they are in, but they might change document between being
-   added to one document's set/list and executing those scripts, so
-   they might be delaying another document but still be in this
-   document's set/list. -->
-
+   possible</a> are empty.</p></li> 
    <li><p><a href="webappapis.html#spin-the-event-loop">Spin the event loop</a> until there is nothing that
    <dfn id="delay-the-load-event" title="delay the load event">delays the load event</dfn> in
    the <code><a href="infrastructure.html#document">Document</a></code>.</p></li>
 
    <li><p><a href="webappapis.html#queue-a-task">Queue a task</a> to set the <a href="dom.html#current-document-readiness">current document
-   readiness</a> to "complete". <!-- this also fires an event
-   synchronously during the task --></p></li>
+   readiness</a> to "complete". </p></li>
 
    <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 <a href="webappapis.html#fire-a-simple-event">fire a
@@ -430,14 +419,6 @@
    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> 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
-   must bubble but not be cancelable and has no default
-   action.</p></li>
-
    <li><p>If the <code><a href="infrastructure.html#document">Document</a></code> has any <a href="offline.html#pending-application-cache-download-process-tasks">pending
    application cache download process tasks</a>, then <a href="webappapis.html#queue-a-task" title="queue a task">queue</a> each such <a href="webappapis.html#concept-task" title="concept-task">task</a> in the order they were added to
    the list of <a href="offline.html#pending-application-cache-download-process-tasks">pending application cache download process
@@ -462,13 +443,7 @@
    <li><p>Pop <em>all</em> the nodes off the <a href="parsing.html#stack-of-open-elements">stack of open
    elements</a>.</p></li>
 
-   <!-- anything else? this is things that happen when you call
-   document.open() on a document that's still being parsed, or when
-   you navigate a document that's still parsing, or navigate the
-   parent of a frame with a document that's still parsing, or the user
-   hits "stop". Should the pending scripts be blown away or anything?
-   -->
-
+   
   </ol><p>Except where otherwise specified, the <a href="webappapis.html#task-source">task source</a>
   for the <a href="webappapis.html#concept-task" title="concept-task">tasks</a> mentioned in this
   section is the <a href="webappapis.html#dom-manipulation-task-source">DOM manipulation task source</a>.</p>
@@ -515,7 +490,7 @@
 
   <p class="example">As another example, consider the attribute
   <code>xlink:href</code>. Used on a MathML element, it becomes, after
-  being <a href="tokenization.html#adjust-foreign-attributes" title="adjust foreign attributes">adjusted</a>, an
+  being <a href="tree-construction.html#adjust-foreign-attributes" title="adjust foreign attributes">adjusted</a>, an
   attribute with a prefix "<code title="">xlink</code>" and a local
   name "<code title="">href</code>". However, used on an HTML element,
   it becomes an attribute with no prefix and the local name "<code title="">xlink:href</code>", which is not a valid NCName, and thus
@@ -525,7 +500,7 @@
   <p class="note">The resulting names from this conversion
   conveniently can't clash with any attribute generated by the
   <a href="parsing.html#html-parser">HTML parser</a>, since those are all either lowercase or
-  those listed in the <a href="tokenization.html#adjust-foreign-attributes">adjust foreign attributes</a>
+  those listed in the <a href="tree-construction.html#adjust-foreign-attributes">adjust foreign attributes</a>
   algorithm's table.</p>
 
   <p>If the XML API restricts comments from having two consecutive
@@ -585,9 +560,9 @@
   on it: <code><a href="semantics.html#the-html-element-0">html</a></code>, <code><a href="sections.html#the-body-element-0">body</a></code>, <code><a href="grouping-content.html#the-p-element">p</a></code>,
   <code><a href="text-level-semantics.html#the-b-element">b</a></code>, and <code><a href="text-level-semantics.html#the-i-element">i</a></code>. The <a href="parsing.html#list-of-active-formatting-elements">list of active
   formatting elements</a> just has two: <code><a href="text-level-semantics.html#the-b-element">b</a></code> and
-  <code><a href="text-level-semantics.html#the-i-element">i</a></code>. The <a href="parsing.html#insertion-mode">insertion mode</a> is "<a href="tokenization.html#parsing-main-inbody" title="insertion mode: in body">in body</a>".</p>
+  <code><a href="text-level-semantics.html#the-i-element">i</a></code>. The <a href="parsing.html#insertion-mode">insertion mode</a> is "<a href="tree-construction.html#parsing-main-inbody" title="insertion mode: in body">in body</a>".</p>
 
-  <p>Upon receiving the end tag token with the tag name "b", the "<a href="tokenization.html#adoptionAgency">adoption agency algorithm</a>" is
+  <p>Upon receiving the end tag token with the tag name "b", the "<a href="tree-construction.html#adoptionAgency">adoption agency algorithm</a>" is
   invoked. This is a simple case, in that the <var title="">formatting
   element</var> is the <code><a href="text-level-semantics.html#the-b-element">b</a></code> element, and there is no
   <var title="">furthest block</var>. Thus, the <a href="parsing.html#stack-of-open-elements">stack of open
@@ -620,9 +595,9 @@
   elements</a> has four elements on it: <code><a href="semantics.html#the-html-element-0">html</a></code>,
   <code><a href="sections.html#the-body-element-0">body</a></code>, <code><a href="text-level-semantics.html#the-b-element">b</a></code>, and <code><a href="grouping-content.html#the-p-element">p</a></code>. The
   <a href="parsing.html#list-of-active-formatting-elements">list of active formatting elements</a> just has the one:
-  <code><a href="text-level-semantics.html#the-b-element">b</a></code>. The <a href="parsing.html#insertion-mode">insertion mode</a> is "<a href="tokenization.html#parsing-main-inbody" title="insertion mode: in body">in body</a>".</p>
+  <code><a href="text-level-semantics.html#the-b-element">b</a></code>. The <a href="parsing.html#insertion-mode">insertion mode</a> is "<a href="tree-construction.html#parsing-main-inbody" title="insertion mode: in body">in body</a>".</p>
 
-  <p>Upon receiving the end tag token with the tag name "b", the "<a href="tokenization.html#adoptionAgency">adoption agency algorithm</a>" is invoked, as
+  <p>Upon receiving the end tag token with the tag name "b", the "<a href="tree-construction.html#adoptionAgency">adoption agency algorithm</a>" is invoked, as
   in the previous example. However, in this case, there <em>is</em> a
   <var title="">furthest block</var>, namely the <code><a href="grouping-content.html#the-p-element">p</a></code> element. Thus,
   this time the adoption agency algorithm isn't skipped over.</p>
@@ -631,7 +606,7 @@
   element. A conceptual "bookmark" marks the position of the
   <code><a href="text-level-semantics.html#the-b-element">b</a></code> in the <a href="parsing.html#list-of-active-formatting-elements">list of active formatting
   elements</a>, but since that list has only one element in it,
-  it won't have much effect.</p>
+  the bookmark won't have much effect.</p>
 
   <p>As the algorithm progresses, <var title="">node</var> ends up set
   to the formatting element (<code><a href="text-level-semantics.html#the-b-element">b</a></code>), and <var title="">last
@@ -663,7 +638,7 @@
 
   <p>The highlighted <code><a href="text-level-semantics.html#the-b-element">b</a></code> element start tag is not allowed
   directly inside a table like that, and the parser handles this case
-  by placing the element <em>before</em> the table. (This is called <i title="foster parent"><a href="tokenization.html#foster-parent">foster parenting</a></i>.) This can be seen by
+  by placing the element <em>before</em> the table. (This is called <i title="foster parent"><a href="tree-construction.html#foster-parent">foster parenting</a></i>.) This can be seen by
   examining the DOM tree as it stands just after the
   <code><a href="tabular-data.html#the-table-element">table</a></code> element's start tag has been seen:</p>
 
@@ -675,14 +650,14 @@
   <code><a href="tabular-data.html#the-table-element">table</a></code>, and <code><a href="text-level-semantics.html#the-b-element">b</a></code> (in that order, despite the
   resulting DOM tree); the <a href="parsing.html#list-of-active-formatting-elements">list of active formatting
   elements</a> just has the <code><a href="text-level-semantics.html#the-b-element">b</a></code> element in it; and the
-  <a href="parsing.html#insertion-mode">insertion mode</a> is "<a href="tokenization.html#parsing-main-intable" title="insertion mode: in&#10;  table">in table</a>".</p>
+  <a href="parsing.html#insertion-mode">insertion mode</a> is "<a href="tree-construction.html#parsing-main-intable" title="insertion mode: in&#10;  table">in table</a>".</p>
 
   <p>The <code><a href="tabular-data.html#the-tr-element">tr</a></code> start tag causes the <code><a href="text-level-semantics.html#the-b-element">b</a></code> element
   to be popped off the stack and a <code><a href="tabular-data.html#the-tbody-element">tbody</a></code> start tag to be
   implied; the <code><a href="tabular-data.html#the-tbody-element">tbody</a></code> and <code><a href="tabular-data.html#the-tr-element">tr</a></code> elements are
   then handled in a rather straight-forward manner, taking the parser
-  through the "<a href="tokenization.html#parsing-main-intbody" title="insertion mode: in table body">in table
-  body</a>" and "<a href="tokenization.html#parsing-main-intr" title="insertion mode: in row">in
+  through the "<a href="tree-construction.html#parsing-main-intbody" title="insertion mode: in table body">in table
+  body</a>" and "<a href="tree-construction.html#parsing-main-intr" title="insertion mode: in row">in
   row</a>" insertion modes, after which the DOM looks as
   follows:</p>
 
@@ -690,11 +665,11 @@
   elements <code><a href="semantics.html#the-html-element-0">html</a></code>, <code><a href="sections.html#the-body-element-0">body</a></code>, <code><a href="tabular-data.html#the-table-element">table</a></code>,
   <code><a href="tabular-data.html#the-tbody-element">tbody</a></code>, and <code><a href="tabular-data.html#the-tr-element">tr</a></code>; the <a href="parsing.html#list-of-active-formatting-elements">list of active
   formatting elements</a> still has the <code><a href="text-level-semantics.html#the-b-element">b</a></code> element in
-  it; and the <a href="parsing.html#insertion-mode">insertion mode</a> is "<a href="tokenization.html#parsing-main-intr" title="insertion&#10;  mode: in row">in row</a>".</p>
+  it; and the <a href="parsing.html#insertion-mode">insertion mode</a> is "<a href="tree-construction.html#parsing-main-intr" title="insertion&#10;  mode: in row">in row</a>".</p>
 
   <p>The <code><a href="tabular-data.html#the-td-element">td</a></code> element start tag token, after putting a
   <code><a href="tabular-data.html#the-td-element">td</a></code> element on the tree, puts a marker on the <a href="parsing.html#list-of-active-formatting-elements">list
-  of active formatting elements</a> (it also switches to the "<a href="tokenization.html#parsing-main-intd" title="insertion mode: in cell">in cell</a>" <a href="parsing.html#insertion-mode">insertion
+  of active formatting elements</a> (it also switches to the "<a href="tree-construction.html#parsing-main-intd" title="insertion mode: in cell">in cell</a>" <a href="parsing.html#insertion-mode">insertion
   mode</a>).</p>
 
   <ul class="domTree"><li class="t1"><code><a href="semantics.html#the-html-element-0">html</a></code><ul><li class="t1"><code><a href="semantics.html#the-head-element-0">head</a></code></li><li class="t1"><code><a href="sections.html#the-body-element-0">body</a></code><ul><li class="t1"><code><a href="text-level-semantics.html#the-b-element">b</a></code></li><li class="t1"><code><a href="tabular-data.html#the-table-element">table</a></code><ul><li class="t1"><code><a href="tabular-data.html#the-tbody-element">tbody</a></code><ul><li class="t1"><code><a href="tabular-data.html#the-tr-element">tr</a></code><ul><li class="t1"><code><a href="tabular-data.html#the-td-element">td</a></code></li></ul></li></ul></li></ul></li></ul></li></ul></li></ul><p>The marker means that when the "aaa" character tokens are seen,
@@ -707,21 +682,21 @@
   and <code><a href="tabular-data.html#the-tbody-element">tbody</a></code>; the <a href="parsing.html#list-of-active-formatting-elements">list of active formatting
   elements</a> still has the <code><a href="text-level-semantics.html#the-b-element">b</a></code> element in it (the
   marker having been removed by the "td" end tag token); and the
-  <a href="parsing.html#insertion-mode">insertion mode</a> is "<a href="tokenization.html#parsing-main-intbody" title="insertion mode: in&#10;  table body">in table body</a>".</p>
+  <a href="parsing.html#insertion-mode">insertion mode</a> is "<a href="tree-construction.html#parsing-main-intbody" title="insertion mode: in&#10;  table body">in table body</a>".</p>
 
   <p>Thus it is that the "bbb" character tokens are found. These
-  trigger the "<a href="tokenization.html#parsing-main-intabletext" title="insertion mode: in table text">in table
+  trigger the "<a href="tree-construction.html#parsing-main-intabletext" title="insertion mode: in table text">in table
   text</a>" insertion mode to be used (with the <a href="parsing.html#original-insertion-mode">original
-  insertion mode</a> set to "<a href="tokenization.html#parsing-main-intbody" title="insertion mode: in table&#10;  body">in table body</a>"). The character tokens are collected,
+  insertion mode</a> set to "<a href="tree-construction.html#parsing-main-intbody" title="insertion mode: in table&#10;  body">in table body</a>"). The character tokens are collected,
   and when the next token (the <code><a href="tabular-data.html#the-table-element">table</a></code> element end tag) is
   seen, they are processed as a group. Since they are not all spaces,
-  they are handled as per the "anything else" rules in the "<a href="tokenization.html#parsing-main-intable" title="insertion mode: in table">in table</a>" insertion mode,
-  which defer to the "<a href="tokenization.html#parsing-main-inbody" title="insertion mode: in body">in
-  body</a>" insertion mode but with <a href="tokenization.html#foster-parent" title="foster&#10;  parent">foster parenting</a>.</p>
+  they are handled as per the "anything else" rules in the "<a href="tree-construction.html#parsing-main-intable" title="insertion mode: in table">in table</a>" insertion mode,
+  which defer to the "<a href="tree-construction.html#parsing-main-inbody" title="insertion mode: in body">in
+  body</a>" insertion mode but with <a href="tree-construction.html#foster-parent" title="foster&#10;  parent">foster parenting</a>.</p>
 
   <p>When <a href="parsing.html#reconstruct-the-active-formatting-elements" title="reconstruct the active formatting elements">the
   active formatting elements are reconstructed</a>, a
-  <code><a href="text-level-semantics.html#the-b-element">b</a></code> element is created and <a href="tokenization.html#foster-parent" title="foster&#10;  parent">foster parented</a>, and then the "bbb" text node is
+  <code><a href="text-level-semantics.html#the-b-element">b</a></code> element is created and <a href="tree-construction.html#foster-parent" title="foster&#10;  parent">foster parented</a>, and then the "bbb" text node is
   appended to it:</p>
 
   <ul class="domTree"><li class="t1"><code><a href="semantics.html#the-html-element-0">html</a></code><ul><li class="t1"><code><a href="semantics.html#the-head-element-0">head</a></code></li><li class="t1"><code><a href="sections.html#the-body-element-0">body</a></code><ul><li class="t1"><code><a href="text-level-semantics.html#the-b-element">b</a></code></li><li class="t1"><code><a href="text-level-semantics.html#the-b-element">b</a></code><ul><li class="t3"><code>#text</code>: <span title="">bbb</span></li></ul></li><li class="t1"><code><a href="tabular-data.html#the-table-element">table</a></code><ul><li class="t1"><code><a href="tabular-data.html#the-tbody-element">tbody</a></code><ul><li class="t1"><code><a href="tabular-data.html#the-tr-element">tr</a></code><ul><li class="t1"><code><a href="tabular-data.html#the-td-element">td</a></code><ul><li class="t3"><code>#text</code>: <span title="">aaa</span></li></ul></li></ul></li></ul></li></ul></li></ul></li></ul></li></ul><p>The <a href="parsing.html#stack-of-open-elements">stack of open elements</a> has on it the elements
@@ -729,7 +704,7 @@
   <code><a href="tabular-data.html#the-tbody-element">tbody</a></code>, and the new <code><a href="text-level-semantics.html#the-b-element">b</a></code> (again, note that
   this doesn't match the resulting tree!); the <a href="parsing.html#list-of-active-formatting-elements">list of active
   formatting elements</a> has the new <code><a href="text-level-semantics.html#the-b-element">b</a></code> element in it;
-  and the <a href="parsing.html#insertion-mode">insertion mode</a> is still "<a href="tokenization.html#parsing-main-intbody" title="insertion&#10;  mode: in table body">in table body</a>".</p>
+  and the <a href="parsing.html#insertion-mode">insertion mode</a> is still "<a href="tree-construction.html#parsing-main-intbody" title="insertion&#10;  mode: in table body">in table body</a>".</p>
 
   <p>Had the character tokens been only <a href="common-microsyntaxes.html#space-character" title="space&#10;  character">space characters</a> instead of "bbb", then those
   <a href="common-microsyntaxes.html#space-character" title="space character">space characters</a> would just be
@@ -960,11 +935,8 @@
         <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> <!-- 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 -->
-
+        node at this point.</p> 
+        
         <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
         a U+000A LINE FEED (LF) character.</p>

Index: history.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/history.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- history.html	25 Feb 2011 07:05:28 -0000	1.9
+++ history.html	30 Apr 2011 11:35:45 -0000	1.10
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>5.4 Session history and navigation &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -444,6 +440,7 @@
 
   </div><h4 id="the-history-interface"><span class="secno">5.4.2 </span>The <code><a href="#history-0">History</a></code> interface</h4><pre class="idl">interface <dfn id="history-0">History</dfn> {
   readonly attribute long <a href="#dom-history-length" title="dom-history-length">length</a>;
+  readonly attribute any <a href="#dom-history-state" title="dom-history-state">state</a>;
   void <a href="#dom-history-go" title="dom-history-go">go</a>(in optional long delta);
   void <a href="#dom-history-back" title="dom-history-back">back</a>();
   void <a href="#dom-history-forward" title="dom-history-forward">forward</a>();
@@ -457,6 +454,14 @@
 
    </dd>
 
+   <dt><var title="">window</var> . <code title="dom-history"><a href="#dom-history">history</a></code> . <code title="dom-history-state"><a href="#dom-history-state">state</a></code></dt>
+
+   <dd>
+
+    <p>Returns the current <a href="#state-object">state object</a>.</p>
+
+   </dd>
+
    <dt><var title="">window</var> . <code title="dom-history"><a href="#dom-history">history</a></code> . <code title="dom-history-go"><a href="#dom-history-go">go</a></code>( [ <var title="">delta</var> ] )</dt>
 
    <dd>
@@ -532,6 +537,11 @@
 
   <p>The actual entries are not accessible from script.</p>
 
+  <p>The <dfn id="dom-history-state" title="dom-history-state"><code>state</code></dfn>
+  attribute of the <code><a href="#history-0">History</a></code> interface must return the last
+  value it was set to by the user agent. Initially, its value must be
+  null.</p>
+
   <p>When the <dfn id="dom-history-go" title="dom-history-go"><code>go(<var title="">delta</var>)</code></dfn> method is invoked, if the
   argument to the method was omitted or has the value zero, the user
   agent must act as if the <code title="dom-location-reload"><a href="#dom-location-reload">location.reload()</a></code> method was
@@ -670,7 +680,7 @@
      URL</a> that was found earlier in this algorithm as the
      <a href="urls.html#url">URL</a> of the entry.</p></li>
 
-     <li><p>Update the <a href="#current-entry">current entry</a> to be the this newly
+     <li><p>Update the <a href="#current-entry">current entry</a> to be this newly
      added entry.</p></li>
 
     </ol><p>Otherwise, if the method invoked was the <code title="dom-history-replaceState"><a href="#dom-history-replacestate">replaceState()</a></code> method:</p>
@@ -698,16 +708,8 @@
 
    <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>
+     <p>Set <code title="dom-history-state"><a href="#dom-history-state">history.state</a></code> to
+     another <a href="common-dom-interfaces.html#structured-clone">structured clone</a> of the specified <var title="">data</var>.</p>
 
    </li>
 
@@ -809,7 +811,7 @@
    document.forms.F.I.value = newI;
  }
 &lt;/SCRIPT&gt;
-&lt;BODY ONPOPSTATE="recover(event.state)"&gt;
+&lt;BODY ONPOPSTATE="set(event.state)"&gt;
 &lt;FORM NAME=F&gt;
 State: &lt;OUTPUT NAME=I&gt;1&lt;/OUTPUT&gt; &lt;INPUT VALUE="Increment" TYPE=BUTTON ONCLICK="inc()"&gt;
 &lt;/FORM&gt;</pre>
@@ -848,7 +850,7 @@
   void <a href="#dom-location-replace" title="dom-location-replace">replace</a>(in DOMString url);
   void <a href="#dom-location-reload" title="dom-location-reload">reload</a>();
 
-  // <a href="urls.html#url-decomposition-idl-attributes">URL decomposition IDL attributes</a> <!-- blame brendan for these "innovative" names -->
+  // <a href="urls.html#url-decomposition-idl-attributes">URL decomposition IDL attributes</a> 
            attribute DOMString <a href="#dom-location-protocol" title="dom-location-protocol">protocol</a>;
            attribute DOMString <a href="#dom-location-host" title="dom-location-host">host</a>;
            attribute DOMString <a href="#dom-location-hostname" title="dom-location-hostname">hostname</a>;
@@ -913,28 +915,24 @@
   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
   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, must
-  <a href="#navigate">navigate</a><!--DONAV location.href/assign--> the
+  <a href="#navigate">navigate</a> the
   <a href="browsers.html#browsing-context">browsing context</a> to the specified <var title="">url</var>. If the <a href="browsers.html#browsing-context">browsing context</a>'s
   <a href="#session-history">session history</a> contains only one
   <code><a href="infrastructure.html#document">Document</a></code>, and that was the <code><a href="fetching-resources.html#about:blank">about:blank</a></code>
   <code><a href="infrastructure.html#document">Document</a></code> created when the <a href="browsers.html#browsing-context">browsing context</a>
   was created, then the navigation must be done with <a href="#replacement-enabled">replacement
-  enabled</a>.</p> <!-- READ ME WHEN EDITING THIS: IE and Firefox
-  only seem to treat it that way if the DOM is still a virgin DOM;
-  Safari doesn't check that. Thus this might need changing if testing
-  shows the IE/Firefox behaviour is required here. -->
-
+  enabled</a>.</p> 
   <p>When the <dfn id="dom-location-replace" title="dom-location-replace"><code>replace(<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
   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.href/replace--> the
+  <a href="#navigate">navigate</a> 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
@@ -955,9 +953,7 @@
    resizing the <a href="browsers.html#browsing-context">browsing context</a></dt>
 
    <dd><p>Repaint the <a href="browsers.html#browsing-context">browsing context</a> and abort these
-   steps.</p></dd> <!-- this theoretically would have no effect but in
-   practice can be useful to work around rendering bugs. -->
-
+   steps.</p></dd> 
    <dt>If the <a href="browsers.html#browsing-context">browsing context</a>'s <a href="browsers.html#active-document">active
    document</a> is <a href="the-iframe-element.html#an-iframe-srcdoc-document">an <code>iframe</code> <code title="attr-iframe-srcdoc">srcdoc</code> document</a></dt>
 
@@ -973,18 +969,16 @@
 
    <dt>Otherwise</dt>
 
-   <dd><p><a href="#navigate">Navigate</a><!--DONAV location.reload()--> the
+   <dd><p><a href="#navigate">Navigate</a> the
    <a href="browsers.html#browsing-context">browsing context</a> to <a href="dom.html#the-document-s-current-address">the document's current
    address</a> with <a href="#replacement-enabled">replacement enabled</a>. The
    <a href="#source-browsing-context">source browsing context</a> must be the <a href="browsers.html#browsing-context">browsing
-   context</a> being navigated.</p></dd> <!-- it appears that
-   document.reload() always uses GET and does not, e.g., re-POST. -->
-
-   <!-- http://software.hixie.ch/utilities/js/live-dom-viewer/saved/141 -->
+   context</a> being navigated.</p></dd> 
+   
 
   </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
+  user agent should <a href="#navigate">navigate</a> 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
@@ -1035,7 +1029,7 @@
   </li></ul></div><div class="impl">
 
   <h4 id="history-notes"><span class="secno">5.4.4 </span>Implementation notes for session history</h4>
-  <!-- don't change the ID without updating multiple internal links -->
+  
 
   <p><i>This section is non-normative.</i></p>
 
@@ -1086,10 +1080,8 @@
   cause a browsing context to navigate, in addition to those defined
   in this specification.</p>
 
-  <!-- NAVIGATE <dfn>navigate</dfn> -->
-  <!-- For places that _call_ this, as opposed to just referring to
-  it, search for "DONAV" -->
-  <p>When a browsing context is <dfn id="navigate" title="navigate">navigated</dfn>
+  
+    <p>When a browsing context is <dfn id="navigate" title="navigate">navigated</dfn>
   to a new resource, the user agent must run the following steps:</p>
 
   <ol><li><p>Release the <a href="webappapis.html#storage-mutex">storage mutex</a>.</p></li>
@@ -1121,8 +1113,7 @@
     the new resource in a new <a href="browsers.html#top-level-browsing-context">top-level browsing context</a>
     or in the <a href="browsers.html#top-level-browsing-context">top-level browsing context</a> of the
     <a href="#source-browsing-context">source browsing context</a>, at the user's option, in
-    which case the user agent must <a href="#navigate">navigate</a><!--DONAV
-    sandbox manual load--> that designated <a href="browsers.html#top-level-browsing-context">top-level browsing
+    which case the user agent must <a href="#navigate">navigate</a> that designated <a href="browsers.html#top-level-browsing-context">top-level browsing
     context</a> to the new resource as if the user had requested it
     independently.</p>
 
@@ -1150,7 +1141,7 @@
    being loaded in <em>this</em> navigation, then abort these steps
    without affecting the preexisting attempt to navigate the
    <a href="browsers.html#browsing-context">browsing context</a>.</p></li>
-   <!-- http://www.hixie.ch/tests/adhoc/html/navigation/unload/ -->
+   
 
    <li><p>If a <a href="webappapis.html#concept-task" title="concept-task">task</a> queued by the
    <a href="#traverse-the-history-by-a-delta">traverse the history by a delta</a> algorithm is running
@@ -1158,9 +1149,7 @@
    document</a> of the <a href="browsers.html#browsing-context">browsing context</a> being
    navigated, then abort these steps without affecting the
    <a href="#unload-a-document">unload a document</a> algorithm or the aforementioned
-   history traversal task.</p></li> <!-- this stops pages from
-   hijacking the back/forward button -->
-
+   history traversal task.</p></li> 
    <li><p>If there is a preexisting attempt to navigate the
    <a href="browsers.html#browsing-context">browsing context</a>, and either that attempt has not yet
    <a href="#concept-navigate-mature" title="concept-navigate-mature">matured</a> (i.e. it has
@@ -1187,10 +1176,6 @@
    <li><p>Cancel <em>any</em> preexisting attempt to navigate the
    <a href="browsers.html#browsing-context">browsing context</a>.</p></li>
 
-   <li><p><a href="#abort-a-document" title="abort a document">Abort</a> the
-   <a href="browsers.html#active-document">active document</a> of the <a href="browsers.html#browsing-context">browsing
-   context</a>.</p></li>
-
    <li><p>If the new resource is to be handled using a mechanism that
    does not affect the browsing context, e.g. ignoring the navigation
    request altogether because the specified scheme is not one of the
@@ -1202,6 +1187,10 @@
    <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.</p></li>
 
+   <li><p><a href="#abort-a-document" title="abort a document">Abort</a> the
+   <a href="browsers.html#active-document">active document</a> of the <a href="browsers.html#browsing-context">browsing
+   context</a>.</p></li>
+
    <li>
 
     <p>If the new resource is to be handled by displaying some sort of
@@ -1219,12 +1208,19 @@
 
    <li>
 
-    <p>If the new resource is to be fetched using HTTP GET <a href="fetching-resources.html#concept-http-equivalent-get" title="concept-http-equivalent-get">or equivalent</a>, then
-    check if there are any <a href="offline.html#relevant-application-cache" title="relevant application&#10;    cache">relevant application caches</a> that are identified by a
-    URL with the <a href="origin-0.html#same-origin">same origin</a> as the URL in question, and
-    that have this URL as one of their entries, excluding entries
-    marked as <a href="offline.html#concept-appcache-foreign" title="concept-appcache-foreign">foreign</a>. If so, then the
-    user agent must then get the resource from the <a href="offline.html#concept-appcache-selection" title="concept-appcache-selection">most appropriate application
+    <p>If the resource has already been obtained (e.g. because it is
+    being used to populate an <code><a href="the-iframe-element.html#the-object-element">object</a></code> element's new
+    <a href="browsers.html#child-browsing-context">child browsing context</a>), then skip this step.</p>
+
+    <p>Otherwise:</p>
+
+    <p>If the new resource is to be fetched using HTTP GET <a href="fetching-resources.html#concept-http-equivalent-get" title="concept-http-equivalent-get">or equivalent</a>, and
+    there are <a href="offline.html#relevant-application-cache" title="relevant application cache">relevant
+    application caches</a> that are identified by a URL with the
+    <a href="origin-0.html#same-origin">same origin</a> as the URL in question, and that have
+    this URL as one of their entries, excluding entries marked as
+    <a href="offline.html#concept-appcache-foreign" title="concept-appcache-foreign">foreign</a>, then get
+    the resource from the <a href="offline.html#concept-appcache-selection" title="concept-appcache-selection">most appropriate application
     cache</a> of those that match.</p>
 
     <p class="example">For example, imagine an HTML page with an
@@ -1239,35 +1235,26 @@
     application cache at all; the submission will be made to the
     network.</p>
 
-    <p>Otherwise, unless it has already been obtained<!-- it's
-    obtained by <object>, for instance -->, <a href="fetching-resources.html#fetch">fetch</a> the new
-    resource, with the <i>manual redirect flag</i> set.</p>
+    <p>Otherwise, <a href="fetching-resources.html#fetch">fetch</a> the new resource, with the
+    <i>manual redirect flag</i> set.</p>
 
     <p>If the resource is being fetched using a method other than one
     <a href="fetching-resources.html#concept-http-equivalent-get" title="concept-http-equivalent-get">equivalent to</a>
-    HTTP's GET<!-- or HEAD (but that can't happen) -->, or, if the
+    HTTP's GET, or, if the
     <a href="#navigate" title="navigate">navigation algorithm</a> was invoked as
     a result of the <a href="association-of-controls-and-forms.html#concept-form-submit" title="concept-form-submit">form submission
     algorithm</a>, then the <a href="fetching-resources.html#fetch" title="fetch">fetching
     algorithm</a> must be invoked from the <a href="origin-0.html#origin">origin</a> of
     the <a href="browsers.html#active-document">active document</a> of the <a href="#source-browsing-context">source browsing
-    context</a>, if any.</p> <!-- potentially http-origin privacy
-    sensitive -->
-
+    context</a>, if any.</p> 
     <p>If the <a href="browsers.html#browsing-context">browsing context</a> being navigated is a
     <a href="browsers.html#child-browsing-context">child browsing context</a> for an <code><a href="the-iframe-element.html#the-iframe-element">iframe</a></code> or
     <code><a href="the-iframe-element.html#the-object-element">object</a></code> element, then the <a href="fetching-resources.html#fetch" title="fetch">fetching
     algorithm</a> must be invoked from the <code><a href="the-iframe-element.html#the-iframe-element">iframe</a></code> or
     <code><a href="the-iframe-element.html#the-object-element">object</a></code> element's <a href="browsers.html#browsing-context-scope-origin">browsing context scope
-    origin</a>, if it has one.</p> <!-- potentially http-origin
-    privacy sensitive -->
-
+    origin</a>, if it has one.</p> 
     <p>The <a href="fetching-resources.html#fetch">fetch</a> algorithm must <a href="the-end.html#delay-the-load-event">delay the load
-    event</a> of the <a href="browsers.html#browsing-context">browsing context</a>.</p> <!-- this
-    is what makes <iframe> elements delay the load event of their
-    parent browsing context when their child browsing context is in
-    between this step and the step that starts the parser. -->
-
+    event</a> of the <a href="browsers.html#browsing-context">browsing context</a>.</p> 
    </li>
 
    <li>
@@ -1317,12 +1304,7 @@
     resource's URL, and the user didn't cancel the navigation attempt
     during the previous step, and the navigation attempt failed (e.g.
     the server returned a 4xx or 5xx status code <a href="fetching-resources.html#concept-http-equivalent-codes" title="concept-http-equivalent-codes">or equivalent</a>, or
-    there was a DNS error), then:</p> <!-- note that a redirect can
-    never reach this point as it is handled earlier, meaning that a
-    captive portal captures URLs in fallback namespaces and you can't
-    ever get to the fallback file of a resource if you have a captive
-    portal -->
-
+    there was a DNS error), then:</p> 
     <p>Let <var title="">candidate</var> be the <a href="offline.html#concept-appcache-fallback" title="concept-appcache-fallback">fallback resource</a>
     specified for the <a href="offline.html#concept-appcache-fallback-ns" title="concept-appcache-fallback-ns">fallback namespace</a> in
     question. If multiple application caches match, the user agent
@@ -1354,11 +1336,7 @@
      <li>Network errors</li>
     </ul></div>
 
-    <!-- theorectically, HTTP 205 processing would occur here,
-    resetting all forms with no other effect. However, it seems nobody
-    actually wants to use this ability, so requiring it here seems
-    like unnecessary work. -->
-
+    
     <p>HTTP 401 responses that do not include a challenge recognized
     by the user agent must be processed as if they had no challenge,
     e.g. rendering the entity body as if the response had been 200
@@ -1385,13 +1363,13 @@
    of the following types, jump to the appropriate entry in the
    following list, and process the resource as described there:</p>
 
-    <dl class="switch"><!-- an <span>HTML MIME type</span> --><dt>"<code><a href="iana.html#text-html">text/html</a></code>"</dt>
+    <dl class="switch"><dt>"<code><a href="iana.html#text-html">text/html</a></code>"</dt>
      <dt>"<code><a href="iana.html#text-html-sandboxed">text/html-sandboxed</a></code>"</dt>
      <dd>Follow the steps given in the <a href="#read-html" title="navigate-html">HTML document</a> section, and abort
      these steps.</dd>
 
-     <!-- an <span>XML MIME type</span> -->
-     <dt>Any type ending in "<code title="">+xml</code>"</dt> <!-- no need to say that the _subtype_ ends in "+xml" so long as the "sniffed type" algorithm continues to drop parameters -->
+     
+     <dt>Any type ending in "<code title="">+xml</code>"</dt> 
      <dt>"<code>application/xml</code>"</dt>
      <dt>"<code>text/xml</code>"</dt>
      <dd>Follow the steps given in the <a href="#read-xml" title="navigate-xml">XML
@@ -1524,10 +1502,7 @@
 
        <li><p>Remove any <a href="webappapis.html#concept-task" title="concept-task">tasks</a>
        queued by the <a href="webappapis.html#history-traversal-task-source">history traversal task
-       source</a>.</p></li> <!-- so the network is racing
-       history.back(), in the case of setting location.href="" and
-       then calling history.back() -->
-
+       source</a>.</p></li> 
        <li><p>Append a new entry at the end of the <code><a href="#history-0">History</a></code>
        object representing the new resource and its
        <code><a href="infrastructure.html#document">Document</a></code> object and related state.</p></li>
@@ -1587,9 +1562,7 @@
   on character encoding information found in the real <a href="fetching-resources.html#content-type" title="Content-Type">Content-Type metadata</a> of the resource;
   the "sniffed type" is not used for this purpose.</p>
 
-  <!-- next two paragraphs are nearly identical to the navigate-text
-  section, keep them in sync -->
-
+  
   <p>When no more bytes are available, the user agent must <a href="webappapis.html#queue-a-task">queue
   a task</a> for the parser to process the implied EOF character,
   which eventually causes a <code title="event-load">load</code> event
@@ -1600,7 +1573,7 @@
   history with the new page</a>.</p>
 
   <p class="note"><a href="offline.html#concept-appcache-init" title="concept-appcache-init">Application
-  cache selection</a> happens <a href="tokenization.html#parser-appcache">in the
+  cache selection</a> happens <a href="tree-construction.html#parser-appcache">in the
   HTML parser</a>.</p>
 
   <p>The <a href="webappapis.html#task-source">task source</a> for the two tasks mentioned in this
@@ -1643,7 +1616,7 @@
   <p class="note">Because the processing of the <code title="attr-html-manifest"><a href="semantics.html#attr-html-manifest">manifest</a></code> attribute happens
   only once the root element is parsed, any URLs referenced by
   processing instructions before the root element (such as <code title="">&lt;?xml-stylesheet?&gt;</code> and <code title="">&lt;?xbl?&gt;</code> PIs) will be fetched from the network and
-  cannot be cached.</p><!-- v2: fix this somehow -->
+  cannot be cached.</p>
 
   <p>User agents may examine the namespace of the root
   <code><a href="infrastructure.html#element">Element</a></code> node of this <code><a href="infrastructure.html#document">Document</a></code> object to
@@ -1673,9 +1646,7 @@
   an <a href="dom.html#html-documents" title="HTML documents">HTML document</a>, create an
   <a href="parsing.html#html-parser">HTML parser</a>, associate it with the document, act as if
   the tokenizer had emitted a start tag token with the tag name "pre"
-  followed by a single U+000A LINE FEED (LF) character<!-- to get
-  eaten, so that a leading LF in the text/plain stream doesn't get
-  eaten itself-->, and switch the <a href="parsing.html#html-parser">HTML parser</a>'s tokenizer
+  followed by a single U+000A LINE FEED (LF) character, and switch the <a href="parsing.html#html-parser">HTML parser</a>'s tokenizer
   to the <a href="tokenization.html#plaintext-state">PLAINTEXT state</a>.  Each <a href="webappapis.html#concept-task" title="concept-task">task</a> that the <a href="webappapis.html#networking-task-source">networking task
   source</a> places on the <a href="webappapis.html#task-queue">task queue</a> while the <a href="fetching-resources.html#fetch" title="fetch">fetching algorithm</a> runs must then fill the
   parser's <a href="parsing.html#the-input-stream">input stream</a> with the fetched bytes and cause
@@ -1684,8 +1655,8 @@
 
   <p>The rules for how to convert the bytes of the plain text document
   into actual characters, and the rules for actually rendering the
-  text to the user, are defined in RFC 2046, RFC 2646, and subsequent
-  versions thereof. <a href="references.html#refsRFC2046">[RFC2046]</a> <a href="references.html#refsRFC2646">[RFC2646]</a></p>
+  text to the user, are defined in RFC 2046, RFC 3676, and subsequent
+  versions thereof. <a href="references.html#refsRFC2046">[RFC2046]</a> <a href="references.html#refsRFC3676">[RFC3676]</a></p>
 
   <p>The <a href="dom.html#document-s-character-encoding">document's character encoding</a> must be set to the
   character encoding used to decode the document.</p>
@@ -1695,11 +1666,7 @@
   selection algorithm</a> with no manifest, and passing in the
   newly-created <code><a href="infrastructure.html#document">Document</a></code>.</p>
 
-  <!-- next two paragraphs are nearly identical to the navigate-html
-  section and similar to the "navigate-ua-inline" section, and the
-  next three are similar to the navigate-image and navigate-plugin
-  sections; keep them all in sync -->
-
+  
   <p>When no more bytes are available, the user agent must <a href="webappapis.html#queue-a-task">queue
   a task</a> for the parser to process the implied EOF character,
   which eventually causes a <code title="event-load">load</code> event
@@ -1714,7 +1681,7 @@
   binding, providing script, giving the document a <code><a href="semantics.html#the-title-element-0">title</a></code>,
   etc.</p>
 
-  <p class="note">In particular, if the user agent supports the <code title="">Format=Flowed</code> feature of RFC 2646 then the user
+  <p class="note">In particular, if the user agent supports the <code title="">Format=Flowed</code> feature of RFC 3676 then the user
   agent would need to apply extra styling to cause the text to wrap
   correctly and to handle the quoting feature. This could be performed
   using, e.g., an XBL binding or a CSS extension.</p>
@@ -1734,9 +1701,7 @@
   <code><a href="sections.html#the-body-element-0">body</a></code> element, and set the <code title="attr-img-src"><a href="embedded-content-1.html#attr-img-src">src</a></code> attribute of the <code><a href="embedded-content-1.html#the-img-element">img</a></code>
   element to the address of the image.</p>
 
-  <!-- next three paragraphs are similar to the navigate-text section,
-  keep them in sync -->
-
+  
   <p>Then, the user agent must act as if it had <a href="the-end.html#stop-parsing" title="stop&#10;  parsing">stopped parsing</a>.</p>
 
   <p>Upon creation of the <code><a href="infrastructure.html#document">Document</a></code> object, the user agent
@@ -1766,9 +1731,7 @@
   the <code><a href="sections.html#the-body-element-0">body</a></code> element, and set the <code title="attr-embed-src"><a href="the-iframe-element.html#attr-embed-src">src</a></code> attribute of the
   <code><a href="the-iframe-element.html#the-embed-element">embed</a></code> element to the address of the resource.</p>
 
-  <!-- next three paragraphs are similar to the navigate-text section,
-  keep them in sync -->
-
+  
   <p>Then, the user agent must act as if it had <a href="the-end.html#stop-parsing" title="stop&#10;  parsing">stopped parsing</a>.</p>
 
   <p>Upon creation of the <code><a href="infrastructure.html#document">Document</a></code> object, the user agent
@@ -1801,9 +1764,7 @@
   or mutate that <code><a href="infrastructure.html#document">Document</a></code> until it represents the content
   the user agent wants to render.</p>
 
-  <!-- next two paragraphs are similar to the navigate-text section,
-  keep them in sync -->
-
+  
   <p>Once the page has been set up, the user agent must act as if it
   had <a href="the-end.html#stop-parsing" title="stop parsing">stopped parsing</a>.</p>
 
@@ -1877,9 +1838,7 @@
 
   <ol><li><p><a href="urls.html#parse-a-url" title="parse a url">Parse</a> the <a href="urls.html#url">URL</a>,
    and let <var title="">fragid</var> be the <a href="urls.html#url-fragment" title="url-fragment">&lt;fragment&gt;</a> component of the
-   URL.</p></li><!-- parsing can't fail, since we checked earlier on
-   when navigating -->
-
+   URL.</p></li>
    <li><p>If <var title="">fragid</var> is the empty string, then
    <a href="#the-indicated-part-of-the-document">the indicated part of the document</a> is the top of the
    document; stop the algorithm here.</p></li>
@@ -1914,7 +1873,7 @@
   document</a>, if that is an element; otherwise there is no
   <i><a href="#target-element">target element</a></i>. <a href="references.html#refsSELECTORS">[SELECTORS]</a></p>
 
-  </div><h4 id="history-traversal"><span class="secno">5.5.9 </span>History traversal</h4><!-- session history --><div class="impl">
+  </div><h4 id="history-traversal"><span class="secno">5.5.9 </span>History traversal</h4><div class="impl">
 
   <p>When a user agent is required to <dfn id="traverse-the-history">traverse the history</dfn>
   to a <i>specified entry</i>, optionally with <a href="#replacement-enabled">replacement
@@ -1928,7 +1887,7 @@
 
   <ol><li><p>If there is no longer a <code><a href="infrastructure.html#document">Document</a></code> object for the
    entry in question, the user agent must
-   <a href="#navigate">navigate</a><!--DONAV history traversal after eviction-->
+   <a href="#navigate">navigate</a>
    the browsing context to the location for that entry to perform an
    <a href="#entry-update">entry update</a> of that entry, and abort these steps. The
    "<a href="#navigate">navigate</a>" algorithm reinvokes this "traverse"
@@ -2009,12 +1968,7 @@
      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
@@ -2042,7 +1996,7 @@
     and its rendering, for instance the scroll position or values of
     form fields, that it had previously recorded.</p>
 
-    <!-- see similar paragraphs in the textarea and input sections -->
+    
     <p class="note">This can even include updating the <code title="attr-dir"><a href="elements.html#the-dir-attribute">dir</a></code> attribute of <code><a href="the-button-element.html#the-textarea-element">textarea</a></code>
     elements or <code><a href="the-input-element.html#the-input-element">input</a></code> elements whose <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute is in either the
     <a href="states-of-the-type-attribute.html#text-state-and-search-state" title="attr-input-type-text">Text</a> state or the <a href="states-of-the-type-attribute.html#text-state-and-search-state" title="attr-input-type-search">Search</a> state, if the
@@ -2055,33 +2009,16 @@
    state object. Otherwise, let <var title="">state</var> be
    null.</p></li>
 
-   <li>
-
-    <p>Run the appropriate steps according to the conditions
-    described:</p>
-
-    <dl class="switch"><dt>If the <a href="dom.html#current-document-readiness">current document readiness</a> is set to the
-     string "complete"</dt>
-
-     <dd><p><a href="webappapis.html#queue-a-task">Queue a task</a> to fire a <code title="event-popstate"><a href="#event-popstate">popstate</a></code> event at the
-     <code><a href="browsers.html#window">Window</a></code> object of the <code><a href="infrastructure.html#document">Document</a></code>, using
-     the <code><a href="#popstateevent">PopStateEvent</a></code> interface, with the <code title="dom-PopStateEvent-state"><a href="#dom-popstateevent-state">state</a></code> attribute set to the
-     value of <var title="">state</var>. This event must bubble but
-     not be cancelable and has no default action.</p></dd>
-
-     <dt>Otherwise</dt>
-
-     <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>
-
-     <p class="note">The event will then be fired just after the <code title="event-load">load</code> event.</p></dd>
+   <li><p>Set <code title="dom-history-state"><a href="#dom-history-state">history.state</a></code> to <var title="">state</var>.</p></li>
 
-    </dl></li>
+   <li><p>Fire a <code title="event-popstate"><a href="#event-popstate">popstate</a></code> event at
+   the <code><a href="browsers.html#window">Window</a></code> object of the <code><a href="infrastructure.html#document">Document</a></code>, using
+   the <code><a href="#popstateevent">PopStateEvent</a></code> interface, with the <code title="dom-PopStateEvent-state"><a href="#dom-popstateevent-state">state</a></code> attribute set to the
+   value of <var title="">state</var>. This event must bubble but not
+   be cancelable and has no default action.</p></li>
 
-   <li><p>If <var title="">hash changed</var> is true, then
-   <a href="webappapis.html#queue-a-task">queue a task</a> to fire a <code title="event-hashchange"><a href="#event-hashchange">hashchange</a></code> event at the
+   <li><p>If <var title="">hash changed</var> is true, then fire a
+   <code title="event-hashchange"><a href="#event-hashchange">hashchange</a></code> event at the
    <a href="browsers.html#browsing-context">browsing context</a>'s <code><a href="browsers.html#window">Window</a></code> object, using
    the <code><a href="#hashchangeevent">HashChangeEvent</a></code> interface, with the <code title="dom-HashChangeEvent-oldURL"><a href="#dom-hashchangeevent-oldurl">oldURL</a></code> attribute set to
    <var title="">old URL</var> and the <code title="dom-HashChangeEvent-newURL"><a href="#dom-hashchangeevent-newurl">newURL</a></code> attribute set to
@@ -2091,12 +2028,7 @@
    <li><p>The <a href="#current-entry">current entry</a> is now the <i>specified
    entry</i>.</p></li>
 
-  </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
+  </ol><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>
 
 
@@ -2384,7 +2316,7 @@
    parser</a>, then <a href="the-end.html#abort-a-parser" title="abort a parser">abort that
    parser</a>.</p></li>
 
-   <!-- we could also stop all script, or stop animations -->
+   
 
   </ol><p>User agents may allow users to explicitly invoke the <a href="#abort-a-document" title="abort a document">abort a document</a> algorithm for a
   <code><a href="infrastructure.html#document">Document</a></code>. If the user does so, then, if that
@@ -2394,7 +2326,5 @@
   <code><a href="infrastructure.html#document">Document</a></code>'s <code><a href="browsers.html#window">Window</a></code> object before invoking
   the <a href="#abort-a-document" title="abort a document">abort</a> algorithm.</p>
 
-  <!-- I'd love to make this more precise, anyone have any suggestions
-  on what it should say? -->
-
+  
   </div></body></html>

Index: common-dom-interfaces.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/common-dom-interfaces.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- common-dom-interfaces.html	25 Feb 2011 07:05:27 -0000	1.7
+++ common-dom-interfaces.html	30 Apr 2011 11:35:43 -0000	1.8
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>2.8 Common DOM interfaces &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -355,10 +351,7 @@
   particular content attribute. This means that on getting, the IDL
   attribute returns the current value of the content attribute, and on
   setting, the IDL attribute changes the value of the content
-  attribute to the given value.</p><!-- v2 for completeness: (also search for REFLECTIDL)
-  <p class="note">A list of <span>reflecting IDL attributes</span> and
-  their corresponding content attributes is given in the index.</p>
---><div class="impl">
+  attribute to the given value.</p><div class="impl">
 
   <p>In general, on getting, if the content attribute is not present,
   the IDL attribute must act as if the content attribute's value is
@@ -447,11 +440,7 @@
   string representing the number as a <a href="common-microsyntaxes.html#valid-non-negative-integer">valid non-negative
   integer</a> and then that string must be used as the new content
   attribute value.</p>
-  <!-- see http://www.w3.org/Bugs/Public/show_bug.cgi?id=10352 and
-  https://bugzilla.mozilla.org/show_bug.cgi?id=586118 for why the
-  range is clamped to 2147483647 rather the normal unsigned long
-  maximum value of 4294967295 -->
-
+  
   <p>If a reflecting IDL attribute is an unsigned integer type
   (<code>unsigned long</code>) that is <dfn id="limited-to-only-non-negative-numbers-greater-than-zero">limited to only
   non-negative numbers greater than zero</dfn>, then the behavior is
@@ -467,7 +456,7 @@
   given value must be converted to the shortest possible string
   representing the number as a <a href="common-microsyntaxes.html#valid-non-negative-integer">valid non-negative integer</a>
   and then that string must be used as the new content attribute
-  value.</p> <!-- see previous paragraph for note about the range -->
+  value.</p> 
 
   <p>If a reflecting IDL attribute is a floating point number type
   (<code>double</code>), then, on getting, the content attribute must
@@ -616,7 +605,8 @@
   collection</a> have.</p>
 
   <p>The <dfn id="dom-htmlcollection-nameditem" title="dom-HTMLCollection-namedItem"><code>namedItem(<var title="">key</var>)</code></dfn> method must return the first node
-  in the collection that matches the following requirements:</p>
+  in the collection that matches either of the following
+  requirements:</p>
 
   <ul><li>It is an <code><a href="text-level-semantics.html#the-a-element">a</a></code>, <code><a href="obsolete.html#the-applet-element">applet</a></code>,
    <code><a href="the-map-element.html#the-area-element">area</a></code>, <code><a href="the-iframe-element.html#the-embed-element">embed</a></code>, <code><a href="forms.html#the-form-element">form</a></code>,
@@ -824,9 +814,7 @@
    <li><p>If <var title="">element</var> is not null, then set its
    <a href="association-of-controls-and-forms.html#concept-fe-checked" title="concept-fe-checked">checkedness</a> to true.</p>
 
-  </li></ol><!--
-http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20html%3E...%0A%3Cform%20name%3D%22a%22%3E%3Cinput%20id%3D%22x%22%20name%3D%22y%22%3E%3Cinput%20name%3D%22x%22%20id%3D%22y%22%3E%3C/form%3E%0A%3Cscript%3E%0A%20%20var%20x%3B%0A%20%20w%28x%20%3D%20document.forms%5B%27a%27%5D%5B%27x%27%5D%29%3B%0A%20%20w%28x.length%29%3B%0A%20%20x%5B0%5D.parentNode.removeChild%28x%5B0%5D%29%3B%0A%20%20w%28x.length%29%3B%0A%20%20w%28x%20%3D%3D%20document.forms%5B%27a%27%5D%5B%27x%27%5D%29%3B%0A%3C/script%3E%0A
---></div><h5 id="htmloptionscollection-0"><span class="secno">2.8.2.4 </span>HTMLOptionsCollection</h5><p>The <code><a href="#htmloptionscollection">HTMLOptionsCollection</a></code> interface represents a
+  </li></ol></div><h5 id="htmloptionscollection-0"><span class="secno">2.8.2.4 </span>HTMLOptionsCollection</h5><p>The <code><a href="#htmloptionscollection">HTMLOptionsCollection</a></code> interface represents a
   list of <code><a href="the-button-element.html#the-option-element">option</a></code> elements. It is always rooted on a
   <code><a href="the-button-element.html#the-select-element">select</a></code> element and has attributes and methods that
   manipulate that element's descendants.</p><pre class="idl">interface <dfn id="htmloptionscollection">HTMLOptionsCollection</dfn> : <a href="#htmlcollection">HTMLCollection</a> {
@@ -932,7 +920,7 @@
    <li>Otherwise, if there are no nodes in the collection that have
    either an <code title="attr-id"><a href="elements.html#the-id-attribute">id</a></code> attribute or a <code title="attr-option-name"><a href="obsolete.html#attr-option-name">name</a></code> attribute equal to <var title="">name</var>, then return null and stop the algorithm.</li>
 
-   <!-- IE returns an HTMLCollection instead; we may need to change to that for compat -->
+   
    <li>Otherwise, create a new <code><a href="infrastructure.html#nodelist">NodeList</a></code> object
    representing a <a href="infrastructure.html#live">live</a> view of the
    <code><a href="#htmloptionscollection">HTMLOptionsCollection</a></code> object, further filtered so that
@@ -991,7 +979,7 @@
   <code><a href="the-button-element.html#the-select-element">select</a></code> element on which the
   <code><a href="#htmloptionscollection">HTMLOptionsCollection</a></code> is rooted</p>
 
-  <!-- see also http://ln.hixie.ch/?start=1161042744&count=1 -->
+  
 
   </div><h4 id="domtokenlist-0"><span class="secno">2.8.3 </span>DOMTokenList</h4><p>The <code><a href="#domtokenlist">DOMTokenList</a></code> interface represents an interface
   to an underlying string that consists of a <a href="common-microsyntaxes.html#set-of-space-separated-tokens">set of
@@ -1417,17 +1405,13 @@
    <li value="15"><dfn id="invalid_access_err"><code>INVALID_ACCESS_ERR</code></dfn></li>
    <li value="16"><dfn id="validation_err"><code>VALIDATION_ERR</code></dfn></li>
    <li value="17"><dfn id="type_mismatch_err"><code>TYPE_MISMATCH_ERR</code></dfn></li>
-   <li value="18"><dfn id="security_err"><code>SECURITY_ERR</code></dfn></li> <!-- actually in XHR for now -->
-   <li value="19"><dfn id="network_err"><code>NETWORK_ERR</code></dfn></li> <!-- actually in XHR for now -->
-   <li value="20"><dfn id="abort_err"><code>ABORT_ERR</code></dfn></li> <!-- actually in XHR for now -->
-   <li value="21"><dfn id="url_mismatch_err"><code>URL_MISMATCH_ERR</code></dfn></li> <!-- actually defined right here for now -->
-   <li value="22"><dfn id="quota_exceeded_err"><code>QUOTA_EXCEEDED_ERR</code></dfn></li> <!-- actually defined right here for now -->
-   <li value="23"><dfn id="timeout_err"><code>TIMEOUT_ERR</code></dfn></li> <!-- actually in XHR for now -->
-   <li value="25"><dfn id="data_clone_err"><code>DATA_CLONE_ERR</code></dfn></li> <!-- actually defined right here for now -->
-<!--
-   <li value="81"><dfn><code>PARSE_ERR</code></dfn></li> <!- - actually defined in dom3ls - ->
-   <li value="82"><dfn><code>SERIALIZE_ERR</code></dfn></li> <!- - actually defined in dom3ls - ->
--->
+   <li value="18"><dfn id="security_err"><code>SECURITY_ERR</code></dfn></li> 
+   <li value="19"><dfn id="network_err"><code>NETWORK_ERR</code></dfn></li> 
+   <li value="20"><dfn id="abort_err"><code>ABORT_ERR</code></dfn></li> 
+   <li value="21"><dfn id="url_mismatch_err"><code>URL_MISMATCH_ERR</code></dfn></li> 
+   <li value="22"><dfn id="quota_exceeded_err"><code>QUOTA_EXCEEDED_ERR</code></dfn></li> 
+   <li value="23"><dfn id="timeout_err"><code>TIMEOUT_ERR</code></dfn></li> 
+   <li value="25"><dfn id="data_clone_err"><code>DATA_CLONE_ERR</code></dfn></li> 
   </ol><div class="impl">
 
   <pre class="idl">[Supplemental] exception DOMException {

Index: parsing.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/parsing.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- parsing.html	25 Feb 2011 07:05:30 -0000	1.7
+++ parsing.html	30 Apr 2011 11:35:46 -0000	1.8
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>8.2 Parsing HTML documents &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -424,7 +420,7 @@
 
   <p>The input to the HTML parsing process consists of a stream of
   Unicode characters, which is passed through a
-  <a href="tokenization.html#tokenization">tokenization</a> stage followed by a <a href="tokenization.html#tree-construction">tree
+  <a href="tokenization.html#tokenization">tokenization</a> stage followed by a <a href="tree-construction.html#tree-construction">tree
   construction</a> stage. The output is a <code><a href="infrastructure.html#document">Document</a></code>
   object.</p>
 
@@ -503,7 +499,7 @@
   <dfn id="concept-encoding-confidence" title="concept-encoding-confidence">confidence</dfn>. The
   confidence is either <i>tentative</i>, <i>certain</i>, or
   <i>irrelevant</i>. The encoding used, and whether the confidence in
-  that encoding is <i>tentative</i> or <i>certain</i>, is <a href="tokenization.html#meta-charset-during-parse">used during the parsing</a> to
+  that encoding is <i>tentative</i> or <i>certain</i>, is <a href="tree-construction.html#meta-charset-during-parse">used during the parsing</a> to
   determine whether to <a href="#change-the-encoding">change the encoding</a>. If no
   encoding is necessary, e.g. because the parser is operating on a
   stream of Unicode characters and doesn't have to use an encoding at
@@ -548,27 +544,15 @@
    that row, with the <a href="#concept-encoding-confidence" title="concept-encoding-confidence">confidence</a>
    <i>certain</i>, and abort these steps:</p>
 
-    <!-- this table is present in several forms in this file; keep them in sync -->
+    
     <table><thead><tr><th>Bytes in Hexadecimal
        </th><th>Encoding
-     </th></tr></thead><tbody><!-- nobody uses this
-      <tr>
-       <td>00 00 FE FF
-       <td>UTF-32BE
-      <tr>
-       <td>FF FE 00 00
-       <td>UTF-32LE
---><tr><td>FE FF
+     </th></tr></thead><tbody><tr><td>FE FF
        </td><td>Big-endian UTF-16
       </td></tr><tr><td>FF FE
        </td><td>Little-endian UTF-16
       </td></tr><tr><td>EF BB BF
        </td><td>UTF-8
-<!-- nobody uses this
-      <tr>
-       <td>DD 73 66 73
-       <td>UTF-EBCDIC
--->
     </td></tr></tbody></table><p class="note">This step looks for Unicode Byte Order Marks
    (BOMs).</p></li>
 
@@ -611,10 +595,7 @@
          above).</p></li>
 
          <li><p>Let <var title="">attribute list</var> be an empty
-         list of strings.</p></li> <!-- so long as we only care about
-         http-equiv, content, and charset, this can be a 3-bit
-         bitfield -->
-
+         list of strings.</p></li> 
          <li><p>Let <var title="">got pragma</var> be false.</p></li>
 
          <li><p>Let <var title="">need pragma</var> be null.</p></li>
@@ -645,11 +626,13 @@
 
            <dt>If the attribute's name is "<code title="">content</code>"</dt>
 
-           <dd><p>Apply the <a href="fetching-resources.html#algorithm-for-extracting-an-encoding-from-a-content-type">algorithm for extracting an encoding
-           from a Content-Type</a>, giving the attribute's value as
-           the string to parse. If an encoding is returned, and if
-           <var title="">charset</var> is still set to null, let <var title="">charset</var> be the encoding returned, and set
-           <var title="">need pragma</var> to true.</p></dd>
+           <dd><p>Apply the <a href="fetching-resources.html#algorithm-for-extracting-an-encoding-from-a-meta-element">algorithm for extracting an encoding
+           from a <code>meta</code> element</a>, giving the
+           attribute's value as the string to parse. If an encoding is
+           returned, and if <var title="">charset</var> is still set
+           to null, let <var title="">charset</var> be the encoding
+           returned, and set <var title="">need pragma</var> to
+           true.</p></dd>
 
            <dt>If the attribute's name is "<code title="">charset</code>"</dt>
 
@@ -922,9 +905,7 @@
     the user's locale, for compatibility with legacy content. Locales
     are identified by BCP 47 language tags. <a href="references.html#refsBCP47">[BCP47]</a></p>
 
-    <!-- based on mozilla 1.9.1 localizations:
-         http://mxr.mozilla.org/l10n-mozilla1.9.1/find?string=global%2Fintl.properties&tree=l10n-mozilla1.9.1&hint= -->
-
+    
     <table><thead><tr><th>Locale language
        </th><th>Suggested default encoding
      </th></tr></thead><tbody><tr><td>ar
@@ -954,8 +935,8 @@
       </td></tr><tr><td>hu<!-- -HU -->
        </td><td>ISO-8859-2
 
-      </td></tr><tr><td>ja <!-- and ja-JP-mac -->
-       </td><td>Windows-31J <!-- Shift_JIS -->
+      </td></tr><tr><td>ja 
+       </td><td>Windows-31J 
 
       </td></tr><tr><td>kk
        </td><td>UTF-8
@@ -1130,10 +1111,7 @@
   converted to Unicode characters for the tokenizer, as described by
   the rules for that encoding, except that the leading U+FEFF BYTE
   ORDER MARK character, if any, must not be stripped by the encoding
-  layer (it is stripped by the rule below).</p> <!-- this is to
-  prevent two leading BOMs from being both stripped, once by the
-  decoder, and once by the parser -->
-
+  layer (it is stripped by the rule below).</p> 
   <p>Bytes or sequences of bytes in the original byte stream that
   could not be converted to Unicode code points must be converted to
   U+FFFD REPLACEMENT CHARACTERs. Specifically, if the encoding is
@@ -1159,9 +1137,8 @@
   the face of na&#xEF;ve transcoders.</p>
 
   <p>Any occurrences of any characters in the ranges U+0001 to U+0008,
-  <!-- HT, LF allowed --> <!-- U+000B is in the next list --> <!-- FF,
-  CR allowed --> U+000E to U+001F, <!-- ASCII allowed --> U+007F
-  <!--to U+0084, (U+0085 NEL not allowed), U+0086--> to U+009F, U+FDD0
+     U+000E to U+001F,  U+007F
+   to U+009F, U+FDD0
   to U+FDEF, and characters U+000B, U+FFFE, U+FFFF, U+1FFFE, U+1FFFF,
   U+2FFFE, U+2FFFF, U+3FFFE, U+3FFFF, U+4FFFE, U+4FFFF, U+5FFFE,
   U+5FFFF, U+6FFFE, U+6FFFF, U+7FFFE, U+7FFFF, U+8FFFE, U+8FFFF,
@@ -1238,7 +1215,7 @@
    convert the input stream to the new encoding, set the <a href="#concept-encoding-confidence" title="concept-encoding-confidence">confidence</a> to
    <i>certain</i>, and abort these steps.</li>
 
-   <li>Otherwise, <a href="history.html#navigate">navigate</a><!--DONAV reparse--> to the
+   <li>Otherwise, <a href="history.html#navigate">navigate</a> to the
    document again, with <a href="history.html#replacement-enabled">replacement enabled</a>, and using
    the same <a href="history.html#source-browsing-context">source browsing context</a>, but this time skip
    the <a href="#encoding-sniffing-algorithm">encoding sniffing algorithm</a> and instead just set
@@ -1263,24 +1240,22 @@
   <p>The <dfn id="insertion-mode">insertion mode</dfn> is a state variable that controls
   the primary operation of the tree construction stage.</p>
 
-  <p>Initially, the <a href="#insertion-mode">insertion mode</a> is "<a href="tokenization.html#the-initial-insertion-mode" title="insertion mode: initial">initial</a>". It can change to
-  "<a href="tokenization.html#the-before-html-insertion-mode" title="insertion mode: before html">before html</a>",
-  "<a href="tokenization.html#the-before-head-insertion-mode" title="insertion mode: before head">before head</a>",
-  "<a href="tokenization.html#parsing-main-inhead" title="insertion mode: in head">in head</a>", "<a href="tokenization.html#parsing-main-inheadnoscript" title="insertion mode: in head noscript">in head noscript</a>",
-  "<a href="tokenization.html#the-after-head-insertion-mode" title="insertion mode: after head">after head</a>", "<a href="tokenization.html#parsing-main-inbody" title="insertion mode: in body">in body</a>", "<a href="tokenization.html#parsing-main-incdata" title="insertion mode: text">text</a>",
-  "<a href="tokenization.html#parsing-main-intable" title="insertion mode: in table">in table</a>", "<a href="tokenization.html#parsing-main-intabletext" title="insertion mode: in table text">in table text</a>", "<a href="tokenization.html#parsing-main-incaption" title="insertion mode: in caption">in caption</a>", "<a href="tokenization.html#parsing-main-incolgroup" title="insertion mode: in column group">in column group</a>",
-  "<a href="tokenization.html#parsing-main-intbody" title="insertion mode: in table body">in table body</a>",
-  "<a href="tokenization.html#parsing-main-intr" title="insertion mode: in row">in row</a>", "<a href="tokenization.html#parsing-main-intd" title="insertion mode: in cell">in cell</a>", "<a href="tokenization.html#parsing-main-inselect" title="insertion mode: in select">in select</a>", "<a href="tokenization.html#parsing-main-inselectintable" title="insertion mode: in select in table">in select in
-  table</a>", "<a href="tokenization.html#parsing-main-inforeign" title="insertion mode: in foreign content">in
-  foreign content</a>", "<a href="tokenization.html#parsing-main-afterbody" title="insertion mode: after&#10;  body">after body</a>", "<a href="tokenization.html#parsing-main-inframeset" title="insertion mode: in&#10;  frameset">in frameset</a>", "<a href="tokenization.html#parsing-main-afterframeset" title="insertion mode: after&#10;  frameset">after frameset</a>", "<a href="tokenization.html#the-after-after-body-insertion-mode" title="insertion mode:&#10;  after after body">after after body</a>", and "<a href="tokenization.html#the-after-after-frameset-insertion-mode" title="insertion mode: after after frameset">after after
+  <p>Initially, the <a href="#insertion-mode">insertion mode</a> is "<a href="tree-construction.html#the-initial-insertion-mode" title="insertion mode: initial">initial</a>". It can change to
+  "<a href="tree-construction.html#the-before-html-insertion-mode" title="insertion mode: before html">before html</a>",
+  "<a href="tree-construction.html#the-before-head-insertion-mode" title="insertion mode: before head">before head</a>",
+  "<a href="tree-construction.html#parsing-main-inhead" title="insertion mode: in head">in head</a>", "<a href="tree-construction.html#parsing-main-inheadnoscript" title="insertion mode: in head noscript">in head noscript</a>",
+  "<a href="tree-construction.html#the-after-head-insertion-mode" title="insertion mode: after head">after head</a>", "<a href="tree-construction.html#parsing-main-inbody" title="insertion mode: in body">in body</a>", "<a href="tree-construction.html#parsing-main-incdata" title="insertion mode: text">text</a>", "<a href="tree-construction.html#parsing-main-intable" title="insertion&#10;  mode: in table">in table</a>", "<a href="tree-construction.html#parsing-main-intabletext" title="insertion mode: in&#10;  table text">in table text</a>", "<a href="tree-construction.html#parsing-main-incaption" title="insertion mode: in&#10;  caption">in caption</a>", "<a href="tree-construction.html#parsing-main-incolgroup" title="insertion mode: in column&#10;  group">in column group</a>", "<a href="tree-construction.html#parsing-main-intbody" title="insertion mode: in&#10;  table body">in table body</a>", "<a href="tree-construction.html#parsing-main-intr" title="insertion mode: in&#10;  row">in row</a>", "<a href="tree-construction.html#parsing-main-intd" title="insertion mode: in cell">in
+  cell</a>", "<a href="tree-construction.html#parsing-main-inselect" title="insertion mode: in select">in
+  select</a>", "<a href="tree-construction.html#parsing-main-inselectintable" title="insertion mode: in select in table">in
+  select in table</a>", "<a href="tree-construction.html#parsing-main-afterbody" title="insertion mode: after&#10;  body">after body</a>", "<a href="tree-construction.html#parsing-main-inframeset" title="insertion mode: in&#10;  frameset">in frameset</a>", "<a href="tree-construction.html#parsing-main-afterframeset" title="insertion mode: after&#10;  frameset">after frameset</a>", "<a href="tree-construction.html#the-after-after-body-insertion-mode" title="insertion mode:&#10;  after after body">after after body</a>", and "<a href="tree-construction.html#the-after-after-frameset-insertion-mode" title="insertion mode: after after frameset">after after
   frameset</a>" during the course of the parsing, as described in
-  the <a href="tokenization.html#tree-construction">tree construction</a> stage. The insertion mode affects
+  the <a href="tree-construction.html#tree-construction">tree construction</a> stage. The insertion mode affects
   how tokens are processed and whether CDATA sections are
   supported.</p>
 
-  <p>Several of these modes, namely "<a href="tokenization.html#parsing-main-inhead" title="insertion mode: in&#10;  head">in head</a>", "<a href="tokenization.html#parsing-main-inbody" title="insertion mode: in body">in
-  body</a>", "<a href="tokenization.html#parsing-main-intable" title="insertion mode: in table">in
-  table</a>", and "<a href="tokenization.html#parsing-main-inselect" title="insertion mode: in select">in
+  <p>Several of these modes, namely "<a href="tree-construction.html#parsing-main-inhead" title="insertion mode: in&#10;  head">in head</a>", "<a href="tree-construction.html#parsing-main-inbody" title="insertion mode: in body">in
+  body</a>", "<a href="tree-construction.html#parsing-main-intable" title="insertion mode: in table">in
+  table</a>", and "<a href="tree-construction.html#parsing-main-inselect" title="insertion mode: in select">in
   select</a>", are special, in that the other modes defer to them
   at various times. When the algorithm below says that the user agent
   is to do something "<dfn id="using-the-rules-for">using the rules for</dfn> the <var title="">m</var> insertion mode", where <var title="">m</var> is one
@@ -1290,7 +1265,7 @@
   rules in <var title="">m</var> themselves switch the <a href="#insertion-mode">insertion
   mode</a> to a new value.</p>
 
-  <p>When the insertion mode is switched to "<a href="tokenization.html#parsing-main-incdata" title="insertion&#10;  mode: text">text</a>" or "<a href="tokenization.html#parsing-main-intabletext" title="insertion mode: in table&#10;  text">in table text</a>", the <dfn id="original-insertion-mode">original insertion mode</dfn>
+  <p>When the insertion mode is switched to "<a href="tree-construction.html#parsing-main-incdata" title="insertion&#10;  mode: text">text</a>" or "<a href="tree-construction.html#parsing-main-intabletext" title="insertion mode: in table&#10;  text">in table text</a>", the <dfn id="original-insertion-mode">original insertion mode</dfn>
   is also set. This is the insertion mode to which the tree
   construction stage will return.</p>
 
@@ -1308,72 +1283,50 @@
    true and set <var title="">node</var> to the <var title="">context</var> element. (<a href="the-end.html#fragment-case">fragment case</a>)</li>
 
    <li>If <var title="">node</var> is a <code><a href="the-button-element.html#the-select-element">select</a></code> element,
-   then switch the <a href="#insertion-mode">insertion mode</a> to "<a href="tokenization.html#parsing-main-inselect" title="insertion mode: in select">in select</a>" and abort these
+   then switch the <a href="#insertion-mode">insertion mode</a> to "<a href="tree-construction.html#parsing-main-inselect" title="insertion mode: in select">in select</a>" and abort these
    steps. (<a href="the-end.html#fragment-case">fragment case</a>)</li>
 
    <li>If <var title="">node</var> is a <code><a href="tabular-data.html#the-td-element">td</a></code> or
    <code><a href="tabular-data.html#the-th-element">th</a></code> element and <var title="">last</var> is false, then
-   switch the <a href="#insertion-mode">insertion mode</a> to "<a href="tokenization.html#parsing-main-intd" title="insertion&#10;   mode: in cell">in cell</a>" and abort these steps.</li>
+   switch the <a href="#insertion-mode">insertion mode</a> to "<a href="tree-construction.html#parsing-main-intd" title="insertion&#10;   mode: in cell">in cell</a>" and abort these steps.</li>
 
    <li>If <var title="">node</var> is a <code><a href="tabular-data.html#the-tr-element">tr</a></code> element, then
-   switch the <a href="#insertion-mode">insertion mode</a> to "<a href="tokenization.html#parsing-main-intr" title="insertion&#10;   mode: in row">in row</a>" and abort these steps.</li>
+   switch the <a href="#insertion-mode">insertion mode</a> to "<a href="tree-construction.html#parsing-main-intr" title="insertion&#10;   mode: in row">in row</a>" and abort these steps.</li>
 
    <li>If <var title="">node</var> is a <code><a href="tabular-data.html#the-tbody-element">tbody</a></code>,
    <code><a href="tabular-data.html#the-thead-element">thead</a></code>, or <code><a href="tabular-data.html#the-tfoot-element">tfoot</a></code> element, then switch the
-   <a href="#insertion-mode">insertion mode</a> to "<a href="tokenization.html#parsing-main-intbody" title="insertion mode: in&#10;   table body">in table body</a>" and abort these steps.</li>
+   <a href="#insertion-mode">insertion mode</a> to "<a href="tree-construction.html#parsing-main-intbody" title="insertion mode: in&#10;   table body">in table body</a>" and abort these steps.</li>
 
    <li>If <var title="">node</var> is a <code><a href="tabular-data.html#the-caption-element">caption</a></code> element,
-   then switch the <a href="#insertion-mode">insertion mode</a> to "<a href="tokenization.html#parsing-main-incaption" title="insertion mode: in caption">in caption</a>" and abort
+   then switch the <a href="#insertion-mode">insertion mode</a> to "<a href="tree-construction.html#parsing-main-incaption" title="insertion mode: in caption">in caption</a>" and abort
    these steps.</li>
 
    <li>If <var title="">node</var> is a <code><a href="tabular-data.html#the-colgroup-element">colgroup</a></code> element,
-   then switch the <a href="#insertion-mode">insertion mode</a> to "<a href="tokenization.html#parsing-main-incolgroup" title="insertion mode: in column group">in column group</a>" and
+   then switch the <a href="#insertion-mode">insertion mode</a> to "<a href="tree-construction.html#parsing-main-incolgroup" title="insertion mode: in column group">in column group</a>" and
    abort these steps. (<a href="the-end.html#fragment-case">fragment case</a>)</li>
 
    <li>If <var title="">node</var> is a <code><a href="tabular-data.html#the-table-element">table</a></code> element,
-   then switch the <a href="#insertion-mode">insertion mode</a> to "<a href="tokenization.html#parsing-main-intable" title="insertion mode: in table">in table</a>" and abort these
+   then switch the <a href="#insertion-mode">insertion mode</a> to "<a href="tree-construction.html#parsing-main-intable" title="insertion mode: in table">in table</a>" and abort these
    steps.</li>
 
    <li>If <var title="">node</var> is a <code><a href="semantics.html#the-head-element-0">head</a></code> element,
-   then switch the <a href="#insertion-mode">insertion mode</a> to "<a href="tokenization.html#parsing-main-inbody" title="insertion mode: in body">in body</a>" ("<a href="tokenization.html#parsing-main-inbody" title="insertion mode: in body">in body</a>"! <em> not "<a href="tokenization.html#parsing-main-inhead" title="insertion mode: in head">in head</a>"</em>!) and abort
-   these steps. (<a href="the-end.html#fragment-case">fragment case</a>)</li> <!-- This is only
-   here for now in case people think that the spec accidentally
-   omitted it and try to "fix" it. Note that noscript-in-head is also
-   handled this way. This is all intentional. The only thing it
-   doesn't handle is the scripting-disabled fragment parsing case for
-   a <head> element containing a <noscript> which itself contains
-   something other than a <link> or a <style type="text/css"> element; you'd expect
-   that to break out of the <noscript> but it doesn't. This is an edge
-   case that doesn't affect the spec, since the algorithm for fragment
-   parsing is only used for innerHTML/outerHTML/insertAdjacentHTML(),
-   where we know scripting is enabled. -->
-
+   then switch the <a href="#insertion-mode">insertion mode</a> to "<a href="tree-construction.html#parsing-main-inbody" title="insertion mode: in body">in body</a>" ("<a href="tree-construction.html#parsing-main-inbody" title="insertion mode: in body">in body</a>"! <em> not "<a href="tree-construction.html#parsing-main-inhead" title="insertion mode: in head">in head</a>"</em>!) and abort
+   these steps. (<a href="the-end.html#fragment-case">fragment case</a>)</li> 
    <li>If <var title="">node</var> is a <code><a href="sections.html#the-body-element-0">body</a></code> element,
-   then switch the <a href="#insertion-mode">insertion mode</a> to "<a href="tokenization.html#parsing-main-inbody" title="insertion mode: in body">in body</a>" and abort these
+   then switch the <a href="#insertion-mode">insertion mode</a> to "<a href="tree-construction.html#parsing-main-inbody" title="insertion mode: in body">in body</a>" and abort these
    steps.</li>
 
    <li>If <var title="">node</var> is a <code><a href="obsolete.html#frameset">frameset</a></code> element,
-   then switch the <a href="#insertion-mode">insertion mode</a> to "<a href="tokenization.html#parsing-main-inframeset" title="insertion mode: in frameset">in frameset</a>" and abort
+   then switch the <a href="#insertion-mode">insertion mode</a> to "<a href="tree-construction.html#parsing-main-inframeset" title="insertion mode: in frameset">in frameset</a>" and abort
    these steps. (<a href="the-end.html#fragment-case">fragment case</a>)</li>
 
    <li>If <var title="">node</var> is an <code><a href="semantics.html#the-html-element-0">html</a></code> element,
-   then <!--: if the <span><code title="">head</code> element
-   pointer</span> is null,--> switch the <a href="#insertion-mode">insertion mode</a>
-   to "<a href="tokenization.html#the-before-head-insertion-mode" title="insertion mode: before head">before
-   head</a>"<!--, otherwise, switch the <span>insertion mode</span>
-   to "<span title="insertion mode: after head">after head</span>".-->
-   Then, <!-- in either case, --> abort these steps. (<a href="the-end.html#fragment-case">fragment
-   case</a>)</li> <!-- if the head element pointer can ever be
-   non-null when we're going through these steps, we'll need to
-   uncomment out the commented-out bits -->
-
-   <li>If <var title="">node</var> is an element from the <a href="namespaces.html#mathml-namespace">MathML
-   namespace</a> or the <a href="namespaces.html#svg-namespace">SVG namespace</a>, then switch the
-   <a href="#insertion-mode">insertion mode</a> to "<a href="tokenization.html#parsing-main-inforeign" title="insertion mode: in&#10;   foreign content">in foreign content</a>" and abort these
-   steps.</li>
-
+   then  switch the <a href="#insertion-mode">insertion mode</a>
+   to "<a href="tree-construction.html#the-before-head-insertion-mode" title="insertion mode: before head">before
+   head</a>"   Then,  abort these steps. (<a href="the-end.html#fragment-case">fragment
+   case</a>)</li> 
    <li>If <var title="">last</var> is true, then switch the
-   <a href="#insertion-mode">insertion mode</a> to "<a href="tokenization.html#parsing-main-inbody" title="insertion mode: in&#10;   body">in body</a>" and abort these steps. (<a href="the-end.html#fragment-case">fragment
+   <a href="#insertion-mode">insertion mode</a> to "<a href="tree-construction.html#parsing-main-inbody" title="insertion mode: in&#10;   body">in body</a>" and abort these steps. (<a href="the-end.html#fragment-case">fragment
    case</a>)</li>
 
    <li>Let <var title="">node</var> now be the node before <var title="">node</var> in the <a href="#stack-of-open-elements">stack of open
@@ -1387,9 +1340,9 @@
   stack grows downwards; the topmost node on the stack is the first
   one added to the stack, and the bottommost node of the stack is the
   most recently added node in the stack (notwithstanding when the
-  stack is manipulated in a random access fashion as part of <a href="tokenization.html#adoptionAgency">the handling for misnested tags</a>).</p>
+  stack is manipulated in a random access fashion as part of <a href="tree-construction.html#adoptionAgency">the handling for misnested tags</a>).</p>
 
-  <p>The "<a href="tokenization.html#the-before-html-insertion-mode" title="insertion mode: before html">before
+  <p>The "<a href="tree-construction.html#the-before-html-insertion-mode" title="insertion mode: before html">before
   html</a>" <a href="#insertion-mode">insertion mode</a> creates the
   <code><a href="semantics.html#the-html-element-0">html</a></code> root element node, which is then added to the
   stack.</p>
@@ -1397,7 +1350,7 @@
   <p>In the <a href="the-end.html#fragment-case">fragment case</a>, the <a href="#stack-of-open-elements">stack of open
   elements</a> is initialized to contain an <code><a href="semantics.html#the-html-element-0">html</a></code>
   element that is created as part of <a href="the-end.html#html-fragment-parsing-algorithm" title="html fragment&#10;  parsing algorithm">that algorithm</a>. (The <a href="the-end.html#fragment-case">fragment
-  case</a> skips the "<a href="tokenization.html#the-before-html-insertion-mode" title="insertion mode: before&#10;  html">before html</a>" <a href="#insertion-mode">insertion mode</a>.)</p>
+  case</a> skips the "<a href="tree-construction.html#the-before-html-insertion-mode" title="insertion mode: before&#10;  html">before html</a>" <a href="#insertion-mode">insertion mode</a>.)</p>
 
   <p>The <code><a href="semantics.html#the-html-element-0">html</a></code> node, however it is created, is the topmost
   node of the stack. It only gets popped off the stack when the parser
@@ -1431,9 +1384,7 @@
    <code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h2</a></code>, <code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h3</a></code>, <code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h4</a></code>, <code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h5</a></code>,
    <code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h6</a></code>, <code><a href="semantics.html#the-head-element-0">head</a></code>, <code><a href="sections.html#the-header-element">header</a></code>,
    <code><a href="sections.html#the-hgroup-element">hgroup</a></code>, <code><a href="grouping-content.html#the-hr-element">hr</a></code>, <code><a href="semantics.html#the-html-element-0">html</a></code>,
-   <code><a href="the-iframe-element.html#the-iframe-element">iframe</a></code>, <!-- <code>image</code>, (commented out
-   because this isn't an element that can end up on the stack, so it
-   doesn't matter) --> <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-iframe-element.html#the-iframe-element">iframe</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="obsolete.html#isindex-0">isindex</a></code>, <code><a href="grouping-content.html#the-li-element">li</a></code>, <code><a href="semantics.html#the-link-element">link</a></code>,
    <code><a href="obsolete.html#listing">listing</a></code>, <code><a href="obsolete.html#the-marquee-element">marquee</a></code>, <code><a href="interactive-elements.html#menus">menu</a></code>,
    <code><a href="semantics.html#meta">meta</a></code>, <code><a href="sections.html#the-nav-element">nav</a></code>, <code><a href="obsolete.html#noembed">noembed</a></code>,
@@ -1446,9 +1397,7 @@
    <code><a href="tabular-data.html#the-th-element">th</a></code>, <code><a href="tabular-data.html#the-thead-element">thead</a></code>, <code><a href="semantics.html#the-title-element-0">title</a></code>,
    <code><a href="tabular-data.html#the-tr-element">tr</a></code>, <code><a href="grouping-content.html#the-ul-element">ul</a></code>, <code><a href="text-level-semantics.html#the-wbr-element">wbr</a></code>, and
    <code><a href="obsolete.html#xmp">xmp</a></code>; MathML's <code title="">mi</code>, <code title="">mo</code>, <code title="">mn</code>, <code title="">ms</code>, <code title="">mtext</code>, and <code title="">annotation-xml</code>; and SVG's <code title="">foreignObject</code>, <code title="">desc</code>, and
-   <code title="">title</code>.</p></dd> <!-- we could actually put
-   all non-HTML elements in this list, I think -->
-
+   <code title="">title</code>.</p></dd> 
    <dt><dfn id="formatting">Formatting</dfn></dt>
    <dd><p>The following HTML elements are those that end up in the
    <a href="#list-of-active-formatting-elements">list of active formatting elements</a>: <code><a href="text-level-semantics.html#the-a-element">a</a></code>,
@@ -1456,7 +1405,7 @@
    <code><a href="text-level-semantics.html#the-em-element">em</a></code>, <code><a href="obsolete.html#font">font</a></code>, <code><a href="text-level-semantics.html#the-i-element">i</a></code>,
    <code><a href="obsolete.html#nobr">nobr</a></code>, <code><a href="text-level-semantics.html#the-s-element">s</a></code>, <code><a href="text-level-semantics.html#the-small-element">small</a></code>,
    <code><a href="obsolete.html#strike">strike</a></code>, <code><a href="text-level-semantics.html#the-strong-element">strong</a></code>, <code><a href="obsolete.html#tt">tt</a></code>, and
-   <code><a href="obsolete.html#u">u</a></code>.</p></dd>
+   <code><a href="text-level-semantics.html#the-u-element">u</a></code>.</p></dd>
 
    <dt><dfn id="ordinary">Ordinary</dfn></dt>
    <dd><p>All other elements found while parsing an HTML
@@ -1488,7 +1437,7 @@
 
   <ul class="brief"><li><code><a href="obsolete.html#the-applet-element">applet</a></code> in the <a href="namespaces.html#html-namespace-0">HTML namespace</a></li>
    <li><code><a href="tabular-data.html#the-caption-element">caption</a></code> in the <a href="namespaces.html#html-namespace-0">HTML namespace</a></li>
-   <li><code><a href="semantics.html#the-html-element-0">html</a></code> in the <a href="namespaces.html#html-namespace-0">HTML namespace</a></li> <!-- (This can only happen if the <var title="">node</var> is the topmost node of the <span>stack of open elements</span>, and prevents the next step from being invoked if there are no more elements in the stack.) -->
+   <li><code><a href="semantics.html#the-html-element-0">html</a></code> in the <a href="namespaces.html#html-namespace-0">HTML namespace</a></li> 
    <li><code><a href="tabular-data.html#the-table-element">table</a></code> in the <a href="namespaces.html#html-namespace-0">HTML namespace</a></li>
    <li><code><a href="tabular-data.html#the-td-element">td</a></code> in the <a href="namespaces.html#html-namespace-0">HTML namespace</a></li>
    <li><code><a href="tabular-data.html#the-th-element">th</a></code> in the <a href="namespaces.html#html-namespace-0">HTML namespace</a></li>
@@ -1522,14 +1471,14 @@
   scope</dfn> when it <a href="#has-an-element-in-the-specific-scope">has an element in the specific
   scope</a> consisting of the following element types:</p>
 
-  <ul class="brief"><li><code><a href="semantics.html#the-html-element-0">html</a></code> in the <a href="namespaces.html#html-namespace-0">HTML namespace</a></li> <!-- (This can only happen if the <var title="">node</var> is the topmost node of the <span>stack of open elements</span>, and prevents the next step from being invoked if there are no more elements in the stack.) -->
+  <ul class="brief"><li><code><a href="semantics.html#the-html-element-0">html</a></code> in the <a href="namespaces.html#html-namespace-0">HTML namespace</a></li> 
    <li><code><a href="tabular-data.html#the-table-element">table</a></code> in the <a href="namespaces.html#html-namespace-0">HTML namespace</a></li>
   </ul><p>The <a href="#stack-of-open-elements">stack of open elements</a> is said to <dfn id="has-an-element-in-select-scope" title="has an element in select scope">have an element in select
   scope</dfn> when it <a href="#has-an-element-in-the-specific-scope">has an element in the specific
   scope</a> consisting of all element types <em>except</em> the
   following:</p>
 
-  <ul class="brief"><!--<li><code>select</code> in the <span>HTML namespace</span></li>--><li><code><a href="the-button-element.html#the-optgroup-element">optgroup</a></code> in the <a href="namespaces.html#html-namespace-0">HTML namespace</a></li>
+  <ul class="brief"><li><code><a href="the-button-element.html#the-optgroup-element">optgroup</a></code> in the <a href="namespaces.html#html-namespace-0">HTML namespace</a></li>
    <li><code><a href="the-button-element.html#the-option-element">option</a></code> in the <a href="namespaces.html#html-namespace-0">HTML namespace</a></li>
   </ul><p>Nothing happens if at any time any of the elements in the
   <a href="#stack-of-open-elements">stack of open elements</a> are moved to a new location in,
@@ -1538,7 +1487,7 @@
   other strange effects, content to be appended to nodes that are no
   longer in the DOM.</p>
 
-  <p class="note">In some cases (namely, when <a href="tokenization.html#adoptionAgency">closing misnested formatting elements</a>),
+  <p class="note">In some cases (namely, when <a href="tree-construction.html#adoptionAgency">closing misnested formatting elements</a>),
   the stack is manipulated in a random-access fashion.</p>
 
 
@@ -1579,9 +1528,7 @@
    and values (the order of the attributes does not matter).</p>
 
    <p class="note">This is the Noah's Ark clause. But with three per
-   family instead of two.</p></li> <!-- A sort of polyamorous Noah's
-   Ark, if you will. -->
-
+   family instead of two.</p></li> 
    <li><p>Add <var title="">element</var> to the <a href="#list-of-active-formatting-elements">list of active
    formatting elements</a>.</p></li>
 
@@ -1618,7 +1565,7 @@
    <var title="">entry</var> in the <a href="#list-of-active-formatting-elements">list of active formatting
    elements</a>.</li>
 
-   <li><a href="tokenization.html#create-an-element-for-the-token">Create an element for the token</a> for which the
+   <li><a href="tree-construction.html#create-an-element-for-the-token">Create an element for the token</a> for which the
    element <var title="">entry</var> was created, to obtain <var title="">new element</var>.</li>
 
    <li>Append <var title="">new element</var> to the <a href="#current-node">current

Index: fetching-resources.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/fetching-resources.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- fetching-resources.html	25 Feb 2011 07:05:28 -0000	1.7
+++ fetching-resources.html	30 Apr 2011 11:35:45 -0000	1.8
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>2.7 Fetching resources &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -350,7 +346,7 @@
    <a href="spec.html#contents">Table of contents</a> &#x2013;
    <a href="common-dom-interfaces.html" class="next">2.8 Common DOM interfaces</a>
   <ol class="toc"><li><ol><li><a href="fetching-resources.html#fetching-resources"><span class="secno">2.7 </span>Fetching resources</a>
-    <ol><li><a href="fetching-resources.html#concept-http-equivalent"><span class="secno">2.7.1 </span>Protocol concepts</a></li><li><a href="fetching-resources.html#encrypted-http-and-related-security-concerns"><span class="secno">2.7.2 </span>Encrypted HTTP and related security concerns</a></li><li><a href="fetching-resources.html#content-type-sniffing"><span class="secno">2.7.3 </span>Determining the type of a resource</a></li></ol></li></ol></li></ol></div><div class="impl">
+    <ol><li><a href="fetching-resources.html#concept-http-equivalent"><span class="secno">2.7.1 </span>Protocol concepts</a></li><li><a href="fetching-resources.html#encrypted-http-and-related-security-concerns"><span class="secno">2.7.2 </span>Encrypted HTTP and related security concerns</a></li><li><a href="fetching-resources.html#content-type-sniffing"><span class="secno">2.7.3 </span>Determining the type of a resource</a></li><li><a href="fetching-resources.html#extracting-encodings-from-meta-elements"><span class="secno">2.7.4 </span>Extracting encodings from <code>meta</code> elements</a></li></ol></li></ol></li></ol></div><div class="impl">
 
   <h3 id="fetching-resources"><span class="secno">2.7 </span>Fetching resources</h3>
 
@@ -361,20 +357,10 @@
   flag</i>, the following steps must be run. (When a <em>URL</em> is
   to be fetched, the URL identifies a resource to be obtained.)</p>
 
-  <!-- if invoked with the synchronous flag, make sure to release the
-  storage mutex first -->
-
-  <!-- synchronous flag is only to be used in algorithms that are
-  themselves asynchronous! Only sync-XHR is allowed to make the
-  mistake of screwing that up. :-P -->
-
-  <!-- the force same-origin flag is for use in places where we'll be
-  moving to CORS one day; when used, the algorithm must be invoked
-  with a URL (not something else, like a POST request) whose origin is
-  the same as the /origin/, which must also be present, and the
-  algorithm must not be invoked with the manual redirect flag. -->
-
-  <!-- "block cookies" is currently only used by XHR -->
+  
+  
+  
+  
 
   <ol><li>
 
@@ -398,7 +384,7 @@
 
    <li>
 
-    <p>While <var title="">document</var> is is <a href="the-iframe-element.html#an-iframe-srcdoc-document">an
+    <p>While <var title="">document</var> is <a href="the-iframe-element.html#an-iframe-srcdoc-document">an
     <code>iframe</code> <code title="attr-iframe-srcdoc">srcdoc</code>
     document</a>, let <var title="">document</var> be <var title="">document</var>'s <a href="browsers.html#browsing-context">browsing context</a>'s
     <a href="browsers.html#browsing-context-container">browsing context container</a>'s <code><a href="infrastructure.html#document">Document</a></code>
@@ -415,9 +401,7 @@
 
     <p>Remove any <a href="urls.html#url-fragment" title="url-fragment">&lt;fragment&gt;</a>
     component from the generated <i>address of the resource from which
-    Request-URIs are obtained</i>.</p> <!-- RFC2616 says "The URI MUST
-    NOT include a fragment." (section 14.36) -->
-
+    Request-URIs are obtained</i>.</p> 
     <p>If the <a href="origin-0.html#origin">origin</a> of the appropriate
     <code><a href="infrastructure.html#document">Document</a></code> is not a scheme/host/port tuple, then the
     <code title="http-referer">Referer</code> (sic) header must be
@@ -649,7 +633,7 @@
   </div>
 
 
-  <h4 id="content-type-sniffing"><span class="secno">2.7.3 </span>Determining the type of a resource</h4><p class="XXX annotation"><span><a href="http://www.w3.org/html/wg/tracker/issues/125">ISSUE-125</a> (charset-vs-quotes), <a href="http://www.w3.org/html/wg/tracker/issues/126">ISSUE-126</a> (charset-vs-backslashes) and <a href="http://www.w3.org/html/wg/tracker/issues/148">ISSUE-148</a> (charset-detect) block progress to Last Call</span></p>
+  <h4 id="content-type-sniffing"><span class="secno">2.7.3 </span>Determining the type of a resource</h4><p class="XXX annotation"><span><a href="http://www.w3.org/html/wg/tracker/issues/125">ISSUE-125</a> (charset-vs-quotes) blocks progress to Last Call</span></p>
 
   <p>The <dfn id="content-type" title="Content-Type">Content-Type metadata</dfn> of a
   resource must be obtained and interpreted in a manner consistent
@@ -675,11 +659,14 @@
   occur. For more details, see the Media Type Sniffing
   specification. <a href="references.html#refsMIMESNIFF">[MIMESNIFF]</a></p>
 
-  <p>The <dfn id="algorithm-for-extracting-an-encoding-from-a-content-type">algorithm for extracting an encoding from a
-  Content-Type</dfn>, given a string <var title="">s</var>, is as
-  follows. It either returns an encoding or nothing.</p>
 
-  <ol><!-- http://www.hixie.ch/tests/adhoc/html/parsing/encoding/all.html --><li><p>Let <var title="">position</var> be a pointer into <var title="">s</var>, initially pointing at the start of the
+  <h4 id="extracting-encodings-from-meta-elements"><span class="secno">2.7.4 </span>Extracting encodings from <code><a href="semantics.html#meta">meta</a></code> elements</h4>
+
+  <p>The <dfn id="algorithm-for-extracting-an-encoding-from-a-meta-element">algorithm for extracting an encoding from a
+  <code>meta</code> element</dfn>, given a string <var title="">s</var>, is as follows. It either returns an encoding or
+  nothing.</p>
+
+  <ol><li><p>Let <var title="">position</var> be a pointer into <var title="">s</var>, initially pointing at the start of the
    string.</p></li>
 
    <li><p><i>Loop</i>: Find the first seven characters in <var title="">s</var> after <var title="">position</var> that are an
@@ -719,12 +706,11 @@
 
     </dl></li>
 
-  </ol><p class="note">This requirement is a <a href="introduction.html#willful-violation">willful violation</a>
-  of the HTTP specification (for example, HTTP doesn't allow the use
-  of single quotes and requires supporting a backslash-escape
-  mechanism that is not supported by this algorithm<!-- not to mention
-  not having any rules for error-handling, which is of course why
-  we're having to define it ourselves -->), motivated by the need for
-  backwards compatibility with legacy content. <a href="references.html#refsHTTP">[HTTP]</a></p>
+  </ol><p class="note">This algorithm is distinct from those in the HTTP
+  specification (for example, HTTP doesn't allow the use of single
+  quotes and requires supporting a backslash-escape mechanism that is
+  not supported by this algorithm). While the algorithm is used in contexts
+  that, historically, were related to HTTP, the syntax as supported by
+  implementations diverged some time ago. <a href="references.html#refsHTTP">[HTTP]</a></p>
 
   </div></body></html>

Index: origin-0.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/origin-0.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- origin-0.html	25 Feb 2011 07:05:30 -0000	1.9
+++ origin-0.html	30 Apr 2011 11:35:45 -0000	1.10
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>5.3 Origin &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -350,7 +346,7 @@
    <a href="spec.html#contents">Table of contents</a> &#x2013;
    <a href="history.html" class="next">5.4 Session history and navigation</a>
   <ol class="toc"><li><ol><li><a href="origin-0.html#origin-0"><span class="secno">5.3 </span>Origin</a>
-    <ol><li><a href="origin-0.html#relaxing-the-same-origin-restriction"><span class="secno">5.3.1 </span>Relaxing the same-origin restriction</a></li></ol></li></ol></li></ol></div><h3 id="origin-0"><span class="secno">5.3 </span>Origin</h3><!-- Hallowed are the Ori --><p>The <dfn id="origin">origin</dfn> of a resource and the <dfn id="effective-script-origin">effective script
+    <ol><li><a href="origin-0.html#relaxing-the-same-origin-restriction"><span class="secno">5.3.1 </span>Relaxing the same-origin restriction</a></li></ol></li></ol></li></ol></div><h3 id="origin-0"><span class="secno">5.3 </span>Origin</h3><p>The <dfn id="origin">origin</dfn> of a resource and the <dfn id="effective-script-origin">effective script
   origin</dfn> of a resource are both either opaque identifiers or
   tuples consisting of a scheme component, a host component, a port
   component, and optionally extra data.</p><p class="note">The extra data could include the certificate of the
@@ -625,15 +621,7 @@
   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: common-input-element-attributes.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/common-input-element-attributes.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- common-input-element-attributes.html	25 Feb 2011 07:05:27 -0000	1.7
+++ common-input-element-attributes.html	30 Apr 2011 11:35:44 -0000	1.8
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>4.10.7.2 Common input element attributes &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -675,7 +671,8 @@
    password field and this third field.</p>
 
    <pre>&lt;h1&gt;Create new account&lt;/h1&gt;
-&lt;form action="/newaccount" method=post&gt;
+&lt;form action="/newaccount" method=post
+      oninput="up2.setCustomValidity(up2.value != up.value ? 'Passwords do not match.' : '')"&gt;
  &lt;p&gt;
   &lt;label for="username"&gt;E-mail address:&lt;/label&gt;
   &lt;input id="username" type=email required name=un&gt;
@@ -684,7 +681,7 @@
   &lt;input id="password1" type=password required name=up&gt;
  &lt;p&gt;
   &lt;label for="password2"&gt;Confirm password:&lt;/label&gt;
-  &lt;input id="password2" type=password onforminput="setCustomValidity(value != password1.value ? 'Passwords do not match.' : '')"&gt;
+  &lt;input id="password2" type=password name=up2&gt;
  &lt;p&gt;
   &lt;input type=submit value="Create account"&gt;
 &lt;/form&gt;</pre>
@@ -947,7 +944,7 @@
    <p>Normally, time controls are limited to an accuracy of one
    minute.</p>
 
-  </div><h6 id="the-placeholder-attribute"><span class="secno">4.10.7.2.12 </span>The <code title="attr-input-placeholder"><a href="#attr-input-placeholder">placeholder</a></code> attribute</h6><!-- similar text in the <textarea> section --><p>The <dfn id="attr-input-placeholder" title="attr-input-placeholder"><code>placeholder</code></dfn>
+  </div><h6 id="the-placeholder-attribute"><span class="secno">4.10.7.2.12 </span>The <code title="attr-input-placeholder"><a href="#attr-input-placeholder">placeholder</a></code> attribute</h6><p>The <dfn id="attr-input-placeholder" title="attr-input-placeholder"><code>placeholder</code></dfn>
   attribute represents a <em>short</em> hint (a word or short phrase)
   intended to aid the user with data entry. A hint could be a sample
   value or a brief description of the expected format. The attribute,
@@ -1237,7 +1234,7 @@
 
   <ol><li><p>If there is no <a href="#concept-input-list" title="concept-input-list">suggestions
    source element</a> (e.g. because the <code title="attr-input-list"><a href="#attr-input-list">list</a></code> attribute doesn't apply or is
-   not specified), then return null and abort thee steps.</p></li>
+   not specified), then return null and abort these steps.</p></li>
 
    <li><p>If the <code title="attr-input-multiple"><a href="#attr-input-multiple">multiple</a></code>
    attribute is specified and applies, then return null and abort
@@ -1257,17 +1254,13 @@
 
   <p>When the <dfn id="event-input-input" title="event-input-input"><code>input</code></dfn>
   event applies, any time the user causes the element's <a href="association-of-controls-and-forms.html#concept-fe-value" title="concept-fe-value">value</a> to change, the user agent must
-  <a href="webappapis.html#queue-a-task">queue a task</a> to first <a href="webappapis.html#fire-a-simple-event">fire a simple event</a>
-  that bubbles named <code title="event-input">input</code> at the
-  <code><a href="the-input-element.html#the-input-element">input</a></code> element, and then to <a href="association-of-controls-and-forms.html#broadcast-forminput-events">broadcast <code title="event-forminput">forminput</code> events</a> from the
-  <code><a href="the-input-element.html#the-input-element">input</a></code> element's <a href="association-of-controls-and-forms.html#form-owner">form owner</a>, if any. User
-  agents may wait for a suitable break in the user's interaction
-  before queuing the task; for example, a user agent could wait for
-  the user to have not hit a key for 100ms, so as to only fire the
-  event when the user pauses, instead of continuously for each
-  keystroke.</p> <!-- same text is present in the <textarea> section
-  -->
-
+  <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> that
+  bubbles named <code title="event-input">input</code> at the
+  <code><a href="the-input-element.html#the-input-element">input</a></code> element. User agents may wait for a suitable
+  break in the user's interaction before queuing the task; for
+  example, a user agent could wait for the user to have not hit a key
+  for 100ms, so as to only fire the event when the user pauses,
+  instead of continuously for each keystroke.</p> 
   <p class="example">Examples of a user changing the element's <a href="association-of-controls-and-forms.html#concept-fe-value" title="concept-fe-value">value</a> would include the user typing
   into a text field, pasting a new value into the field, or undoing an
   edit in that field. Some user interactions do not cause changes to
@@ -1280,10 +1273,9 @@
   defined but uses a user interface that involves an explicit commit
   action, then any time the user commits a change to the element's
   <a href="association-of-controls-and-forms.html#concept-fe-value" title="concept-fe-value">value</a> or list of <a href="number-state.html#concept-input-type-file-selected" title="concept-input-type-file-selected">selected files</a>, the
-  user agent must <a href="webappapis.html#queue-a-task">queue a task</a> to first <a href="webappapis.html#fire-a-simple-event">fire a
-  simple event</a> that bubbles named <code title="event-change">change</code> at the <code><a href="the-input-element.html#the-input-element">input</a></code>
-  element, and then to <a href="association-of-controls-and-forms.html#broadcast-formchange-events">broadcast <code title="event-formchange">formchange</code> events</a> from the
-  <code><a href="the-input-element.html#the-input-element">input</a></code> element's <a href="association-of-controls-and-forms.html#form-owner">form owner</a>, if any.</p>
+  user agent must <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> that bubbles named <code title="event-change">change</code> at the <code><a href="the-input-element.html#the-input-element">input</a></code>
+  element.</p>
 
   <p class="example">An example of a user interface with a commit
   action would be a <a href="number-state.html#file-upload-state" title="attr-input-type-file">File
@@ -1308,19 +1300,11 @@
    event</a> that bubbles named <code title="event-input">input</code> at the <code><a href="the-input-element.html#the-input-element">input</a></code>
    element.</li>
 
-   <li>If the <code title="event-input-input"><a href="#event-input-input">input</a></code> event
-   applies, <a href="webappapis.html#queue-a-task">queue a task</a> to <a href="association-of-controls-and-forms.html#broadcast-forminput-events">broadcast <code title="event-forminput">forminput</code> events</a> from the
-   <code><a href="the-input-element.html#the-input-element">input</a></code> element's <a href="association-of-controls-and-forms.html#form-owner">form owner</a>, if any.</li>
-
    <li>If the <code title="event-input-change"><a href="#event-input-change">change</a></code> event
    applies, <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> that bubbles named <code title="event-change">change</code> at the <code><a href="the-input-element.html#the-input-element">input</a></code>
    element.</li>
 
-   <li>If the <code title="event-input-change"><a href="#event-input-change">change</a></code> event
-   applies, <a href="webappapis.html#queue-a-task">queue a task</a> to <a href="association-of-controls-and-forms.html#broadcast-formchange-events">broadcast <code title="event-formchange">formchange</code> events</a> from the
-   <code><a href="the-input-element.html#the-input-element">input</a></code> element's <a href="association-of-controls-and-forms.html#form-owner">form owner</a>, if any.</li>
-
   </ol><p class="note">In addition, when the <code title="event-input-change"><a href="#event-input-change">change</a></code> event applies, <code title="event-change">change</code> events can also be fired as part
   of the element's <a href="content-models.html#activation-behavior">activation behavior</a> and as part of the
   <a href="editing.html#unfocusing-steps">unfocusing steps</a>.</p>

Index: dom.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/dom.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- dom.html	25 Feb 2011 07:05:27 -0000	1.8
+++ dom.html	30 Apr 2011 11:35:45 -0000	1.9
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>3 Semantics, structure, and APIs of HTML documents &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -378,11 +374,12 @@
    <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>
+   <li><p><a href="history.html#navigate">Navigate</a> the
+   <a href="browsers.html#browsing-context">browsing context</a> to a resource whose source is <var title="">source</var>, with <a href="history.html#replacement-enabled">replacement enabled</a>. 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
@@ -457,9 +454,7 @@
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-onchange" title="handler-onchange">onchange</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-onclick" title="handler-onclick">onclick</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-oncontextmenu" title="handler-oncontextmenu">oncontextmenu</a>;
-<!--KEEP-END w3c-html--><!--TT-->
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-oncuechange" title="handler-oncuechange">oncuechange</a>;
-<!--KEEP-START w3c-html--><!--TT-->
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-ondblclick" title="handler-ondblclick">ondblclick</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-ondrag" title="handler-ondrag">ondrag</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-ondragend" title="handler-ondragend">ondragend</a>;
@@ -473,8 +468,6 @@
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-onended" title="handler-onended">onended</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-onerror" title="handler-onerror">onerror</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-onfocus" title="handler-onfocus">onfocus</a>;
-           attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-onformchange" title="handler-onformchange">onformchange</a>;
-           attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-onforminput" title="handler-onforminput">onforminput</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-oninput" title="handler-oninput">oninput</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-oninvalid" title="handler-oninvalid">oninvalid</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-onkeydown" title="handler-onkeydown">onkeydown</a>;
@@ -580,9 +573,7 @@
    <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
+  </ul><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
@@ -860,14 +851,7 @@
   <code><a href="obsolete.html#frameset">frameset</a></code> element, or null). On setting, the following
   algorithm must be run:</p>
 
-  <ol><!-- if changes are requested:
-    http://lxr.mozilla.org/seamonkey/source/content/html/document/src/nsHTMLDocument.cpp
-    search for ::GetBody ::SetBody
-    http://trac.webkit.org/projects/webkit/browser/trunk/WebCore/html/HTMLDocument.cpp
-    search for ::setBody
-    http://trac.webkit.org/projects/webkit/browser/trunk/WebCore/dom/Document.cpp
-    search for ::body
-   --><li>If the new value is not a <code><a href="sections.html#the-body-element-0">body</a></code> or
+  <ol><li>If the new value is not a <code><a href="sections.html#the-body-element-0">body</a></code> or
    <code><a href="obsolete.html#frameset">frameset</a></code> element, then raise a
    <code><a href="common-dom-interfaces.html#hierarchy_request_err">HIERARCHY_REQUEST_ERR</a></code> exception and abort these
    steps.</li>
@@ -913,9 +897,7 @@
 
   </dl><div class="impl">
 
-  <!-- these all return the same object each time because of a rule in
-  the collection section -->
-
+  
   <p>The <dfn id="dom-document-images" title="dom-document-images"><code>images</code></dfn>
   attribute must return an <code><a href="common-dom-interfaces.html#htmlcollection">HTMLCollection</a></code> rooted at the
   <code><a href="infrastructure.html#document">Document</a></code> node, whose filter matches only
@@ -1028,11 +1010,7 @@
    <p>A call to <code title="">getElementsByClassName('aaa,bbb')</code> would return no
    nodes; none of the elements above are in the "aaa,bbb" class.</p>
 
-  </div><!-- v2:
->         * xGetParentElementByClassName(rootElement, className, tagName) -
-> Navigates upwards until we hit a parent element with the given class name and
-> optional tag name.
---><div class="impl">
+  </div><div class="impl">
 
   <hr/><p>The <code><a href="#htmldocument">HTMLDocument</a></code> interface <span title="support&#10;  named properties">supports named properties</span>. The
   <a href="infrastructure.html#supported-property-names">supported property names</a> at any moment consist of the
@@ -1061,8 +1039,7 @@
     the name <var title="">name</var> in the <code><a href="infrastructure.html#document">Document</a></code>.
 
     </p><p class="note">There will be at least one such element, by
-    definition.<!-- (If there wasn't, then this algorithm wouldn't
-    have been invoked by Web IDL.) --></p>
+    definition.</p>
 
    </li>
 
@@ -1087,17 +1064,10 @@
 
     <p>Otherwise return an <code><a href="common-dom-interfaces.html#htmlcollection">HTMLCollection</a></code> rooted at the
     <code><a href="infrastructure.html#document">Document</a></code> node, whose filter matches only <a href="#dom-document-nameditem-filter" title="dom-document-namedItem-filter">named elements</a> with
-    the name <var title="">name</var>.</p> <!-- the same one each time
-    is returned, because of the rule under collections -->
-
+    the name <var title="">name</var>.</p> 
    </li>
 
-  <!--
-  Note that this named getter overrides built-in properties, as in:
-     http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C!DOCTYPE%20html%3E%0D%0A...%3Ciframe%20name%3Dbody%3E%3C%2Fiframe%3E%3Cscript%3Ew(document.body)%3C%2Fscript%3E
-  This is what the "OverrideBuiltins" bit means in the IDL.
-  -->
-
+  
   </ol><p><dfn id="dom-document-nameditem-filter" title="dom-document-nameditem-filter">Named elements</dfn>
   with the name <var title="">name</var>, for the purposes of the
   above algorithm, are those that are either:</p>
@@ -1167,7 +1137,7 @@
 
    </li><li><p>Return <var title="">doc</var>.</p></li>
 
-  </ol></div><div class="impl"> <!-- very deprecated API; use XHR instead -->
+  </ol></div><div class="impl"> 
 
   <h4 id="loading-xml-documents"><span class="secno">3.1.6 </span>Loading XML documents</h4>
 
@@ -1177,30 +1147,17 @@
 
   <pre class="idl">[Supplemental, NoInterfaceObject]
 interface <dfn id="xmldocumentloader">XMLDocumentLoader</dfn> {
-<!--SYNCLOAD           attribute boolean <span title="dom-XMLDocumentLoader-async">async</span>;
--->  boolean <a href="#dom-xmldocumentloader-load" title="dom-XMLDocumentLoader-load">load</a>(in DOMString url);
+  boolean <a href="#dom-xmldocumentloader-load" title="dom-XMLDocumentLoader-load">load</a>(in DOMString url);
 };</pre>
 
-  <!-- http://software.hixie.ch/utilities/js/live-dom-viewer/saved/576 -->
-  <!-- http://software.hixie.ch/utilities/js/live-dom-viewer/saved/577 -->
-  <!-- http://www.hixie.ch/tests/adhoc/dom/level0/document/load/001.html -->
+  
+  
+  
 
-<!--SYNCLOAD
-  <p>The <dfn
-  title="dom-XMLDocumentLoader-async"><code>async</code></dfn>
-  attribute must initially be true. On getting, it must return its
-  current value. On setting, its current value must be changed to the
-  new value.</p>
--->
   <p>The <dfn id="dom-xmldocumentloader-load" title="dom-XMLDocumentLoader-load"><code>load(<var title="">url</var>)</code></dfn> method must run the following
   steps:</p>
 
-  <ol><!--SYNCLOAD
-   <li><p>If <code title="dom-XMLDocumentLoader-async">async</code> is
-   set to false and the <var title="">document</var> is
-   <span>load-blocked</span>, return false and abort these
-   steps.</p></li>
---><li><p>Let <var title="">document</var> be the <code><a href="infrastructure.html#document">Document</a></code>
+  <ol><li><p>Let <var title="">document</var> be the <code><a href="infrastructure.html#document">Document</a></code>
    object on which the method was invoked.</p></li>
 
    <li><p><a href="urls.html#resolve-a-url" title="resolve a url">Resolve</a> the method's
@@ -1212,21 +1169,12 @@
    <li><p>If the <a href="origin-0.html#origin">origin</a> of <var title="">url</var> is not
    the same as the <a href="origin-0.html#origin">origin</a> of <var title="">document</var>, throw a <code><a href="common-dom-interfaces.html#security_err">SECURITY_ERR</a></code>
    exception and abort these steps.</p></li>
-<!--SYNCLOAD
-   <li><p>If <code title="dom-XMLDocumentLoader-async">async</code> is
-   set to false, let <var title="">document</var> be
-   <dfn>load-blocked</dfn>.</p></li>
--->
    <li><p>Remove all child nodes of <var title="">document</var>,
-   without firing any mutation events.</p></li> <!-- as of 2010-07-26,
-   only Opera fired mutation events here. -->
-
+   without firing any mutation events.</p></li> 
    <li><p>Set the <a href="#current-document-readiness">current document readiness</a> of <var title="">document</var> to "loading".</p></li>
 
-   <li><p><!--SYNCLOAD If <code title="dom-XMLDocumentLoader-async">async</code> is
-   set to true, then run--> Run the remainder of these steps asynchronously,
-   and return true from the method.<!--SYNCLOAD Otherwise, continue running these
-   steps without yet returning.--></p></li>
+   <li><p> Run the remainder of these steps asynchronously,
+   and return true from the method.</p></li>
 
    <li><p>Let <var title="">result</var> be an <code><a href="infrastructure.html#document">Document</a></code>
    object.</p></li>
@@ -1245,10 +1193,7 @@
     <ol><li><p>Create a new <a href="the-xhtml-syntax.html#xml-parser">XML parser</a> associated with the
      <var title="">result</var> document.</p></li>
 
-     <li><p>Pass this parser the fetched document.</p></li> <!-- no
-     worries about scripts running; there's no browsing context for
-     the document so scripts are automatically disabled -->
-
+     <li><p>Pass this parser the fetched document.</p></li> 
      <li><p>If there is an XML well-formedness or XML namespace
      well-formedness error, then remove all child nodes from <var title="">result</var>. Otherwise let <var title="">success</var>
      be true.</p></li>
@@ -1257,9 +1202,8 @@
 
    <li>
 
-    <p><!--SYNCLOAD If <code title="dom-XMLDocumentLoader-async">async</code> is
-    set to true, then <span>queue--> <a href="webappapis.html#queue-a-task">Queue a task</a> to run the following
-    steps. <!--SYNCLOAD Otherwise, run them synchronously.--></p>
+    <p> <a href="webappapis.html#queue-a-task">Queue a task</a> to run the following
+    steps. </p>
 
     <ol><li><p>Set the <a href="#current-document-readiness">current document readiness</a> of <var title="">document</var> to "complete".</p></li>
 
@@ -1267,25 +1211,9 @@
      by the children of <var title="">result</var> (even if it has no
      children), firing mutation events as if a
      <code><a href="infrastructure.html#documentfragment">DocumentFragment</a></code> containing the new children had
-     been inserted.</p></li> <!-- as of 2010-07-26, both Firefox and
-     Opera fired mutation events here. -->
-
-     <!-- If the document doesn't have no nodes here, at time of
-     writing, Opera would leave the new nodes and drop the parsed
-     ones, while Firefox would basically abort instead, failing to
-     fire the 'load' event -->
-
+     been inserted.</p></li> 
+     
      <li><p><a href="webappapis.html#fire-a-simple-event">Fire a simple event</a> named <code title="event-load">load</code> at <var title="">document</var>.</p></li>
 
     </ol></li>
-<!--SYNCLOAD
-   <li><p>If <code title="dom-XMLDocumentLoader-async">async</code>
-   was set to false when this algorithm started, let <var
-   title="">document</var> be no longer
-   <span>load-blocked</span>.</p></li>
-
-   <li><p>If <code title="dom-XMLDocumentLoader-async">async</code>
-   was set to false when this algorithm started, return <var
-   title="">success</var>.</p></li>
--->
   </ol></div></body></html>

Index: embedded-content-1.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/embedded-content-1.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- embedded-content-1.html	25 Feb 2011 07:05:28 -0000	1.7
+++ embedded-content-1.html	30 Apr 2011 11:35:45 -0000	1.8
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>4.8 Embedded content &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -352,7 +348,7 @@
   <ol class="toc"><li><ol><li><a href="embedded-content-1.html#embedded-content-1"><span class="secno">4.8 </span>Embedded content</a>
     <ol><li><a href="embedded-content-1.html#the-img-element"><span class="secno">4.8.1 </span>The <code>img</code> element</a>
       <ol><li><a href="embedded-content-1.html#alt"><span class="secno">4.8.1.1 </span>Requirements for providing text to act as an alternative for images</a>
-        <ol><li><a href="embedded-content-1.html#general-guidelines"><span class="secno">4.8.1.1.1 </span>General guidelines</a></li><li><a href="embedded-content-1.html#a-link-or-button-containing-nothing-but-the-image"><span class="secno">4.8.1.1.2 </span>A link or button containing nothing but the image</a></li><li><a href="embedded-content-1.html#a-phrase-or-paragraph-with-an-alternative-graphical-representation:-charts-diagrams-graphs-maps-illustrations"><span class="secno">4.8.1.1.3 </span>A phrase or paragraph with an alternative graphical representation: charts, diagrams, graphs, maps, illustrations</a></li><li><a href="embedded-content-1.html#a-short-phrase-or-label-with-an-alternative-graphical-representation:-icons-logos"><span class="secno">4.8.1.1.4 </span>A short phrase or label with an alternative graphical representation: icons, logos</a></li><li><a href="embedded-content-1.html#text-that-has-been-rendered-to-a-graphic-for-typographical-effect"><span class="secno">4.8.1.1.5 </span>Text that has been rendered to a graphic for typographical effect</a></li><li><a href="embedded-content-1.html#a-graphical-representation-of-some-of-the-surrounding-text"><span class="secno">4.8.1.1.6 </span>A graphical representation of some of the surrounding text</a></li><li><a href="embedded-content-1.html#a-purely-decorative-image-that-doesn-t-add-any-information"><span class="secno">4.8.1.1.7 </span>A purely decorative image that doesn't add any information</a></li><li><a href="embedded-content-1.html#a-group-of-images-that-form-a-single-larger-picture-with-no-links"><span class="secno">4.8.1.1.8 </span>A group of images that form a single larger picture with no links</a></li><li><a href="embedded-content-1.html#a-group-of-images-that-form-a-single-larger-picture-with-links"><span class="secno">4.8.1.1.9 </span>A group of images that form a single larger picture with links</a></li><li><a href="embedded-content-1.html#a-key-part-of-the-content"><span class="secno">4.8.1.1.10 </span>A key part of the content</a></li><li><a href="embedded-content-1.html#an-image-not-intended-for-the-user"><span class="secno">4.8.1.1.11 </span>An image not intended for the user</a></li><li><a href="embedded-content-1.html#an-image-in-an-e-mail-or-private-document-intended-for-a-specific-person-who-is-known-to-be-able-to-view-images"><span class="secno">4.8.1.1.12 </span>An image in an e-mail or private document intended for a specific person who is known to be able to view images</a></li><li><a href="embedded-content-1.html#guidance-for-markup-generators"><span class="secno">4.8.1.1.13 </span>Guidance for markup generators</a></li><li><a href="embedded-content-1.html#guidance-for-conformance-checkers"><span class="secno">4.8.1.1.14 </span>Guidance for conformance checkers</a></li></ol></li></ol></li></ol></li></ol></li></ol></div><h3 id="embedded-content-1"><span class="secno">4.8 </span>Embedded content</h3><h4 id="the-img-element"><span class="secno">4.8.1 </span>The <dfn><code>img</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
+        <ol><li><a href="embedded-content-1.html#general-guidelines"><span class="secno">4.8.1.1.1 </span>General guidelines</a></li><li><a href="embedded-content-1.html#a-link-or-button-containing-nothing-but-the-image"><span class="secno">4.8.1.1.2 </span>A link or button containing nothing but the image</a></li><li><a href="embedded-content-1.html#a-phrase-or-paragraph-with-an-alternative-graphical-representation:-charts-diagrams-graphs-maps-illustrations"><span class="secno">4.8.1.1.3 </span>A phrase or paragraph with an alternative graphical representation: charts, diagrams, graphs, maps, illustrations</a></li><li><a href="embedded-content-1.html#a-short-phrase-or-label-with-an-alternative-graphical-representation:-icons-logos"><span class="secno">4.8.1.1.4 </span>A short phrase or label with an alternative graphical representation: icons, logos</a></li><li><a href="embedded-content-1.html#text-that-has-been-rendered-to-a-graphic-for-typographical-effect"><span class="secno">4.8.1.1.5 </span>Text that has been rendered to a graphic for typographical effect</a></li><li><a href="embedded-content-1.html#a-graphical-representation-of-some-of-the-surrounding-text"><span class="secno">4.8.1.1.6 </span>A graphical representation of some of the surrounding text</a></li><li><a href="embedded-content-1.html#a-purely-decorative-image-that-doesn-t-add-any-information"><span class="secno">4.8.1.1.7 </span>A purely decorative image that doesn't add any information</a></li><li><a href="embedded-content-1.html#a-group-of-images-that-form-a-single-larger-picture-with-no-links"><span class="secno">4.8.1.1.8 </span>A group of images that form a single larger picture with no links</a></li><li><a href="embedded-content-1.html#a-group-of-images-that-form-a-single-larger-picture-with-links"><span class="secno">4.8.1.1.9 </span>A group of images that form a single larger picture with links</a></li><li><a href="embedded-content-1.html#a-key-part-of-the-content"><span class="secno">4.8.1.1.10 </span>A key part of the content</a></li><li><a href="embedded-content-1.html#an-image-not-intended-for-the-user"><span class="secno">4.8.1.1.11 </span>An image not intended for the user</a></li><li><a href="embedded-content-1.html#guidance-for-markup-generators"><span class="secno">4.8.1.1.12 </span>Guidance for markup generators</a></li><li><a href="embedded-content-1.html#guidance-for-conformance-checkers"><span class="secno">4.8.1.1.13 </span>Guidance for conformance checkers</a></li></ol></li></ol></li></ol></li></ol></li></ol></div><h3 id="embedded-content-1"><span class="secno">4.8 </span>Embedded content</h3><h4 id="the-img-element"><span class="secno">4.8.1 </span>The <dfn><code>img</code></dfn> element</h4><p class="XXX annotation"><span><a href="http://www.w3.org/html/wg/tracker/issues/30">ISSUE-30</a> (longdesc) 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>
@@ -386,24 +382,10 @@
   readonly attribute boolean <a href="#dom-img-complete" title="dom-img-complete">complete</a>;
 };</pre>
    </dd>
-  </dl><p>An <code><a href="#the-img-element">img</a></code> element represents an image.</p><!-- v2 ideas for <img>:
-
-     * Maps sites would like to know which images are already cached,
-       so that they can use images that are vaguely suitable while
-       they wait for the most appropriate image to download.
-
-       Almost like lowsrc="", except that many images might be
-       appropriate.
-
-       Slight hitch: their images are at a different origin, and we
-       don't want to allow arbitrary cross-origin inspection (privacy
-       leak risk).
-
-     * See note at rel=noreferrer.
-
-  --><p>The image given by the <dfn id="attr-img-src" title="attr-img-src"><code>src</code></dfn> attribute is the
-  embedded content, and the value of the <dfn id="attr-img-alt" title="attr-img-alt"><code>alt</code></dfn> attribute is the
-  <code><a href="#the-img-element">img</a></code> element's <a href="content-models.html#fallback-content">fallback content</a>.</p><p>The <code title="attr-img-src"><a href="#attr-img-src">src</a></code> attribute must be
+  </dl><p>An <code><a href="#the-img-element">img</a></code> element represents an image.</p><p>The image given by the <dfn id="attr-img-src" title="attr-img-src"><code>src</code></dfn> attribute is the
+  embedded content; the value of the <dfn id="attr-img-alt" title="attr-img-alt"><code>alt</code></dfn> attribute provides
+  equivalent content for those who cannot process images or who have
+  image loading disabled.</p><p>The <code title="attr-img-src"><a href="#attr-img-src">src</a></code> attribute must be
   present, and must contain a <a href="urls.html#valid-non-empty-url-potentially-surrounded-by-spaces">valid non-empty URL potentially
   surrounded by spaces</a> referencing a non-interactive,
   optionally animated, image resource that is neither paged nor
@@ -446,9 +428,7 @@
   <p>A user agent that obtains images immediately must synchronously
   <a href="#update-the-image-data">update the image data</a> of an <code><a href="#the-img-element">img</a></code> element
   whenever that element is either created with a <code title="attr-img-src"><a href="#attr-img-src">src</a></code> attribute, or has its <code title="attr-img-src"><a href="#attr-img-src">src</a></code> attribute set, changed, or
-  removed.</p> <!-- Note how this does NOT happen when the base URL
-  changes. -->
-
+  removed.</p> 
   <p>A user agent that obtains images on demand must <a href="#update-the-image-data">update the
   image data</a> of an <code><a href="#the-img-element">img</a></code> element whenever it needs
   the image data (i.e. on demand), but only if the <code><a href="#the-img-element">img</a></code>
@@ -458,9 +438,7 @@
   <code><a href="#the-img-element">img</a></code> element's <code title="attr-img-src"><a href="#attr-img-src">src</a></code>
   attribute is changed or removed, if the user agent only obtains
   images on demand, the <code><a href="#the-img-element">img</a></code> element must return to the
-  <a href="#img-none" title="img-none">unavailable</a> state.</p> <!-- Note how
-  this does NOT happen when the base URL changes. -->
-
+  <a href="#img-none" title="img-none">unavailable</a> state.</p> 
   <p>When the user agent is to <dfn id="update-the-image-data">update the image data</dfn> of an
   <code><a href="#the-img-element">img</a></code> element, it must run the following steps:</p>
 
@@ -488,14 +466,11 @@
     <p>Otherwise, <a href="urls.html#resolve-a-url" title="resolve a url">resolve</a> the value
     of the element's <code title="attr-img-src"><a href="#attr-img-src">src</a></code> attribute,
     relative to the element, and, if that is successful,
-    <a href="fetching-resources.html#fetch">fetch</a> that resource.</p> <!-- http-origin privacy
-    sensitive -->
-
+    <a href="fetching-resources.html#fetch">fetch</a> that resource.</p> 
     <p>The resouce obtained in this fashion is the <code><a href="#the-img-element">img</a></code>
     element's image data.</p>
 
-    <!-- same text in <input type=image> section and similar text
-    elsewhere --> <p>Fetching the image must <a href="the-end.html#delay-the-load-event">delay the load
+     <p>Fetching the image must <a href="the-end.html#delay-the-load-event">delay the load
     event</a> of the element's document until the <a href="webappapis.html#concept-task" title="concept-task">task</a> that is <a href="webappapis.html#queue-a-task" title="queue a&#10;    task">queued</a> by the <a href="webappapis.html#networking-task-source">networking task source</a>
     once the resource has been <a href="fetching-resources.html#fetch" title="fetch">fetched</a> (<a href="#img-load">defined below</a>) has been run.</p>
 
@@ -641,8 +616,7 @@
     provide contextual information in response to navigation, provide
     caption information for the image, derived as follows:</p>
 
-    <ol><!-- when editing this list, search for the two other occurrences
-     of 'critical-no-alt' --><li><p>If the image has a <code title="attr-title"><a href="elements.html#the-title-attribute">title</a></code>
+    <ol><li><p>If the image has a <code title="attr-title"><a href="elements.html#the-title-attribute">title</a></code>
      attribute whose value is not the empty string, then the value of
      that attribute is the caption information; abort these
      steps.</p></li>
@@ -1211,35 +1185,15 @@
 Standards mode, and about 9% triggered the Standards mode.&lt;/p&gt;
 <strong>&lt;p&gt;&lt;img src="rendering-mode-pie-chart.png" alt=""&gt;&lt;/p&gt;</strong></pre>
 
-  </div><h6 id="a-purely-decorative-image-that-doesn-t-add-any-information"><span class="secno">4.8.1.1.7 </span>A purely decorative image that doesn't add any information</h6><p class="XXX annotation"><span><a href="http://www.w3.org/html/wg/tracker/issues/31">ISSUE-31</a> (alt-conformance-requirements) blocks progress to Last Call</span></p><p>In general, if an image is decorative but isn't especially
-  page-specific, for example an image that forms part of a site-wide
-  design scheme, the image should be specified in the site's CSS,
-  not in the markup of the document.</p><p>However, a decorative image that isn't discussed by the
-  surrounding text but still has some relevance can be included in a page
-  using the <code><a href="#the-img-element">img</a></code> element. Such images are decorative, but
-  still form part of the content. In these cases, the <code title="attr-img-alt"><a href="#attr-img-alt">alt</a></code> attribute must be present but its
-  value must be the empty string.</p><div class="example">
-
-   <p>Examples where the image is purely decorative despite being
-   relevant would include things like a photo of the Black Rock City
-   landscape in a blog post about an event at Burning Man, or an
-   image of a painting inspired by a poem, on a page reciting that
-   poem. The following snippet shows an example of the latter
-   case (only the first verse is included in this snippet):</p>
-
-   <pre>&lt;h1&gt;The Lady of Shalott&lt;/h1&gt;
-<strong>&lt;p&gt;&lt;img src="shalott.jpeg" alt=""&gt;&lt;/p&gt;</strong>
-&lt;p&gt;On either side the river lie&lt;br&gt;
-Long fields of barley and of rye,&lt;br&gt;
-That clothe the wold and meet the sky;&lt;br&gt;
-And through the field the road run by&lt;br&gt;
-To many-tower'd Camelot;&lt;br&gt;
-And up and down the people go,&lt;br&gt;
-Gazing where the lilies blow&lt;br&gt;
-Round an island there below,&lt;br&gt;
-The island of Shalott.&lt;/p&gt;</pre>
-
-  </div><h6 id="a-group-of-images-that-form-a-single-larger-picture-with-no-links"><span class="secno">4.8.1.1.8 </span>A group of images that form a single larger picture with no links</h6><p class="XXX annotation"><span><a href="http://www.w3.org/html/wg/tracker/issues/31">ISSUE-31</a> (alt-conformance-requirements) blocks progress to Last Call</span></p><p>When a picture has been sliced into smaller image files that are
+  </div><h6 id="a-purely-decorative-image-that-doesn-t-add-any-information"><span class="secno">4.8.1.1.7 </span>A purely decorative image that doesn't add any information</h6><p class="XXX annotation"><span><a href="http://www.w3.org/html/wg/tracker/issues/31">ISSUE-31</a> (alt-conformance-requirements) blocks progress to Last Call</span></p><p>If an image is decorative but isn't especially page-specific
+  &#x2014; for example an image that forms part of a site-wide design
+  scheme &#x2014; the image should be specified in the site's CSS, not
+  in the markup of the document.</p><p>Exceptions to this rule, in cases where CSS cannot be used to
+  display an entirely decorative image, are covered by the HTML5:
+  Techniques for providing useful text alternatives. <a href="references.html#refsHTMLALTTECHS">[HTMLALTTECHS]</a>
+  Authors are also encouraged to consult the Web Content Accessibility
+  Guidelines 2.0 for more detailed information and acceptable
+  techniques. <a href="references.html#refsWCAG">[WCAG]</a></p><h6 id="a-group-of-images-that-form-a-single-larger-picture-with-no-links"><span class="secno">4.8.1.1.8 </span>A group of images that form a single larger picture with no links</h6><p class="XXX annotation"><span><a href="http://www.w3.org/html/wg/tracker/issues/31">ISSUE-31</a> (alt-conformance-requirements) blocks progress to Last Call</span></p><p>When a picture has been sliced into smaller image files that are
   then displayed together to form the complete picture again, one of
   the images must have its <code title="attr-img-alt"><a href="#attr-img-alt">alt</a></code>
   attribute set as per the relevant rules that would be appropriate
@@ -1427,8 +1381,7 @@
     attribute may be omitted, but one of the following conditions must
     be met as well:</p>
 
-    <ul><!-- when editing this list, search for the two other occurrences
-     of 'critical-no-alt' --><li>The <code title="attr-title"><a href="elements.html#the-title-attribute">title</a></code> attribute is
+    <ul><li>The <code title="attr-title"><a href="elements.html#the-title-attribute">title</a></code> attribute is
      present and has a non-empty value.</li>
 
      <li id="figcaption-as-alt-condition">The <code><a href="#the-img-element">img</a></code> element
@@ -1553,21 +1506,9 @@
   views, then the <code title="attr-img-alt"><a href="#attr-img-alt">alt</a></code> attribute must
   be the empty string.</p><p>In such cases, the <code title="attr-dim-width"><a href="the-map-element.html#attr-dim-width">width</a></code> and
   <code title="attr-dim-height"><a href="the-map-element.html#attr-dim-height">height</a></code> attributes should both
-  be set to zero.</p><h6 id="an-image-in-an-e-mail-or-private-document-intended-for-a-specific-person-who-is-known-to-be-able-to-view-images"><span class="secno">4.8.1.1.12 </span>An image in an e-mail or private document intended for a specific person who is known to be able to view images</h6><p class="XXX annotation"><span><a href="http://www.w3.org/html/wg/tracker/issues/31">ISSUE-31</a> (alt-conformance-requirements) blocks progress to Last Call</span></p><p><i>This section does not apply to documents that are publicly
-  accessible, or whose target audience is not necessarily personally
-  known to the author, such as documents on a Web site, e-mails sent
-  to public mailing lists, or software documentation.</i></p><p>When an image is included in a private communication (such as an
-  HTML e-mail) aimed at a specific person who is known to be able to
-  view images, the <code title="attr-img-alt"><a href="#attr-img-alt">alt</a></code> attribute may
-  be omitted. However, even in such cases it is strongly recommended
-  that alternative text be included (as appropriate according to the
-  kind of image involved, as described in the above entries), so that
-  the e-mail is still usable should the user use a mail client that
-  does not support images, or should the document be forwarded on to
-  other users whose abilities might not include easily seeing
-  images.</p><div class="impl">
+  be set to zero.</p><div class="impl">
 
-  <h6 id="guidance-for-markup-generators"><span class="secno">4.8.1.1.13 </span>Guidance for markup generators</h6>
+  <h6 id="guidance-for-markup-generators"><span class="secno">4.8.1.1.12 </span>Guidance for markup generators</h6>
 
   <p>Markup generators (such as WYSIWYG authoring tools) should,
   wherever possible, obtain alternative text from their
@@ -1600,13 +1541,12 @@
 
   </div><div class="impl">
 
-  <h6 id="guidance-for-conformance-checkers"><span class="secno">4.8.1.1.14 </span>Guidance for conformance checkers</h6>
+  <h6 id="guidance-for-conformance-checkers"><span class="secno">4.8.1.1.13 </span>Guidance for conformance checkers</h6>
 
   <p>A conformance checker must report the lack of an <code title="attr-img-alt"><a href="#attr-img-alt">alt</a></code> attribute as an error unless one of
   the conditions listed below applies:</p>
 
-  <ul><!-- when editing this list, search for the two other occurrences
-   of 'critical-no-alt' --><li>The <code title="attr-title"><a href="elements.html#the-title-attribute">title</a></code> attribute is present
+  <ul><li>The <code title="attr-title"><a href="elements.html#the-title-attribute">title</a></code> attribute is present
    and has a non-empty value (as <a href="#unknown-images">described
    above</a>).</li>
 
@@ -1614,12 +1554,7 @@
    element that satisfies <a href="#figcaption-as-alt-condition">the
    conditions described above</a>.</li>
 
-   <!-- the following are additional entries not included in the
-   aforementioned list, as they apply only to conformance checkers -->
-
-   <li>The conformance checker has been configured to assume that the
-   document is an e-mail or document intended for a specific person
-   who is known to be able to view images.</li>
+   
 
    <li>The document has a <code><a href="semantics.html#meta">meta</a></code> element with a <code title="attr-meta-name"><a href="semantics.html#attr-meta-name">name</a></code> attribute whose value is an
    <a href="infrastructure.html#ascii-case-insensitive">ASCII case-insensitive</a> match for the string "<code title="meta-generator"><a href="semantics.html#meta-generator">generator</a></code>". (This case does not

Index: the-input-element.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/the-input-element.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- the-input-element.html	25 Feb 2011 07:05:30 -0000	1.7
+++ the-input-element.html	30 Apr 2011 11:35:46 -0000	1.8
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>4.10.7 The input element &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -589,944 +585,632 @@
    </th></tr></thead><tbody><tr><th colspan="15" scope="rowgroup">Content attributes
[...1489 lines suppressed...]
@@ -1609,9 +1293,7 @@
 
   <p>When an <code><a href="#the-input-element">input</a></code> element does not have a
   <code><a href="infrastructure.html#document">Document</a></code> node as one of its ancestors (i.e. when it is
-  not in the document), it is <i title="concept-input-immutable"><a href="#concept-input-immutable">immutable</a></i>.</p> <!-- XBL2 spec
-  point -->
-
+  not in the document), it is <i title="concept-input-immutable"><a href="#concept-input-immutable">immutable</a></i>.</p> 
   <p class="note">The <code title="attr-input-readonly"><a href="common-input-element-attributes.html#attr-input-readonly">readonly</a></code> attribute can also in
   some cases (e.g. for the <a href="states-of-the-type-attribute.html#date-state" title="attr-input-type-date">Date</a> state, but not the <a href="number-state.html#checkbox-state" title="attr-input-type-checkbox">Checkbox</a> state) make an
   <code><a href="#the-input-element">input</a></code> element <i title="concept-input-immutable"><a href="#concept-input-immutable">immutable</a></i>.</p>
@@ -1632,7 +1314,7 @@
   <p>When an <code><a href="#the-input-element">input</a></code> element's <code title="attr-input-type"><a href="#attr-input-type">type</a></code> attribute changes state, the
   user agent must run the following steps:</p>
 
-  <ol><!-- http://software.hixie.ch/utilities/js/live-dom-viewer/saved/602 --><li><p>If the previous state of the element's <code title="attr-input-type"><a href="#attr-input-type">type</a></code> attribute put the <code title="dom-input-value"><a href="common-input-element-attributes.html#dom-input-value">value</a></code> IDL attribute in the <i title="dom-input-value-value"><a href="common-input-element-attributes.html#dom-input-value-value">value</a></i> mode, and the element's
+  <ol><li><p>If the previous state of the element's <code title="attr-input-type"><a href="#attr-input-type">type</a></code> attribute put the <code title="dom-input-value"><a href="common-input-element-attributes.html#dom-input-value">value</a></code> IDL attribute in the <i title="dom-input-value-value"><a href="common-input-element-attributes.html#dom-input-value-value">value</a></i> mode, and the element's
    <a href="association-of-controls-and-forms.html#concept-fe-value" title="concept-fe-value">value</a> is not the empty
    string, and the new state of the element's <code title="attr-input-type"><a href="#attr-input-type">type</a></code> attribute puts the <code title="dom-input-value"><a href="common-input-element-attributes.html#dom-input-value">value</a></code> IDL attribute in either the <i title="dom-input-value-default"><a href="common-input-element-attributes.html#dom-input-value-default">default</a></i> mode or the <i title="dom-input-value-default-on"><a href="common-input-element-attributes.html#dom-input-value-default-on">default/on</a></i> mode, then set
    the element's <code title="attr-input-value"><a href="#attr-input-value">value</a></code> content

Index: rendering.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/rendering.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- rendering.html	25 Feb 2011 07:05:30 -0000	1.9
+++ rendering.html	30 Apr 2011 11:35:46 -0000	1.10
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>10 Rendering &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -350,12 +346,12 @@
    <a href="spec.html#contents">Table of contents</a> &#x2013;
    <a href="obsolete.html" class="next">11 Obsolete features</a>
   <ol class="toc"><li><a href="rendering.html#rendering"><span class="secno">10 </span>Rendering</a>
-  <ol><li><a href="rendering.html#introduction-7"><span class="secno">10.1 </span>Introduction</a></li><li><a href="rendering.html#the-css-user-agent-style-sheet-and-presentational-hints"><span class="secno">10.2 </span>The CSS user agent style sheet and presentational hints</a>
-    <ol><li><a href="rendering.html#introduction-8"><span class="secno">10.2.1 </span>Introduction</a></li><li><a href="rendering.html#display-types"><span class="secno">10.2.2 </span>Display types</a></li><li><a href="rendering.html#margins-and-padding"><span class="secno">10.2.3 </span>Margins and padding</a></li><li><a href="rendering.html#alignment"><span class="secno">10.2.4 </span>Alignment</a></li><li><a href="rendering.html#fonts-and-colors"><span class="secno">10.2.5 </span>Fonts and colors</a></li><li><a href="rendering.html#punctuation-and-decorations"><span class="secno">10.2.6 </span>Punctuation and decorations</a></li><li><a href="rendering.html#resetting-rules-for-inherited-properties"><span class="secno">10.2.7 </span>Resetting rules for inherited properties</a></li><li><a href="rendering.html#the-hr-element-0"><span class="secno">10.2.8 </span>The <code>hr</code> element</a></li><li><a href="rendering.html#the-fieldset-element-0"><span class="secno">10.2.9 </span>The <code>fieldset</code> element</a></li></ol></li><li><a href="rendering.html#replaced-elements"><span class="secno">10.3 </span>Replaced elements</a>
+  <ol><li><a href="rendering.html#introduction-8"><span class="secno">10.1 </span>Introduction</a></li><li><a href="rendering.html#the-css-user-agent-style-sheet-and-presentational-hints"><span class="secno">10.2 </span>The CSS user agent style sheet and presentational hints</a>
+    <ol><li><a href="rendering.html#introduction-9"><span class="secno">10.2.1 </span>Introduction</a></li><li><a href="rendering.html#display-types"><span class="secno">10.2.2 </span>Display types</a></li><li><a href="rendering.html#margins-and-padding"><span class="secno">10.2.3 </span>Margins and padding</a></li><li><a href="rendering.html#alignment"><span class="secno">10.2.4 </span>Alignment</a></li><li><a href="rendering.html#fonts-and-colors"><span class="secno">10.2.5 </span>Fonts and colors</a></li><li><a href="rendering.html#punctuation-and-decorations"><span class="secno">10.2.6 </span>Punctuation and decorations</a></li><li><a href="rendering.html#resetting-rules-for-inherited-properties"><span class="secno">10.2.7 </span>Resetting rules for inherited properties</a></li><li><a href="rendering.html#the-hr-element-0"><span class="secno">10.2.8 </span>The <code>hr</code> element</a></li><li><a href="rendering.html#the-fieldset-element-0"><span class="secno">10.2.9 </span>The <code>fieldset</code> element</a></li></ol></li><li><a href="rendering.html#replaced-elements"><span class="secno">10.3 </span>Replaced elements</a>
     <ol><li><a href="rendering.html#embedded-content-2"><span class="secno">10.3.1 </span>Embedded content</a></li><li><a href="rendering.html#timed-text-tracks-0"><span class="secno">10.3.2 </span>Timed text tracks</a>
       <ol><li><a href="rendering.html#webvtt-cue-text-rendering-rules"><span class="secno">10.3.2.1 </span>WebVTT cue text rendering rules</a></li><li><a href="rendering.html#applying-css-properties-to-webvtt-node-objects"><span class="secno">10.3.2.2 </span>Applying CSS properties to <span title="WebVTT Node Object">WebVTT Node Objects</span></a></li><li><a href="rendering.html#css-extensions"><span class="secno">10.3.2.3 </span>CSS extensions</a>
         <ol><li><a href="rendering.html#the-::cue-pseudo-element"><span class="secno">10.3.2.3.1 </span>The '::cue' pseudo-element</a></li><li><a href="rendering.html#the-:past-and-:future-pseudo-classes"><span class="secno">10.3.2.3.2 </span>The ':past' and ':future' pseudo-classes</a></li></ol></li></ol></li><li><a href="rendering.html#images"><span class="secno">10.3.3 </span>Images</a></li><li><a href="rendering.html#attributes-for-embedded-content-and-images"><span class="secno">10.3.4 </span>Attributes for embedded content and images</a></li><li><a href="rendering.html#image-maps-0"><span class="secno">10.3.5 </span>Image maps</a></li><li><a href="rendering.html#toolbars-0"><span class="secno">10.3.6 </span>Toolbars</a></li></ol></li><li><a href="rendering.html#bindings"><span class="secno">10.4 </span>Bindings</a>
-    <ol><li><a href="rendering.html#introduction-9"><span class="secno">10.4.1 </span>Introduction</a></li><li><a href="rendering.html#the-button-element-0"><span class="secno">10.4.2 </span>The <code>button</code> element</a></li><li><a href="rendering.html#the-details-element-0"><span class="secno">10.4.3 </span>The <code>details</code> element</a></li><li><a href="rendering.html#the-input-element-as-a-text-entry-widget"><span class="secno">10.4.4 </span>The <code>input</code> element as a text entry widget</a></li><li><a href="rendering.html#the-input-element-as-domain-specific-widgets"><span class="secno">10.4.5 </span>The <code>input</code> element as domain-specific widgets</a></li><li><a href="rendering.html#the-input-element-as-a-range-control"><span class="secno">10.4.6 </span>The <code>input</code> element as a range control</a></li><li><a href="rendering.html#the-input-element-as-a-color-well"><span class="secno">10.4.7 </span>The <code>input</code> element as a color well</a></li><li><a href="rendering.html#the-input-element-as-a-checkbox-and-radio-button-widgets"><span class="secno">10.4.8 </span>The <code>input</code> element as a checkbox and radio button widgets</a></li><li><a href="rendering.html#the-input-element-as-a-file-upload-control"><span class="secno">10.4.9 </span>The <code>input</code> element as a file upload control</a></li><li><a href="rendering.html#the-input-element-as-a-button"><span class="secno">10.4.10 </span>The <code>input</code> element as a button</a></li><li><a href="rendering.html#the-marquee-element-0"><span class="secno">10.4.11 </span>The <code>marquee</code> element</a></li><li><a href="rendering.html#the-meter-element-0"><span class="secno">10.4.12 </span>The <code>meter</code> element</a></li><li><a href="rendering.html#the-progress-element-0"><span class="secno">10.4.13 </span>The <code>progress</code> element</a></li><li><a href="rendering.html#the-select-element-0"><span class="secno">10.4.14 </span>The <code>select</code> element</a></li><li><a href="rendering.html#the-textarea-element-0"><span class="secno">10.4.15 </span>The <code>textarea</code> element</a></li><li><a href="rendering.html#the-keygen-element-0"><span class="secno">10.4.16 </span>The <code>keygen</code> element</a></li><li><a href="rendering.html#the-time-element-0"><span class="secno">10.4.17 </span>The <code>time</code> element</a></li></ol></li><li><a href="rendering.html#frames-and-framesets"><span class="secno">10.5 </span>Frames and framesets</a></li><li><a href="rendering.html#interactive-media"><span class="secno">10.6 </span>Interactive media</a>
+    <ol><li><a href="rendering.html#introduction-10"><span class="secno">10.4.1 </span>Introduction</a></li><li><a href="rendering.html#the-button-element-0"><span class="secno">10.4.2 </span>The <code>button</code> element</a></li><li><a href="rendering.html#the-details-element-0"><span class="secno">10.4.3 </span>The <code>details</code> element</a></li><li><a href="rendering.html#the-input-element-as-a-text-entry-widget"><span class="secno">10.4.4 </span>The <code>input</code> element as a text entry widget</a></li><li><a href="rendering.html#the-input-element-as-domain-specific-widgets"><span class="secno">10.4.5 </span>The <code>input</code> element as domain-specific widgets</a></li><li><a href="rendering.html#the-input-element-as-a-range-control"><span class="secno">10.4.6 </span>The <code>input</code> element as a range control</a></li><li><a href="rendering.html#the-input-element-as-a-color-well"><span class="secno">10.4.7 </span>The <code>input</code> element as a color well</a></li><li><a href="rendering.html#the-input-element-as-a-checkbox-and-radio-button-widgets"><span class="secno">10.4.8 </span>The <code>input</code> element as a checkbox and radio button widgets</a></li><li><a href="rendering.html#the-input-element-as-a-file-upload-control"><span class="secno">10.4.9 </span>The <code>input</code> element as a file upload control</a></li><li><a href="rendering.html#the-input-element-as-a-button"><span class="secno">10.4.10 </span>The <code>input</code> element as a button</a></li><li><a href="rendering.html#the-marquee-element-0"><span class="secno">10.4.11 </span>The <code>marquee</code> element</a></li><li><a href="rendering.html#the-meter-element-0"><span class="secno">10.4.12 </span>The <code>meter</code> element</a></li><li><a href="rendering.html#the-progress-element-0"><span class="secno">10.4.13 </span>The <code>progress</code> element</a></li><li><a href="rendering.html#the-select-element-0"><span class="secno">10.4.14 </span>The <code>select</code> element</a></li><li><a href="rendering.html#the-textarea-element-0"><span class="secno">10.4.15 </span>The <code>textarea</code> element</a></li><li><a href="rendering.html#the-keygen-element-0"><span class="secno">10.4.16 </span>The <code>keygen</code> element</a></li><li><a href="rendering.html#the-time-element-0"><span class="secno">10.4.17 </span>The <code>time</code> element</a></li></ol></li><li><a href="rendering.html#frames-and-framesets"><span class="secno">10.5 </span>Frames and framesets</a></li><li><a href="rendering.html#interactive-media"><span class="secno">10.6 </span>Interactive media</a>
     <ol><li><a href="rendering.html#links-forms-and-navigation"><span class="secno">10.6.1 </span>Links, forms, and navigation</a></li><li><a href="rendering.html#the-title-attribute-0"><span class="secno">10.6.2 </span>The <code title="attr-title">title</code> attribute</a></li><li><a href="rendering.html#editing-hosts"><span class="secno">10.6.3 </span>Editing hosts</a></li><li><a href="rendering.html#text-rendered-in-native-user-interfaces"><span class="secno">10.6.4 </span>Text rendered in native user interfaces</a></li></ol></li><li><a href="rendering.html#print-media"><span class="secno">10.7 </span>Print media</a></li></ol></li></ol></div><div class="impl">
 
   <h2 id="rendering"><span class="secno">10 </span>Rendering</h2>
@@ -367,10 +363,14 @@
   by the documents' authors. So as to avoid confusion regarding the
   normativity of this section, RFC2119 terms have not been used.
   Instead, the term "expected" is used to indicate behavior that will
-  lead to this experience.</i></p>
+  lead to this experience. For the purposes of conformance for user
+  agents designated as <a href="infrastructure.html#renderingUA">supporting the suggested
+  default rendering</a>, the term "expected" in this section has the
+  same conformance implications as the RFC2119-defined term
+  "must".</i></p>
 
 
-  <h3 id="introduction-7"><span class="secno">10.1 </span>Introduction</h3>
+  <h3 id="introduction-8"><span class="secno">10.1 </span>Introduction</h3>
 
   <p>In general, user agents are expected to support CSS, and many of
   the suggestions in this section are expressed in CSS terms. User
@@ -386,8 +386,8 @@
   <p>The suggestions in this section generally assume a visual output
   medium with a resolution of 96dpi or greater, but HTML is intended
   to apply to multiple media (it is a <i>media-independent</i>
-  language). User agents are encouraged to adapt the suggestions in
-  this section to their target media.</p>
+  language). User agent implementors are encouraged to adapt the
+  suggestions in this section to their target media.</p>
 
   <hr/><p>An element is <dfn id="being-rendered">being rendered</dfn> if it is <a href="infrastructure.html#in-a-document">in a
   <code>Document</code></a>, either its parent node is itself
@@ -405,7 +405,7 @@
 
   <h3 id="the-css-user-agent-style-sheet-and-presentational-hints"><span class="secno">10.2 </span>The CSS user agent style sheet and presentational hints</h3>
 
-  <h4 id="introduction-8"><span class="secno">10.2.1 </span>Introduction</h4>
+  <h4 id="introduction-9"><span class="secno">10.2.1 </span>Introduction</h4>
 
   <p>The CSS rules given in these subsections are, except where
   otherwise specified, expected to be used as part of the user-agent
@@ -420,13 +420,6 @@
   as appropriate for elements whose 'direction' property is 'ltr', and
   are expected to be flipped around on elements whose 'direction'
   property is 'rtl'. These are marked "<dfn id="ltr-specific">LTR-specific</dfn>".</p>
-<!--
-  <p id="case-sensitive-selector-exception">For the purpose of the
-  rules marked "case-sensitive", user agents are expected to use
-  case-sensitive matching of attribute values rather than
-  case-insensitive matching, regardless of whether a case-insensitive
-  matching is normally required for the given attribute.</p>
--->
   <p id="case-insensitive-selector-exception">Similarly, for the
   purpose of the rules marked "case-insensitive", user agents are
   expected to use <a href="infrastructure.html#ascii-case-insensitive">ASCII case-insensitive</a> matching of
@@ -487,7 +480,7 @@
 ruby { display: ruby; }
 rt { display: ruby-text; }</pre>
 
-  <!-- del, ins, and map are inline. -->
+  
 
   <p>For the purposes of the CSS table model, the <code><a href="tabular-data.html#the-col-element">col</a></code>
   element is expected to be treated as if it was present as many times
@@ -813,7 +806,7 @@
   node whose computed value for the 'text-align' property is its
   initial value, whose declaration block consists of just a single
   declaration that sets the 'text-align' property to the value
-  'center'.</p> <!-- q.v. '-moz-center-or-inherit' -->
+  'center'.</p> 
 
   </div><div class="impl">
 
@@ -870,7 +863,7 @@
 
   <hr/><p>The initial value for the 'color' property is expected to be
   black. The initial value for the 'background-color' property is
-  expected to be 'transparent'. The canvas's background is expected to
+  expected to be 'transparent'. The canvas' background is expected to
   be white.</p>
 
   <hr/><p>The <code><a href="sections.html#the-article-element">article</a></code>, <code><a href="sections.html#the-aside-element">aside</a></code>, <code><a href="sections.html#the-nav-element">nav</a></code>,
@@ -953,19 +946,7 @@
   expected to treat the attribute as a <a href="#presentational-hints" title="presentational&#10;  hints">presentational hint</a> setting the element's
   'font-family' property to the attribute's value.</p>
 
-  <!-- (Apparently only IE supports this?) (Note: if you add this
-  back, make sure to define which of 'size' vs 'pointsize' wins.)
-
-  <p>When a <code>font</code> element has a <code
-  title="attr-font-pointsize">pointsize</code> attribute, the user
-  agent is expected to parse that attribute's value using the
-  <span>rules for parsing non-negative integers</span>, and if this
-  doesn't generate an error, then the user agent is expected to use
-  the parsed value as a <em>point</em> length for a <span
-  title="presentational hints">presentational hint</span> for the
-  'font-size' property on the element.</p>
-  -->
-
+  
   <p>When a <code><a href="obsolete.html#font">font</a></code> element has a <code title="attr-font-size">size</code> attribute, the user agent is
   expected to use the following steps to treat the attribute as a
   <a href="#presentational-hints" title="presentational hints">presentational hint</a>
@@ -1004,7 +985,7 @@
 
    <li>
 
-    <!-- basefont support would go here, but we removed it -->
+    
 
     <p>If <var title="">mode</var> is <i>relative-plus</i>, then
     increment <var title="">value</var> by 3. If <var title="">mode</var> is <i>relative-minus</i>, then let <var title="">value</var> be the result of subtracting <var title="">value</var> from 3.</p>
@@ -1044,9 +1025,9 @@
        </td><td>xx-large
        </td><td>
       </td></tr><tr><td>7
-       </td><td>x<!---->xx-large
+       </td><td>xxx-large
        </td><td><i>see below</i>
-    </td></tr></tbody></table><p>The 'x<!---->xx-large' value is a non-CSS value used here to
+    </td></tr></tbody></table><p>The 'xxx-large' value is a non-CSS value used here to
     indicate a font size one "step" larger than 'xx-large'.</p>
 
    </li>
@@ -1058,7 +1039,7 @@
   <pre class="css">@namespace url(http://www.w3.org/1999/xhtml);
 
 :link, :visited, ins, u { text-decoration: underline; }
-abbr[title], acronym[title] { text-decoration: dotted underline; }<!-- CSS3 http://dev.w3.org/csswg/css3-text/#text-decoration-style -->
+abbr[title], acronym[title] { text-decoration: dotted underline; }
 del, s, strike { text-decoration: line-through; }
 blink { text-decoration: blink; }
 
@@ -1111,8 +1092,9 @@
 :ltr { direction: ltr; }
 :rtl { direction: rtl; }
 [dir] { unicode-bidi: embed; }
+bdi, output, [dir=auto] { unicode-bidi: isolate; } /* <a href="#case-insensitive-selector-exception">case-insensitive</a> */
 bdo, bdo[dir] { unicode-bidi: bidi-override; }
-bdi, output { unicode-bidi: isolate; }
+bdo[dir=auto] { unicode-bidi: bidi-override isolate; } /* <a href="#case-insensitive-selector-exception">case-insensitive</a> */
 textarea[dir=auto], pre[dir=auto] { unicode-bidi: plaintext; } /* <a href="#case-insensitive-selector-exception">case-insensitive</a> */</pre>
 
   <p>Rules setting the 'quotes' property appropriately for the locales
@@ -1122,7 +1104,7 @@
   support the 'clear' property on inline elements (in order to render
   <code><a href="text-level-semantics.html#the-br-element">br</a></code> elements with <code title="attr-br-clear"><a href="obsolete.html#attr-br-clear">clear</a></code> attributes) in the manner
   described in the non-normative note to this effect in CSS2.1.</p>
-  <!-- section 9.5.2 of CSS2.1 -->
+  
 
   <hr/><p id="decohints">The following rules are also expected to apply, as
   <a href="#presentational-hints">presentational hints</a>:</p>
@@ -1137,10 +1119,10 @@
 br[clear=all], br[clear=both] { clear: both; } /* <a href="#case-insensitive-selector-exception">case-insensitive</a> */
 
 ol[type=1], li[type=1] { list-style-type: decimal; }
-ol[type=a], li[type=a] { list-style-type: lower-alpha; }<!-- /* <a href="#case-sensitive-selector-exception">case-sensitive</a> */ -->
-ol[type=A], li[type=A] { list-style-type: upper-alpha; }<!-- /* <a href="#case-sensitive-selector-exception">case-sensitive</a> */ -->
-ol[type=i], li[type=i] { list-style-type: lower-roman; }<!-- /* <a href="#case-sensitive-selector-exception">case-sensitive</a> */ -->
-ol[type=I], li[type=I] { list-style-type: upper-roman; }<!-- /* <a href="#case-sensitive-selector-exception">case-sensitive</a> */ -->
+ol[type=a], li[type=a] { list-style-type: lower-alpha; }
+ol[type=A], li[type=A] { list-style-type: upper-alpha; }
+ol[type=i], li[type=i] { list-style-type: lower-roman; }
+ol[type=I], li[type=I] { list-style-type: upper-roman; }
 ul[type=disc], li[type=disc] { list-style-type: disc; } /* <a href="#case-insensitive-selector-exception">case-insensitive</a> */
 ul[type=circle], li[type=circle] { list-style-type: circle; } /* <a href="#case-insensitive-selector-exception">case-insensitive</a> */
 ul[type=square], li[type=square] { list-style-type: square; } /* <a href="#case-insensitive-selector-exception">case-insensitive</a> */
@@ -1211,7 +1193,7 @@
   to use the <a href="grouping-content.html#ordinal-value">ordinal value</a> of the <code><a href="grouping-content.html#the-li-element">li</a></code> element
   to render the counter in the list item marker.</p>
 
-  <p>The <code><a href="tabular-data.html#the-table-element">table</a></code> element's <code title="attr-table-border"><a href="obsolete.html#attr-table-border">border</a></code> attribute <a href="#maps-to-the-pixel-length-property" title="maps&#10;  to the pixel length property">maps to the pixel length
+  <p>The <code><a href="tabular-data.html#the-table-element">table</a></code> element's <code title="attr-table-border"><a href="tabular-data.html#attr-table-border">border</a></code> attribute <a href="#maps-to-the-pixel-length-property" title="maps&#10;  to the pixel length property">maps to the pixel length
   properties</a> 'border-top-width', 'border-right-width',
   'border-bottom-width', 'border-left-width' on the element. If the
   attribute is present but parsing the attribute's value using the
@@ -1236,10 +1218,7 @@
   text-indent: initial;
 }</pre>
 
-  <!-- arguably, the form controls' 'text-indent' lines should be in
-  the sections below instead of here, but that would be far more
-  complicated than this -->
-
+  
   <p>In <a href="dom.html#quirks-mode">quirks mode</a>, the following rules are also
   expected to apply:</p>
 
@@ -1401,19 +1380,17 @@
   the <code><a href="video.html#video">video</a></code> element itself, and is expected to be
   centered in the <code><a href="video.html#video">video</a></code> element.</p>
 
-<!--KEEP-END w3c-html--><!--TT-->
   <p>Any subtitles or captions are expected to be overlayed directly
   on top of their <code><a href="video.html#video">video</a></code> element, as defined by the
   relevant rendering rules; for <span>WebVTT</span>, those are the
   <a href="#webvtt-cue-text-rendering-rules">WebVTT cue text rendering rules</a> defined below.</p>
 
   <p>When the user agent starts <a href="video.html#expose-a-user-interface-to-the-user" title="expose a user interface&#10;  to the user">exposing a user interface</a> for a
-  <code><a href="video.html#video">video</a></code> element, user agents should run the <a href="video.html#rules-for-updating-the-text-track-rendering">rules
+  <code><a href="video.html#video">video</a></code> element, the user agent should run the <a href="video.html#rules-for-updating-the-text-track-rendering">rules
   for updating the text track rendering</a> of each of the <a href="video.html#text-track" title="text track">text tracks</a> in the <code><a href="video.html#video">video</a></code>
   element's <a href="video.html#list-of-text-tracks">list of text tracks</a> that are <a href="video.html#text-track-showing" title="text track showing">showing</a> or <a href="video.html#text-track-showing-by-default" title="text&#10;  track showing by default">showing by default</a> (e.g., for <a href="video.html#text-track" title="text track">text tracks</a> based on
   <span>WebVTT</span>, the <a href="#rules-for-updating-the-display-of-webvtt-text-tracks">rules for updating the display of
   WebVTT text tracks</a>).</p>
-<!--KEEP-START w3c-html--><!--TT-->
 
   <p class="note">Resizing <code><a href="video.html#video">video</a></code> and <code><a href="the-canvas-element.html#the-canvas-element">canvas</a></code>
   elements does not interrupt video playback or clear the canvas.</p>
@@ -1425,7 +1402,7 @@
 iframe:not([seamless]) { border: 2px inset; }
 <span id="video-object-fit">video { object-fit: contain; }</span></pre>
 
-  </div><!--KEEP-END w3c-html--><!--TT--><!--<div data-component="other Hixie drafts (editor: Ian Hickson)">--><div class="impl">
+  </div><div class="impl">
 
   <h4 id="timed-text-tracks-0"><span class="secno">10.3.2 </span>Timed text tracks</h4>
 
@@ -1433,6 +1410,7 @@
   module once an editor is found to run with it.</p>
 
 
+
   <h5 id="webvtt-cue-text-rendering-rules"><span class="secno">10.3.2.1 </span><dfn>WebVTT cue text rendering rules</dfn></h5>
 
   <p>The <dfn id="rules-for-updating-the-display-of-webvtt-text-tracks">rules for updating the display of WebVTT text
@@ -1572,7 +1550,7 @@
        </dd>
 
        <dt>If the <span>text track cue alignment</span> is <span title="text track cue middle alignment">middle</span>,
-              the <span>text track cue text position</span> is greater than <!-- or equal to --> 50</dt>
+              the <span>text track cue text position</span> is greater than  50</dt>
        <dd>
         <p>Let <var title="">maximum size</var> be the result of subtracting <span>text track cue text position</span> from 100 and then multiplying the result by two.</p>
        </dd>
@@ -1995,12 +1973,13 @@
   background box</a> must be set to 'rgba(0,0,0,0.8)'. <a href="references.html#refsCSSCOLOR">[CSSCOLOR]</a></p>
 
   <p>A text outline or stroke may also be set on the (root) <span>List
-  of WebVTT Node Objects</span>, if supported.</p> <!-- 'text-outline'
-  is in CSS3 Text, but Tab says that's awaiting medical attention. -->
-
+  of WebVTT Node Objects</span>, if supported.</p> 
   <p>The 'font-style' property on <span title="WebVTT Italic&#10;  Object">WebVTT Italic Objects</span> must be set to 'italic'.</p>
+
   <p>The 'font-weight' property on <span title="WebVTT Bold&#10;  Object">WebVTT Bold Objects</span> must be set to 'bold'.</p>
 
+  <p>The 'text-decoration' property on <span title="WebVTT Underline&#10;  Object">WebVTT Underline Objects</span> must be set to 'underline'.</p>
+
   <p>The 'display' property on <span title="WebVTT Ruby Object">WebVTT
   Ruby Objects</span> must be set to 'ruby'. <a href="references.html#refsCSSRUBY">[CSSRUBY]</a></p>
 
@@ -2070,15 +2049,8 @@
    <li>the properties corresponding to the 'background' shorthand</li>
    <li>the properties corresponding to the 'outline' shorthand</li>
    <li>the properties corresponding to the 'font' shorthand, including 'line-height'</li>
-   <!-- add more... -->
-   <!-- definitely not:
-          display, float, position, top, left, right, bottom, width,
-          height, margin-top, margin-bottom, margin-left, margin-right,
-          clip, clear, content, cursor, direction, max-height,
-          min-height, max-width, min-width, orphans, overflow,
-          page-break-*, text-align, unicode-bidi, widows, z-index
-   -->
-  </ul><p>The '<dfn id="pseudo-cue-selector" title="pseudo-cue-selector">::cue(<var title="">selector</var>)</dfn>' pseudo-element with an argument must
+   
+     </ul><p>The '<dfn id="pseudo-cue-selector" title="pseudo-cue-selector">::cue(<var title="">selector</var>)</dfn>' pseudo-element with an argument must
   have an argument that consists of a group of selectors. It matches
   any <span>WebVTT Internal Node Object</span> constructed for the
   <i>matched element</i> that also matches the given group of
@@ -2114,6 +2086,9 @@
       </td></tr><tr><td><span title="WebVTT Bold Object">WebVTT Bold Objects</span>
        </td><td><code title="">b</code>
 
+      </td></tr><tr><td><span title="WebVTT Underline Object">WebVTT Underline Objects</span>
+       </td><td><code title="">u</code>
+
       </td></tr><tr><td><span title="WebVTT Ruby Object">WebVTT Ruby Objects</span>
        </td><td><code title="">ruby</code>
 
@@ -2141,10 +2116,7 @@
 
    <li><p>For the purposes of class selector matching, <span title="WebVTT Internal Node Object">WebVTT Internal Node
    Objects</span> have the classes described as the <span>WebVTT
-   Node Object's applicable classes</span>.</p></li> <!-- ok, this
-   isn't especially well-defined, but the Selectors spec doesn't
-   really give one much to go on here. -->
-
+   Node Object's applicable classes</span>.</p></li> 
   </ul><p>The following properties apply to the '::cue()' pseudo-element
   with an argument:</p>
 
@@ -2154,28 +2126,15 @@
    <li>the properties corresponding to the 'background' shorthand</li>
    <li>the properties corresponding to the 'outline' shorthand</li>
    <li>properties relating to the transition and animation features</li>
-   <!-- add more... -->
-   <!-- but definitely not anything that affects dimensions of boxes -->
-  </ul><!--v2
-   Would be nice to support transitions that are directional,
-   e.g. changing text fill colour or shadow size of the start of a
-   segment when the segment becomes "past", and having the change
-   propagate towards the end of the segment so that it reaches the end
-   of the segment when the next segment becomes "past".
-  --><p>The following properties apply to the '::cue()' pseudo-element
+   
+   
+  </ul><p>The following properties apply to the '::cue()' pseudo-element
   with an argument when the selector does not contain the ':past' and
   ':future' pseudo-classes:</p>
 
   <ul class="brief"><li>the properties corresponding to the 'font' shorthand, including 'line-height'</li>
-   <!-- add more... -->
-   <!-- definitely not:
-          display, float, position, top, left, right, bottom, width,
-          height, margin-top, margin-bottom, margin-left, margin-right,
-          clip, clear, content, cursor, direction, max-height,
-          min-height, max-width, min-width, orphans, overflow,
-          page-break-*, text-align, unicode-bidi, widows, z-index
-   -->
-  </ul><p>Properties that do not apply must be ignored.</p>
+   
+     </ul><p>Properties that do not apply must be ignored.</p>
 
   <p>As a special exception, the properties corresponding to the
   'background' shorthand, when they would have been applied to the
@@ -2209,7 +2168,7 @@
   <i>matched element</i>, entirely before the <span>WebVTT Node
   Object</span> <var title="">c</var>.</p>
 
-  </div><!--</div>--><!--KEEP-START w3c-html--><!--TT--><div class="impl">
+  </div><div class="impl">
 
   <h4 id="images"><span class="secno">10.3.3 </span>Images</h4>
 
@@ -2225,7 +2184,7 @@
   does not <a href="#represents" title="represents">represent</a> an image, but the
   element already has intrinsic dimensions (e.g. from the
   <a href="the-map-element.html#dimension-attributes">dimension attributes</a> or CSS rules), and either the user
-  agent has reason to believe that the image will become <i title="img-available">available</i><!--input-img-available also-->
+  agent has reason to believe that the image will become <i title="img-available">available</i>
   and be rendered in due course or the <code><a href="infrastructure.html#document">Document</a></code> is in
   <a href="dom.html#quirks-mode">quirks mode</a>, the element is expected to be treated as a
   replaced element whose content is the text that the element
@@ -2248,10 +2207,7 @@
   content, but neither the image nor any kind of alternative text is
   available, and the user agent does not expect this to change, the
   element is expected to be treated as an inline element whose content
-  is an icon indicating that an image is missing.</p> <!-- there's
-  also a should requirement for this case in the <img> section itself
-  -->
-
+  is an icon indicating that an image is missing.</p> 
   <p>When an <code><a href="the-input-element.html#the-input-element">input</a></code> element whose <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute is in the <a href="number-state.html#image-button-state" title="attr-input-type-image">Image Button</a> state does not
   <a href="#represents" title="represents">represent</a> an image and the user
   agent does not expect this to change, the element is expected to be
@@ -2271,7 +2227,7 @@
   up if the user interacted with the actual image.</p>
 
   <hr/><p>All animated images with the same <a href="urls.html#absolute-url">absolute URL</a> and
-  the same image data are expected to be rendered synchronised to the
+  the same image data are expected to be rendered synchronized to the
   same timeline as a group, with the timeline starting at the time of
   the most recent addition to the group.</p>
 
@@ -2423,7 +2379,7 @@
 
   <h3 id="bindings"><span class="secno">10.4 </span>Bindings</h3>
 
-  <h4 id="introduction-9"><span class="secno">10.4.1 </span>Introduction</h4>
+  <h4 id="introduction-10"><span class="secno">10.4.1 </span>Introduction</h4>
 
   <p>A number of elements have their rendering defined in terms of the
   'binding' property. <a href="references.html#refsBECSS">[BECSS]</a></p>
@@ -2485,7 +2441,7 @@
   an <code title="attr-details-open"><a href="interactive-elements.html#attr-details-open">open</a></code> attribute, this
   second container is expected to be removed from the rendering.</p>
 
-  <!-- http://mail.gnome.org/archives/usability/2006-June/msg00015.html -->
+  
 
   </div><div class="impl">
 
@@ -3041,7 +2997,7 @@
   represented by the element, in the fashion most convenient for the
   user.</p>
 
-  <!-- If none are known then the element would appear empty. -->
+  
 
   </div><div class="impl">
 
@@ -3342,7 +3298,7 @@
 
 
   <p>User agents are expected to allow users to
-  <a href="history.html#navigate">navigate</a><!--DONAV cite=""--> <a href="browsers.html#browsing-context" title="browsing&#10;  context">browsing contexts</a> to the resources <a href="urls.html#resolve-a-url" title="resolve a url">indicated</a> by the <code title="">cite</code> attributes on <code><a href="text-level-semantics.html#the-q-element">q</a></code>,
+  <a href="history.html#navigate">navigate</a> <a href="browsers.html#browsing-context" title="browsing&#10;  context">browsing contexts</a> to the resources <a href="urls.html#resolve-a-url" title="resolve a url">indicated</a> by the <code title="">cite</code> attributes on <code><a href="text-level-semantics.html#the-q-element">q</a></code>,
   <code><a href="grouping-content.html#the-blockquote-element">blockquote</a></code>, 
   <code><a href="edits.html#the-ins-element">ins</a></code>, and <code><a href="edits.html#the-del-element">del</a></code> elements.</p>
 
@@ -3440,9 +3396,7 @@
    same both in the drop down, and in the box showing the current
    selection.</p>
 
-   <p><img alt="" height="105" src="http://dev.w3.org/html5/spec/images/bidiselect.png" width="206"/></p> <!-- no need for alt text, the previous paragraph
-   describes it completely -->
-
+   <p><img alt="" height="105" src="http://dev.w3.org/html5/spec/images/bidiselect.png" width="206"/></p> 
   </div>
 
   <p>A string provided by a script (e.g. the argument to <code title="dom-alert"><a href="timers.html#dom-alert">window.alert()</a></code>) is expected to be treated

Index: grouping-content.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/grouping-content.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- grouping-content.html	25 Feb 2011 07:05:28 -0000	1.7
+++ grouping-content.html	30 Apr 2011 11:35:45 -0000	1.8
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>4.5 Grouping content &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -484,7 +480,7 @@
    the second and third paragraphs, is here represented using the
    <code><a href="#the-hr-element">hr</a></code> element.</p>
 
-   <!-- ISBN 1-4050-0020-1; bottom of page 14 -->
+   
 
    <pre lang="en-GB">&lt;p&gt;Dudley was ninety-two, in his second life, and fast approaching
 time for another rejuvenation. Despite his body having the physical
@@ -759,7 +755,7 @@
 
   </div><p>The <dfn id="attr-ol-type" title="attr-ol-type"><code>type</code></dfn> attribute
   can be used to specify the kind of marker to use in the list, in the
-  cases where that matters (e.g. because items are to be referened by
+  cases where that matters (e.g. because items are to be referenced by
   their number/letter). The attribute, if specified, must have a value
   that is a <a href="infrastructure.html#case-sensitive">case-sensitive</a> match for one of the
   characters given in the first cell of one of the rows of the
@@ -803,7 +799,7 @@
   states above have the same names as their corresponding CSS
   values).</p>
 
-  </div><!-- v2: resuming numbering of lists from previous lists? --><div class="impl">
+  </div><div class="impl">
 
   <p>The <dfn id="dom-ol-reversed" title="dom-ol-reversed"><code>reversed</code></dfn>,
   <dfn id="dom-ol-start" title="dom-ol-start"><code>start</code></dfn>, and <dfn id="dom-ol-type" title="dom-ol-type"><code>type</code></dfn> IDL attributes must
@@ -1149,7 +1145,7 @@
    <code><a href="#the-dt-element">dt</a></code> with a <code><a href="text-level-semantics.html#the-dfn-element">dfn</a></code>, has several
    <code><a href="#the-dd-element">dd</a></code>s, showing the various parts of the definition.</p>
 
-   <!-- the actual pronunciations below are nonsense. -->
+   
    <pre>&lt;dl&gt;
  &lt;dt&gt;&lt;dfn&gt;happiness&lt;/dfn&gt;&lt;/dt&gt;
  &lt;dd class="pronunciation"&gt;/'h&#xE6; p. nes/&lt;/dd&gt;
@@ -1174,7 +1170,7 @@
    <dd><a href="elements.html#global-attributes">Global attributes</a></dd>
    <dt>DOM interface:</dt>
    <dd>Uses <code><a href="elements.html#htmlelement">HTMLElement</a></code>.</dd>
-  </dl><!-- v2: Add a <credit> element for photo credits --><p>The <code><a href="#the-figure-element">figure</a></code> element <a href="rendering.html#represents">represents</a> some
+  </dl><p>The <code><a href="#the-figure-element">figure</a></code> element <a href="rendering.html#represents">represents</a> some
   <a href="content-models.html#flow-content">flow content</a>, optionally with a caption, that is
   self-contained and is typically referenced as a single unit from the
   main flow of the document.</p><p>The element can thus be used to annotate illustrations, diagrams,

Index: timers.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/timers.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- timers.html	25 Feb 2011 07:05:30 -0000	1.7
+++ timers.html	30 Apr 2011 11:35:46 -0000	1.8
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>6.3 Timers &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -516,15 +512,11 @@
    <li><p><a href="#get-the-timeout">Get the timeout</a>, and let <var title="">timeout</var> be the result.</p></li>
 
    <li><p>If <var title="">timeout</var> is less than 10, then
-   increase <var title="">timeout</var> to 10.</p></li> <!-- (but see
-   note below about IE) -->
-
+   increase <var title="">timeout</var> to 10.</p></li> 
    <li><p>Return <var title="">handle</var>, and then continue running
    this algorithm asynchronously.</p></li>
 
-   <!-- Note: IE doesn't actually run intervals with duration zero, it
-   aborts roughly here in the algorithm for them. -->
-
+   
    <li>
 
     <p><i title="">Wait</i>: If the <a href="#method-context">method context</a> is a
@@ -663,14 +655,7 @@
   </ol><hr/><p>The <a href="webappapis.html#task-source">task source</a> for these <a href="webappapis.html#concept-task" title="concept-task">tasks</a> is the <dfn id="timer-task-source">timer task
   source</dfn>.</p>
 
-  </div><h3 id="user-prompts"><span class="secno">6.4 </span>User prompts</h3><!--
-   v2 ideas:
-    * in-window modal dialogs
-       - escape/enter handling
-       - dragging the window out of the tab
-    * in-window non-modal palettes
-       - with a solution for the mobile space
-  --><h4 id="simple-dialogs"><span class="secno">6.4.1 </span>Simple dialogs</h4><dl class="domintro"><dt><var title="">window</var> . <code title="dom-alert"><a href="#dom-alert">alert</a></code>(<var title="">message</var>)</dt>
+  </div><h3 id="user-prompts"><span class="secno">6.4 </span>User prompts</h3><h4 id="simple-dialogs"><span class="secno">6.4.1 </span>Simple dialogs</h4><dl class="domintro"><dt><var title="">window</var> . <code title="dom-alert"><a href="#dom-alert">alert</a></code>(<var title="">message</var>)</dt>
    <dd>
 
     <p>Displays a modal alert with the given message, and waits for the user to dismiss it.</p>
@@ -833,8 +818,7 @@
 
   </dl><div class="impl">
 
-  <p>The <dfn id="dom-showmodaldialog" title="dom-showModalDialog"><code>showModalDialog(<var title="">url</var>, <var title="">argument</var><!--, <var
-  title="">features</var>-->)</code></dfn> method, when invoked, must
+  <p>The <dfn id="dom-showmodaldialog" title="dom-showModalDialog"><code>showModalDialog(<var title="">url</var>, <var title="">argument</var>)</code></dfn> method, when invoked, must
   cause the user agent to run the following steps:</p>
 
   <ol><li>
@@ -882,10 +866,7 @@
      <li>have an <a href="browsers.html#active-document">active document</a> whose
      <a href="origin-0.html#origin">origin</a> is the <a href="origin-0.html#same-origin" title="same origin">same</a>
      as the <a href="origin-0.html#origin">origin</a> of the <a href="webappapis.html#concept-script" title="concept-script">script</a> that called the <code title="dom-showModalDialog"><a href="#dom-showmodaldialog">showModalDialog()</a></code> method at
-     the time the method was called,</li> <!-- Note that changing
-     document.domain to talk to another domain doesn't make you able
-     to block that domain -->
-
+     the time the method was called,</li> 
     </ul><p>...as well as any browsing contexts that are nested inside any
     of the browsing contexts matching those conditions.</p>
 
@@ -934,7 +915,7 @@
 
    <li>
 
-    <p><a href="history.html#navigate">Navigate</a><!--DONAV showModalDialog--> the new
+    <p><a href="history.html#navigate">Navigate</a> the new
     <a href="browsers.html#browsing-context">browsing context</a> to the <a href="urls.html#absolute-url">absolute URL</a>
     that resulted from <a href="urls.html#resolve-a-url" title="resolve a url">resolving</a>
     <var title="">url</var> earlier, with <a href="history.html#replacement-enabled">replacement
@@ -1044,31 +1025,17 @@
 <a href="#navigator">Navigator</a> implements <a href="#navigatorid">NavigatorID</a>;
 <a href="#navigator">Navigator</a> implements <a href="offline.html#navigatoronline">NavigatorOnLine</a>;
 <a href="#navigator">Navigator</a> implements <a href="#navigatorcontentutils">NavigatorContentUtils</a>;
-<a href="#navigator">Navigator</a> implements <a href="#navigatorstorageutils">NavigatorStorageUtils</a>;</pre><!-- v2:
-  cookieEnabled geolocator javaEnabled mozIsLocallyAvailable preference
-  readonly attribute <span>MimeTypeArray</span> <span title="dom-navigator-mimeTypes">mimeTypes</span>;
-  readonly attribute <span>PluginArray</span> <span title="dom-navigator-plugins">plugins</span>;
-  (the latter is used in a <video> element demo now, so we might need to pull this forward from v2!)
---><div class="impl">
+<a href="#navigator">Navigator</a> implements <a href="#navigatorstorageutils">NavigatorStorageUtils</a>;</pre><div class="impl">
 
   <p>These interfaces are defined separately so that other
   specifications can re-use parts of the <code><a href="#navigator">Navigator</a></code>
   interface.</p>
 
-   <!-- v2: also, see window.external.AddSearchProvider() and similar DOM APIs from IE -->
-
-   <!-- v2: also, could expose languages:
-   <dt><dfn title="dom-navigator-browserLanguage"><code>browserLanguage</code></dfn></dt> <!- - Opera and IE only - ->
-   <dd><p>Must return either null or a language tag representing the language the browser uses in its interface.</p></dd>
-   <dt><dfn title="dom-navigator-userLanguage"><code>userLanguage</code></dfn></dt> <!- - Opera and IE only - ->
-   <dt><dfn title="dom-navigator-language"><code>language</code></dfn></dt> <!- - Opera, Safari, and Mozilla only - ->
-   <dd><p>Must return either null or a language tag representing the user's preferred language.</p></dd>
-   -->
+   
 
+   
   </div><h4 id="client-identification"><span class="secno">6.5.1 </span>Client identification</h4><pre class="idl">[Supplemental, NoInterfaceObject]
-interface <dfn id="navigatorid">NavigatorID</dfn> {<!--
-  readonly attribute DOMString <span title="dom-navigator-appCodeName">appCodeName</span>;-->
-  readonly attribute DOMString <a href="#dom-navigator-appname" title="dom-navigator-appName">appName</a>;
+interface <dfn id="navigatorid">NavigatorID</dfn> {  readonly attribute DOMString <a href="#dom-navigator-appname" title="dom-navigator-appName">appName</a>;
   readonly attribute DOMString <a href="#dom-navigator-appversion" title="dom-navigator-appVersion">appVersion</a>;
   readonly attribute DOMString <a href="#dom-navigator-platform" title="dom-navigator-platform">platform</a>;
   readonly attribute DOMString <a href="#dom-navigator-useragent" title="dom-navigator-userAgent">userAgent</a>;
@@ -1100,36 +1067,33 @@
 
   </dl><div class="impl">
 
-  <dl><!-- redundant
-   <dt><dfn title="dom-navigator-appCodeName"><code>appCodeName</code></dfn></dt>
-   <dd><p>Must return the string "<code title="">Mozilla</code>".</p></dd>
-   --><!-- appMinorVersion: IE only. In IE8b1, returns " Beta" (with the space) --><dt><dfn id="dom-navigator-appname" title="dom-navigator-appName"><code>appName</code></dfn></dt>
+  <dl><dt><dfn id="dom-navigator-appname" title="dom-navigator-appName"><code>appName</code></dfn></dt>
    <dd><p>Must return either the string "<code title="">Netscape</code>" or the full name of the browser, e.g. "<code title="">Mellblom Browsernator</code>".</p></dd>
 
    <dt><dfn id="dom-navigator-appversion" title="dom-navigator-appVersion"><code>appVersion</code></dfn></dt>
    <dd><p>Must return either the string "<code title="">4.0</code>" or a string representing the version of the browser in detail, e.g. "<code title="">1.0 (VMS; en-US) Mellblomenator/9000</code>".</p></dd>
 
-   <!-- buildID: Mozilla only -->
+   
 
-   <!-- oscpu: Mozilla only -->
+   
 
    <dt><dfn id="dom-navigator-platform" title="dom-navigator-platform"><code>platform</code></dfn></dt>
    <dd><p>Must return either the empty string or a string representing the platform on which the browser is executing, e.g. "<code title="">MacIntel</code>", "<code title="">Win32</code>", "<code title="">FreeBSD i386</code>", "<code title="">WebTV OS</code>".</p></dd>
 
-   <!-- product: Mozilla and Safari only; always returns "Gecko" -->
+   
 
-   <!-- productSub: Mozilla and Safari only; returns same as buildID in Mozilla, and returns the fixed string "20030107" in Safari -->
+   
 
-   <!-- securityPolicy: Mozilla only; always returns "" -->
+   
 
-   <!-- taintEnabled(): Opera, IE and Mozilla have this function as one that always returns false -->
+   
 
    <dt><dfn id="dom-navigator-useragent" title="dom-navigator-userAgent"><code>userAgent</code></dfn></dt>
    <dd><p>Must return the string used for the value of the "<code title="">User-Agent</code>" header in HTTP requests, or the empty string if no such header is ever sent.</p></dd>
 
-   <!-- vendor: Mozilla and Safari only; always returns "" in Mozilla, and returns the fixed string "Apple Computer, Inc." in Safari -->
+   
 
-   <!-- vendorSub: Mozilla and Safari only; always returns "" -->
+   
 
   </dl><p class="warning">Any information in this API that varies from user
   to user can be used to profile the user. In fact, if enough such
@@ -1251,8 +1215,7 @@
     content in question (as defined below), then <a href="urls.html#resolve-a-url" title="resolve&#10;    a url">resolve</a> the resulting URL, relative to the <a href="webappapis.html#script-s-base-url" title="script's base URL">base URL</a> of the <a href="browsers.html#entry-script">entry
     script</a> at the time the <code title="dom-navigator-registerContentHandler"><a href="#dom-navigator-registercontenthandler">registerContentHandler()</a></code>
     or <code title="dom-navigator-registerProtocolHandler"><a href="#dom-navigator-registerprotocolhandler">registerProtocolHandler()</a></code>
-    methods were invoked, and then <a href="history.html#navigate">navigate</a><!--DONAV
-    user--> an appropriate <a href="browsers.html#browsing-context">browsing context</a> to the
+    methods were invoked, and then <a href="history.html#navigate">navigate</a> an appropriate <a href="browsers.html#browsing-context">browsing context</a> to the
     resulting URL using the GET method (<a href="fetching-resources.html#concept-http-equivalent-get" title="concept-http-equivalent-get">or equivalent</a> for
     non-HTTP URLs).</p>
 

Index: elements.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/elements.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- elements.html	25 Feb 2011 07:05:28 -0000	1.8
+++ elements.html	30 Apr 2011 11:35:45 -0000	1.9
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>3.2 Elements &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -489,9 +485,7 @@
   readonly attribute DOMString <a href="commands.html#dom-command-ro-label" title="dom-command-ro-label">label</a>;
   readonly attribute DOMString <a href="commands.html#dom-command-ro-icon" title="dom-command-ro-icon">icon</a>;
   readonly attribute boolean <a href="commands.html#dom-command-ro-disabled" title="dom-command-ro-disabled">disabled</a>;
-  readonly attribute boolean <a href="commands.html#dom-command-ro-checked" title="dom-command-ro-checked">checked</a>;<!-- v2COMMAND
-  readonly attribute <span>HTMLCollection</span> <span title="dom-command-ro-triggers">triggers</span>;-->
-
+  readonly attribute boolean <a href="commands.html#dom-command-ro-checked" title="dom-command-ro-checked">checked</a>;
   // <span>styling</span>
   readonly attribute <span>CSSStyleDeclaration</span> <a href="#dom-style" title="dom-style">style</a>;
 
@@ -503,9 +497,7 @@
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-onchange" title="handler-onchange">onchange</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-onclick" title="handler-onclick">onclick</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-oncontextmenu" title="handler-oncontextmenu">oncontextmenu</a>;
-<!--KEEP-END w3c-html--><!--TT-->
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-oncuechange" title="handler-oncuechange">oncuechange</a>;
-<!--KEEP-START w3c-html--><!--TT-->
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-ondblclick" title="handler-ondblclick">ondblclick</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-ondrag" title="handler-ondrag">ondrag</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-ondragend" title="handler-ondragend">ondragend</a>;
@@ -519,8 +511,6 @@
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-onended" title="handler-onended">onended</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-onerror" title="handler-onerror">onerror</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-onfocus" title="handler-onfocus">onfocus</a>;
-           attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-onformchange" title="handler-onformchange">onformchange</a>;
-           attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-onforminput" title="handler-onforminput">onforminput</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-oninput" title="handler-oninput">oninput</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-oninvalid" title="handler-oninvalid">oninvalid</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-onkeydown" title="handler-onkeydown">onkeydown</a>;
@@ -590,9 +580,7 @@
    <li><code title="handler-onchange"><a href="webappapis.html#handler-onchange">onchange</a></code></li>
    <li><code title="handler-onclick"><a href="webappapis.html#handler-onclick">onclick</a></code></li>
    <li><code title="handler-oncontextmenu"><a href="webappapis.html#handler-oncontextmenu">oncontextmenu</a></code></li>
-<!--KEEP-END w3c-html--><!--TT-->
    <li><code title="handler-oncuechange"><a href="webappapis.html#handler-oncuechange">oncuechange</a></code></li>
-<!--KEEP-START w3c-html--><!--TT-->
    <li><code title="handler-ondblclick"><a href="webappapis.html#handler-ondblclick">ondblclick</a></code></li>
    <li><code title="handler-ondrag"><a href="webappapis.html#handler-ondrag">ondrag</a></code></li>
    <li><code title="handler-ondragend"><a href="webappapis.html#handler-ondragend">ondragend</a></code></li>
@@ -606,8 +594,6 @@
    <li><code title="handler-onended"><a href="webappapis.html#handler-onended">onended</a></code></li>
    <li><code title="handler-onerror"><a href="webappapis.html#handler-onerror">onerror</a></code>*</li>
    <li><code title="handler-onfocus"><a href="webappapis.html#handler-onfocus">onfocus</a></code>*</li>
-   <li><code title="handler-onformchange"><a href="webappapis.html#handler-onformchange">onformchange</a></code></li>
-   <li><code title="handler-onforminput"><a href="webappapis.html#handler-onforminput">onforminput</a></code></li>
    <li><code title="handler-oninput"><a href="webappapis.html#handler-oninput">oninput</a></code></li>
    <li><code title="handler-oninvalid"><a href="webappapis.html#handler-oninvalid">oninvalid</a></code></li>
    <li><code title="handler-onkeydown"><a href="webappapis.html#handler-onkeydown">onkeydown</a></code></li>
@@ -666,14 +652,14 @@
   preserve whitespace. <a href="references.html#refsXML">[XML]</a></p><p class="note">There is no way to serialize the <code title="attr-xml-space">xml:space</code> attribute on <a href="infrastructure.html#html-elements">HTML
   elements</a> in the <code><a href="iana.html#text-html">text/html</a></code> syntax.</p><hr/><p>To enable assistive technology products to expose a more
   fine-grained interface than is otherwise possible with HTML elements
-  and attributes, a set of <a href="content-models.html#annotations-for-assistive-technology-products-aria">annotations for assistive technology
-  products</a> can be specified (the ARIA <code title="attr-aria-role">role</code> and <code title="attr-aria-*">aria-*</code> attributes).</p><h5 id="the-id-attribute"><span class="secno">3.2.3.1 </span>The <dfn title="attr-id"><code>id</code></dfn> attribute</h5><p>The <code title="attr-id"><a href="#the-id-attribute">id</a></code> attribute specifies its
+  and attributes, a set of <a href="content-models.html#wai-aria" title="WAI-ARIA">annotations for
+  assistive technology products</a> can be specified (the ARIA
+  <code title="attr-aria-role">role</code> and <code title="attr-aria-*">aria-*</code> attributes).</p><h5 id="the-id-attribute"><span class="secno">3.2.3.1 </span>The <dfn title="attr-id"><code>id</code></dfn> attribute</h5><p>The <code title="attr-id"><a href="#the-id-attribute">id</a></code> attribute specifies its
   element's <dfn id="concept-id" title="concept-id">unique identifier (ID)</dfn>. The
   value must be unique amongst all the IDs in the element's <a href="infrastructure.html#home-subtree">home
   subtree</a> and must contain at least one character. The value
   must not contain any <a href="common-microsyntaxes.html#space-character" title="space character">space
-  characters</a>.</p><!-- space characters are disallowed because space-separated lists
-  of IDs otherwise would not be able to reach all valid IDs --><p class="note">An element's <a href="#concept-id" title="concept-id">unique
+  characters</a>.</p><p class="note">An element's <a href="#concept-id" title="concept-id">unique
   identifier</a> can be used for a variety of purposes, most
   notably as a way to link to specific parts of a document using
   fragment identifiers, as a way to target an element when scripting,
@@ -738,8 +724,7 @@
   contents and for any of the element's attributes that contain
   text. Its value must be a valid BCP 47 language tag, or the empty
   string. Setting the attribute to the empty string indicates that the
-  primary language is unknown<!-- UA conformance requirements for this
-  are below -->. <a href="references.html#refsBCP47">[BCP47]</a></p><p>The <dfn id="attr-xml-lang" title="attr-xml-lang"><code title="">lang</code></dfn>
+  primary language is unknown. <a href="references.html#refsBCP47">[BCP47]</a></p><p>The <dfn id="attr-xml-lang" title="attr-xml-lang"><code title="">lang</code></dfn>
   attribute in the <a href="namespaces.html#xml-namespace">XML namespace</a> is defined in XML. <a href="references.html#refsXML">[XML]</a></p><p>If these attributes are omitted from an element, then the
   language of this element is the same as the language of its parent
   element, if any.</p><p>The <code title="attr-lang"><a href="#attr-lang">lang</a></code> attribute in no namespace
@@ -814,10 +799,7 @@
 
   <hr/><p>User agents may use the element's language to determine proper
   processing or rendering (e.g. in the selection of appropriate
-  fonts or pronunciations, or for dictionary selection). <!--User
-  agents must not use the element's language to determine text
-  directionality. (commented out because text directionality is a
-  rendering-level concern.)--></p>
+  fonts or pronunciations, or for dictionary selection). </p>
 
   <hr/><p>The <dfn id="dom-lang" title="dom-lang"><code>lang</code></dfn> IDL attribute
   must <a href="common-dom-interfaces.html#reflect">reflect</a> the <code title="attr-lang"><a href="#attr-lang">lang</a></code>
@@ -975,21 +957,6 @@
 &lt;p dir=auto class="u2"&gt;&lt;b&gt;&lt;bdi&gt;Teacher&lt;/bdi&gt;:&lt;/b&gt; Do you know how to write "Please"?&lt;/p&gt;
 &lt;p dir=auto class="u1"&gt;&lt;b&gt;&lt;bdi&gt;Student&lt;/bdi&gt;:&lt;/b&gt; "&#x645;&#x646; &#x641;&#x636;&#x644;&#x643;", right?&lt;/p&gt;</pre>
 
-<!--
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<style type="text/css">
- div { border: groove #FFFF99; padding: 0.25em; width: 22em; background: #FFFFEE; color: black; }
- p { margin: 0.25em 0; font: 1em/1 InaiMathi; color: purple; }
- .u1 { color: teal; }
-</style>
-<div>
-<p dir=ltr class="u1"><b><bdi>Student</bdi>:</b> How do you write "What's your name?" in Arabic?</p>
-<p dir=rtl class="u2"><b><bdi>Teacher</bdi>:</b> &#x645;&#x627; &#x627;&#x633;&#x645;&#x643;&#x61f;</p>
-<p dir=ltr class="u1"><b><bdi>Student</bdi>:</b> Thanks.</p>
-<p dir=ltr class="u2"><b><bdi>Teacher</bdi>:</b> That's written "&#x634;&#x643;&#x631;&#x64b;&#x627;".</p>
-<p dir=ltr class="u2"><b><bdi>Teacher</bdi>:</b> Do you know how to write "Please"?</p>
-<p dir=rtl class="u1"><b><bdi>Student</bdi>:</b> "&#x645;&#x646; &#x641;&#x636;&#x644;&#x643;", right?</p>
--->
 
    <p>Given a suitable style sheet and the default alignment styles
    for the <code><a href="grouping-content.html#the-p-element">p</a></code> element, namely to align the text to the
@@ -1032,8 +999,7 @@
   Attribute Syntax specification. <a href="references.html#refsCSSATTR">[CSSATTR]</a></p><div class="impl">
 
   <p>In user agents that support CSS, the attribute's value must be
-  parsed when the attribute is added or has its value changed<!-- so
-  dynamic changes to the base URL don't affect the CSS -->, according
+  parsed when the attribute is added or has its value changed, according
   to the rules given for <span>CSS styling attributes</span>. <a href="references.html#refsCSSATTR">[CSSATTR]</a></p>
 
   </div><p>Documents that use <code title="attr-style"><a href="#the-style-attribute">style</a></code>
@@ -1180,13 +1146,6 @@
    <dd>
     <ol><li>Let <var title="">name</var> be the name passed to the
      algorithm.</li>
-<!--(can't happen while the DOMStringMap deleter has no name)
-     <li>If <var title="">name</var> contains a U+002D HYPHEN-MINUS
-     character (-) followed by a character in the range U+0061 to
-     U+007A (U+0061 LATIN SMALL LETTER A to U+007A LATIN SMALL LETTER
-     Z), throw a <code>SYNTAX_ERR</code> exception and abort these
-     steps.</li>
--->
      <li>For each character in the range U+0041 to U+005A (U+0041
      LATIN CAPITAL LETTER A to U+005A LATIN CAPITAL LETTER Z) in <var title="">name</var>, insert a U+002D HYPHEN-MINUS character (-)
      before the character and replace the character with the same

Index: urls.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/urls.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- urls.html	25 Feb 2011 07:05:30 -0000	1.8
+++ urls.html	30 Apr 2011 11:35:46 -0000	1.9
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>2.6 URLs &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -350,7 +346,16 @@
    <a href="spec.html#contents">Table of contents</a> &#x2013;
    <a href="fetching-resources.html" class="next">2.7 Fetching resources</a>
   <ol class="toc"><li><ol><li><a href="urls.html#urls"><span class="secno">2.6 </span>URLs</a>
-    <ol><li><a href="urls.html#terminology-0"><span class="secno">2.6.1 </span>Terminology</a></li><li><a href="urls.html#dynamic-changes-to-base-urls"><span class="secno">2.6.2 </span>Dynamic changes to base URLs</a></li><li><a href="urls.html#interfaces-for-url-manipulation"><span class="secno">2.6.3 </span>Interfaces for URL manipulation</a></li></ol></li></ol></li></ol></div><h3 id="urls"><span class="secno">2.6 </span>URLs</h3><p class="XXX annotation"><span><a href="http://www.w3.org/html/wg/tracker/issues/56">ISSUE-56</a> (urls-webarch) blocks progress to Last Call</span></p><h4 id="terminology-0"><span class="secno">2.6.1 </span>Terminology</h4><!-- see also: svn diff -r3244:3245 source --><p>A <dfn id="url">URL</dfn> is a string used to identify a resource.</p><p>A <a href="#url">URL</a> is a <dfn id="valid-url">valid URL</dfn> if at least one of
+    <ol><li><a href="urls.html#terminology-0"><span class="secno">2.6.1 </span>Terminology</a></li><li><a href="urls.html#parsing-urls"><span class="secno">2.6.2 </span>Parsing URLs</a></li><li><a href="urls.html#resolving-urls"><span class="secno">2.6.3 </span>Resolving URLs</a></li><li><a href="urls.html#dynamic-changes-to-base-urls"><span class="secno">2.6.4 </span>Dynamic changes to base URLs</a></li><li><a href="urls.html#interfaces-for-url-manipulation"><span class="secno">2.6.5 </span>Interfaces for URL manipulation</a></li></ol></li></ol></li></ol></div><h3 id="urls"><span class="secno">2.6 </span>URLs</h3><p class="XXX annotation"><span><a href="http://www.w3.org/html/wg/tracker/issues/56">ISSUE-56</a> (urls-webarch) blocks progress to Last Call</span></p><p>This specification defines the term <a href="#url">URL</a>, and defines
+  various algorithms for dealing with URLs, because for historical
+  reasons the rules defined by the URI and IRI specifications are not
+  a complete description of what HTML user agents need to implement to
+  be compatible with Web content.</p><p class="note">The term "URL" in this specification is used in a
+  manner distinct from the precise technical meaning it is given in
+  RFC 3986. Readers familiar with that RFC will find it easier to read
+  <em>this</em> specification if they pretend the term "URL" as used
+  herein is really called something else altogether. This is a
+  <a href="introduction.html#willful-violation">willful violation</a> of RFC 3986. <a href="references.html#refsRFC3986">[RFC3986]</a></p><h4 id="terminology-0"><span class="secno">2.6.1 </span>Terminology</h4><p>A <dfn id="url">URL</dfn> is a string used to identify a resource.</p><p>A <a href="#url">URL</a> is a <dfn id="valid-url">valid URL</dfn> if at least one of
   the following conditions holds:</p><ul><li><p>The <a href="#url">URL</a> is a valid URI reference <a href="references.html#refsRFC3986">[RFC3986]</a>.</p></li>
 
    <li><p>The <a href="#url">URL</a> is a valid IRI reference and it has no
@@ -367,24 +372,138 @@
   spaces</dfn> if, after <a href="common-microsyntaxes.html#strip-leading-and-trailing-whitespace" title="strip leading and trailing&#10;  whitespace">stripping leading and trailing whitespace</a> from
   it, it is a <a href="#valid-url">valid URL</a>.</p><p>A string is a <dfn id="valid-non-empty-url-potentially-surrounded-by-spaces">valid non-empty URL potentially surrounded by
   spaces</dfn> if, after <a href="common-microsyntaxes.html#strip-leading-and-trailing-whitespace" title="strip leading and trailing&#10;  whitespace">stripping leading and trailing whitespace</a> from
-  it, it is a <a href="#valid-non-empty-url">valid non-empty URL</a>.</p><div class="impl">
+  it, it is a <a href="#valid-non-empty-url">valid non-empty URL</a>.</p><p>This specification defines the URL
+  <dfn id="about:legacy-compat"><code>about:legacy-compat</code></dfn> as a reserved, though
+  unresolvable, <code title="">about:</code> URI, for use in <a href="syntax.html#syntax-doctype" title="syntax-doctype">DOCTYPE</a>s in <a href="dom.html#html-documents">HTML
+  documents</a> when needed for compatibility with XML tools. <a href="references.html#refsABOUT">[ABOUT]</a></p><p>This specification defines the URL
+  <dfn id="about:srcdoc"><code>about:srcdoc</code></dfn> as a reserved, though
+  unresolvable, <code title="">about:</code> URI, that is used as
+  <a href="dom.html#the-document-s-address">the document's address</a> of <a href="the-iframe-element.html#an-iframe-srcdoc-document" title="an iframe srcdoc&#10;  document"><code>iframe</code> <code title="attr-iframe-srcdoc">srcdoc</code> documents</a>. <a href="references.html#refsABOUT">[ABOUT]</a></p><div class="impl">
+
+  <h4 id="parsing-urls"><span class="secno">2.6.2 </span>Parsing URLs</h4>
 
   <p>To <dfn id="parse-a-url">parse a URL</dfn> <var title="">url</var> into its
-  component parts, the user agent must use the <span class="XXX">parse
-  an address</span> algorithm defined by the IRI specification. <a href="references.html#refsRFC3987">[RFC3987]</a></p>
+  component parts, the user agent must use the following steps:</p>
 
-  <p>Parsing a URL can fail. If it does not, then it results in the
-  following components, again as defined by the IRI specification:</p>
+  <ol><li><p>Strip leading and trailing <a href="common-microsyntaxes.html#space-character" title="space&#10;   character">space characters</a> from <var title="">url</var>.</p></li>
 
-  <ul class="brief"><li><dfn id="url-scheme" title="url-scheme">&lt;scheme&gt;</dfn></li>
-   <li><dfn id="url-host" title="url-host">&lt;host&gt;</dfn></li>
-   <li><dfn id="url-port" title="url-port">&lt;port&gt;</dfn></li>
-   <li><dfn id="url-hostport" title="url-hostport">&lt;hostport&gt;</dfn></li>
-   <li><dfn id="url-path" title="url-path">&lt;path&gt;</dfn></li>
-   <li><dfn id="url-query" title="url-query">&lt;query&gt;</dfn></li>
-   <li><dfn id="url-fragment" title="url-fragment">&lt;fragment&gt;</dfn></li>
-   <li><dfn id="url-host-specific" title="url-host-specific">&lt;host-specific&gt;</dfn></li>
-  </ul><hr/><p>To <dfn id="resolve-a-url">resolve a URL</dfn> to an <a href="#absolute-url">absolute URL</a>
+   <li>
+
+    <p>Parse <var title="">url</var> in the manner defined by RFC
+    3986, with the following exceptions:</p>
+
+    <ul><li>Add all characters with code points less than or equal to
+     U+0020 or greater than or equal to U+007F to the
+     &lt;unreserved&gt; production.</li>
+
+     <li>Add the characters U+0022, U+003C, U+003E, U+005B .. U+005E,
+     U+0060, and U+007B .. U+007D to the &lt;unreserved&gt;
+     production.
+      <!--      <!--
+       0022 QUOTATION MARK
+       003C LESS-THAN SIGN
+       003E GREATER-THAN SIGN
+       005B LEFT SQUARE BRACKET
+       005C REVERSE SOLIDUS
+       005D RIGHT SQUARE BRACKET
+       005E CIRCUMFLEX ACCENT
+       0060 GRAVE ACCENT
+       007B LEFT CURLY BRACKET
+       007C VERTICAL LINE
+       007D RIGHT CURLY BRACKET
+      -->
+     </li>
+
+     <li>Add a single U+0025 PERCENT SIGN character as a second
+     alternative way of matching the &lt;pct-encoded&gt; production,
+     except when the &lt;pct-encoded&gt; is used in the
+     &lt;reg-name&gt; production.</li>
+
+     <li>Add the U+0023 NUMBER SIGN character to the characters
+     allowed in the &lt;fragment&gt; production.</li>
+
+     
+    </ul></li>
+
+   <li>
+
+    <p>If <var title="">url</var> doesn't match the
+    &lt;URI-reference&gt; production, even after the above changes are
+    made to the ABNF definitions, then parsing the URL fails with an
+    error. <a href="references.html#refsRFC3986">[RFC3986]</a></p>
+
+    <p>Otherwise, parsing <var title="">url</var> was successful; the
+    components of the URL are substrings of <var title="">url</var>
+    defined as follows:</p>
+
+    <dl><dt><dfn id="url-scheme" title="url-scheme">&lt;scheme&gt;</dfn></dt>
+
+     <dd><p>The substring matched by the &lt;scheme&gt; production, if any.</p></dd>
+
+
+     <dt><dfn id="url-host" title="url-host">&lt;host&gt;</dfn></dt>
+
+     <dd><p>The substring matched by the &lt;host&gt; production, if any.</p></dd>
+
+
+     <dt><dfn id="url-port" title="url-port">&lt;port&gt;</dfn></dt>
+
+     <dd><p>The substring matched by the &lt;port&gt; production, if any.</p></dd>
+
+
+     <dt><dfn id="url-hostport" title="url-hostport">&lt;hostport&gt;</dfn></dt>
+
+     <dd><p>If there is a &lt;scheme&gt; component and a &lt;port&gt;
+     component and the port given by the &lt;port&gt; component is
+     different than the default port defined for the protocol given by
+     the &lt;scheme&gt; component, then &lt;hostport&gt; is the
+     substring that starts with the substring matched by the
+     &lt;host&gt; production and ends with the substring matched by the
+     &lt;port&gt; production, and includes the colon in between the
+     two. Otherwise, it is the same as the &lt;host&gt; component.</p>
+
+
+     </dd><dt><dfn id="url-path" title="url-path">&lt;path&gt;</dfn></dt>
+
+     <dd>
+
+      <p>The substring matched by one of the following productions, if
+      one of them was matched:</p>
+
+      <ul class="brief"><li>&lt;path-abempty&gt;</li>
+       <li>&lt;path-absolute&gt;</li>
+       <li>&lt;path-noscheme&gt;</li>
+       <li>&lt;path-rootless&gt;</li>
+       <li>&lt;path-empty&gt;</li>
+      </ul></dd>
+
+
+     <dt><dfn id="url-query" title="url-query">&lt;query&gt;</dfn></dt>
+
+     <dd><p>The substring matched by the &lt;query&gt; production, if any.</p></dd>
+
+
+     <dt><dfn id="url-fragment" title="url-fragment">&lt;fragment&gt;</dfn></dt>
+
+     <dd><p>The substring matched by the &lt;fragment&gt; production, if any.</p></dd>
+
+
+     <dt><dfn id="url-host-specific" title="url-host-specific">&lt;host-specific&gt;</dfn></dt>
+
+     <dd><p>The substring that <em>follows</em> the substring matched
+     by the &lt;authority&gt; production, or the whole string if the
+     &lt;authority&gt; production wasn't matched.</p></dd>
+
+    </dl></li>
+
+  </ol><p class="note">These parsing rules are a <a href="introduction.html#willful-violation">willful
+  violation</a> of RFC 3986 and RFC 3987 (which do not define error
+  handling), motivated by a desire to handle legacy content. <a href="references.html#refsRFC3986">[RFC3986]</a> <a href="references.html#refsRFC3987">[RFC3987]</a></p>
+
+  </div><h4 id="resolving-urls"><span class="secno">2.6.3 </span>Resolving URLs</h4><p>Resolving a URL is the process of taking a relative URL and
+  obtaining the absolute URL that it implies.</p><div class="impl">
+
+  <p>To <dfn id="resolve-a-url">resolve a URL</dfn> to an <a href="#absolute-url">absolute URL</a>
   relative to either another <a href="#absolute-url">absolute URL</a> or an element,
   the user agent must use the following steps. Resolving a URL can
   result in an error, in which case the URL is not resolvable.</p>
@@ -448,13 +567,9 @@
 
      <li>
 
-      <!-- http://www.hixie.ch/tests/adhoc/html/navigation/javascript-url/ -->
-
-      <!-- this should be tested in the case of a browsing context that
-      was navigated to about:blank after having been elsewhere, as
-      opposed to the about:blank used at the time of the browsing
-      context's creation. -->
+      
 
+      
       <p>If <var title="">fallback base url</var> is
       <code><a href="fetching-resources.html#about:blank">about:blank</a></code>, and the <code><a href="infrastructure.html#document">Document</a></code>'s
       <a href="browsers.html#browsing-context">browsing context</a> has a <a href="browsers.html#creator-browsing-context">creator browsing
@@ -486,11 +601,112 @@
 
     </ol></li>
 
-   <li><p>Return the result of applying the <span class="XXX">resolve
-   an address</span> algorithm defined by the IRI specification to
-   resolve <var title="">url</var> relative to <var title="">base</var> using encoding <var title="">encoding</var>. <a href="references.html#refsRFC3987">[RFC3987]</a></p></li>
+   <li><p><a href="#parse-a-url" title="parse a URL">Parse</a> <var title="">url</var> into its component parts.</p></li>
 
-  </ol></div><p>A <a href="#url">URL</a> is an <dfn id="absolute-url">absolute URL</dfn> if <a href="#resolve-a-url" title="resolve a url">resolving</a> it results in the same output
+   <li>
+
+    <p>If parsing <var title="">url</var> resulted in a <a href="#url-host" title="url-host">&lt;host&gt;</a> component, then replace the
+    matching substring of <var title="">url</var> with the string that
+    results from expanding any sequences of percent-encoded octets in
+    that component that are valid UTF-8 sequences into Unicode
+    characters as defined by UTF-8.</p>
+
+    <p>If any percent-encoded octets in that component are not valid
+    UTF-8 sequences, then return an error and abort these steps.</p>
+
+    <p>Apply the IDNA ToASCII algorithm to the matching substring,
+    with both the AllowUnassigned and UseSTD3ASCIIRules flags
+    set. Replace the matching substring with the result of the ToASCII
+    algorithm.</p>
+
+    <p>If ToASCII fails to convert one of the components of the
+    string, e.g. because it is too long or because it contains invalid
+    characters, then return an error and abort these steps. <a href="references.html#refsRFC3490">[RFC3490]</a></p>
+
+   </li>
+
+   <li>
+
+    <p>If parsing <var title="">url</var> resulted in a <a href="#url-path" title="url-path">&lt;path&gt;</a> component, then replace the
+    matching substring of <var title="">url</var> with the string that
+    results from applying the following steps to each character other
+    than U+0025 PERCENT SIGN (%) that doesn't match the original
+    &lt;path&gt; production defined in RFC 3986:</p>
+
+    <ol><li>Encode the character into a sequence of octets as defined by
+     UTF-8.</li>
+
+     <li>Replace the character with the percent-encoded form of those
+     octets. <a href="references.html#refsRFC3986">[RFC3986]</a></li>
+
+    </ol><div class="example">
+
+     <p>For instance if <var title="">url</var> was "<code title="">//example.com/a^b&#x263A;c%FFd%z/?e</code>", then the
+     <a href="#url-path" title="url-path">&lt;path&gt;</a> component's substring
+     would be "<code title="">/a^b&#x263A;c%FFd%z/</code>" and the two
+     characters that would have to be escaped would be "<code title="">^</code>" and "<code title="">&#x263A;</code>". The
+     result after this step was applied would therefore be that <var title="">url</var> now had the value "<code title="">//example.com/a%5Eb%E2%98%BAc%FFd%z/?e</code>".</p>
+
+    </div>
+
+   </li>
+
+   <li>
+
+    <p>If parsing <var title="">url</var> resulted in a <a href="#url-query" title="url-query">&lt;query&gt;</a> component, then replace the
+    matching substring of <var title="">url</var> with the string that
+    results from applying the following steps to each character other
+    than U+0025 PERCENT SIGN (%) that doesn't match the original
+    &lt;query&gt; production defined in RFC 3986:</p>
+
+    <ol><li>If the character in question cannot be expressed in the
+     encoding <var title="">encoding</var>, then replace it with a
+     single 0x3F octet (an ASCII question mark) and skip the remaining
+     substeps for this character.</li>
+
+     <li>Encode the character into a sequence of octets as defined by
+     the encoding <var title="">encoding</var>.</li>
+
+     <li>Replace the character with the percent-encoded form of those
+     octets. <a href="references.html#refsRFC3986">[RFC3986]</a></li>
+
+    </ol></li>
+
+   <li><p>Apply the algorithm described in RFC 3986 section 5.2
+   Relative Resolution, using <var title="">url</var> as the
+   potentially relative URI reference (<var title="">R</var>), and
+   <var title="">base</var> as the base URI (<var title="">Base</var>). <a href="references.html#refsRFC3986">[RFC3986]</a></p></li>
+
+   <li>
+
+    <p>Apply any relevant conformance criteria of RFC 3986 and RFC
+    3987, returning an error and aborting these steps if
+    appropriate. <a href="references.html#refsRFC3986">[RFC3986]</a> <a href="references.html#refsRFC3987">[RFC3987]</a></p>
+
+    <p class="example">For instance, if an absolute URI that would be
+    returned by the above algorithm violates the restrictions specific
+    to its scheme, e.g. a <code title="">data:</code> URI using the
+    "<code title="">//</code>" server-based naming authority syntax,
+    then user agents are to treat this as an error instead.</p>
+
+   </li>
+
+   <li><p>Let <var title="">result</var> be the target URI (<var title="">T</var>) returned by the Relative Resolution
+   algorithm.</p></li>
+
+   <li><p>If <var title="">result</var> uses a scheme with a
+   server-based naming authority, replace all U+005C REVERSE SOLIDUS
+   (\) characters in <var title="">result</var> with U+002F SOLIDUS
+   (/) characters.</p></li>
+
+   <li><p>Return <var title="">result</var>.</p></li>
+
+  </ol><p class="note">Some of the steps in these rules, for example the
+  processing of U+005C REVERSE SOLIDUS (\) characters, are a
+  <a href="introduction.html#willful-violation">willful violation</a> of RFC 3986 and RFC 3987, motivated
+  by a desire to handle legacy content. <a href="references.html#refsRFC3986">[RFC3986]</a> <a href="references.html#refsRFC3987">[RFC3987]</a></p>
+
+  </div><p>A <a href="#url">URL</a> is an <dfn id="absolute-url">absolute URL</dfn> if <a href="#resolve-a-url" title="resolve a url">resolving</a> it results in the same output
   regardless of what it is resolved relative to, and that output is
   not a failure.</p><p>An <a href="#absolute-url">absolute URL</a> is a <dfn id="hierarchical-url">hierarchical URL</dfn> if,
   when <a href="#resolve-a-url" title="resolve a url">resolved</a> and then <a href="#parse-a-url" title="parse a url">parsed</a>, there is a character immediately
@@ -498,20 +714,9 @@
   and it is a U+002F SOLIDUS character (/).</p><p>An <a href="#absolute-url">absolute URL</a> is an <dfn id="authority-based-url">authority-based URL</dfn>
   if, when <a href="#resolve-a-url" title="resolve a url">resolved</a> and then <a href="#parse-a-url" title="parse a url">parsed</a>, there are two characters
   immediately after the <a href="#url-scheme" title="url-scheme">&lt;scheme&gt;</a>
-  component and they are both U+002F SOLIDUS characters (//).</p><hr/><p>This specification defines the URL
-  <dfn id="about:legacy-compat"><code>about:legacy-compat</code></dfn> as a reserved, though
-  unresolvable, <code title="">about:</code> URI, for use in <a href="syntax.html#syntax-doctype" title="syntax-doctype">DOCTYPE</a>s in <a href="dom.html#html-documents">HTML
-  documents</a> when needed for compatibility with XML tools. <a href="references.html#refsABOUT">[ABOUT]</a></p><p>This specification defines the URL
-  <dfn id="about:srcdoc"><code>about:srcdoc</code></dfn> as a reserved, though
-  unresolvable, <code title="">about:</code> URI, that is used as
-  <a href="dom.html#the-document-s-address">the document's address</a> of <a href="the-iframe-element.html#an-iframe-srcdoc-document" title="an iframe srcdoc&#10;  document"><code>iframe</code> <code title="attr-iframe-srcdoc">srcdoc</code> documents</a>. <a href="references.html#refsABOUT">[ABOUT]</a></p><p class="note">The term "URL" in this specification is used in a
-  manner distinct from the precise technical meaning it is given in
-  RFC 3986. Readers familiar with that RFC will find it easier to read
-  <em>this</em> specification if they pretend the term "URL" as used
-  herein is really called something else altogether. This is a
-  <a href="introduction.html#willful-violation">willful violation</a> of RFC 3986. <a href="references.html#refsRFC3986">[RFC3986]</a></p><div class="impl">
+  component and they are both U+002F SOLIDUS characters (//).</p><div class="impl">
 
-  <h4 id="dynamic-changes-to-base-urls"><span class="secno">2.6.2 </span>Dynamic changes to base URLs</h4>
+  <h4 id="dynamic-changes-to-base-urls"><span class="secno">2.6.4 </span>Dynamic changes to base URLs</h4>
 
   <p>When an <code title="attr-xml-base"><a href="elements.html#the-xml:base-attribute-xml-only">xml:base</a></code> attribute
   changes, the attribute's element, and all descendant elements, are
@@ -572,7 +777,7 @@
 
    </dd>
 
-  </dl></div><h4 id="interfaces-for-url-manipulation"><span class="secno">2.6.3 </span>Interfaces for URL manipulation</h4><p>An interface that has a complement of <dfn id="url-decomposition-idl-attributes">URL decomposition IDL
+  </dl></div><h4 id="interfaces-for-url-manipulation"><span class="secno">2.6.5 </span>Interfaces for URL manipulation</h4><p>An interface that has a complement of <dfn id="url-decomposition-idl-attributes">URL decomposition IDL
   attributes</dfn> has seven attributes with the following
   definitions:</p><pre class="idl extract">           attribute DOMString <a href="#dom-uda-protocol" title="dom-uda-protocol">protocol</a>;
            attribute DOMString <a href="#dom-uda-host" title="dom-uda-host">host</a>;
@@ -735,11 +940,7 @@
      </td><td>&#x2014;
      </td><td>Remove one leading U+0023 NUMBER SIGN character (#), if any
      </td><td>&#x2014;
-  </td></tr></tbody></table><!--
-  http://www.hixie.ch/tests/adhoc/dom/level0/location/components/
-  http://lxr.mozilla.org/seamonkey/source/dom/src/base/nsLocation.cpp
-  http://wp.netscape.com/eng/mozilla/3.0/handbook/javascript/ref_h-l.htm#84722
---></div><div class="example">
+  </td></tr></tbody></table></div><div class="example">
 
    <p>The table below demonstrates how the getter <span class="impl">condition</span> for <code title="dom-uda-search"><a href="#dom-uda-search">search</a></code> results in different results
    depending on the exact original syntax of the URL:</p>

Index: tokenization.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/tokenization.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- tokenization.html	25 Feb 2011 07:05:30 -0000	1.8
+++ tokenization.html	30 Apr 2011 11:35:46 -0000	1.9
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>8.2.4 Tokenization &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -341,17 +337,16 @@
        document.getElementsByTagName('h2')[0].textContent += '; load: ' + (new Date() - loadTimer) + 'ms';
[...4194 lines suppressed...]
-    mode</a>.</p>
-   </dd>
-
-   <dt>An end-of-file token</dt>
-   <dd>
-    <p><a href="the-end.html#stop-parsing">Stop parsing</a>.</p>
-   </dd>
-
-   <dt>A start tag whose tag name is "noframes"</dt>
-   <dd>
-    <p>Process the token <a href="parsing.html#using-the-rules-for">using the rules for</a> the "<a href="#parsing-main-inhead" title="insertion mode: in head">in head</a>" <a href="parsing.html#insertion-mode">insertion
-    mode</a>.</p>
-   </dd>
-
-   <dt>Anything else</dt>
-   <dd>
-    <p><a href="parsing.html#parse-error">Parse error</a>. Ignore the token.</p>
-   </dd>
-
   </dl></div></body></html>

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.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- association-of-controls-and-forms.html	25 Feb 2011 07:05:27 -0000	1.9
+++ association-of-controls-and-forms.html	30 Apr 2011 11:35:43 -0000	1.10
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>4.10.18 Association of controls and forms &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -352,7 +348,7 @@
   <ol class="toc"><li><ol><li><ol><li><a href="association-of-controls-and-forms.html#association-of-controls-and-forms"><span class="secno">4.10.18 </span>Association of controls and forms</a></li><li><a href="association-of-controls-and-forms.html#attributes-common-to-form-controls"><span class="secno">4.10.19 </span>Attributes common to form controls</a>
       <ol><li><a href="association-of-controls-and-forms.html#naming-form-controls"><span class="secno">4.10.19.1 </span>Naming form controls</a></li><li><a href="association-of-controls-and-forms.html#enabling-and-disabling-form-controls"><span class="secno">4.10.19.2 </span>Enabling and disabling form controls</a></li><li><a href="association-of-controls-and-forms.html#a-form-control-s-value"><span class="secno">4.10.19.3 </span>A form control's value</a></li><li><a href="association-of-controls-and-forms.html#autofocusing-a-form-control"><span class="secno">4.10.19.4 </span>Autofocusing a form control</a></li><li><a href="association-of-controls-and-forms.html#limiting-user-input-length"><span class="secno">4.10.19.5 </span>Limiting user input length</a></li><li><a href="association-of-controls-and-forms.html#form-submission-0"><span class="secno">4.10.19.6 </span>Form submission</a></li><li><a href="association-of-controls-and-forms.html#submitting-element-directionality"><span class="secno">4.10.19.7 </span>Submitting element directionality</a></li></ol></li><li><a href="association-of-controls-and-forms.html#textFieldSelection"><span class="secno">4.10.20 </span>APIs for the text field selections</a></li><li><a href="association-of-controls-and-forms.html#constraints"><span class="secno">4.10.21 </span>Constraints</a>
       <ol><li><a href="association-of-controls-and-forms.html#definitions"><span class="secno">4.10.21.1 </span>Definitions</a></li><li><a href="association-of-controls-and-forms.html#constraint-validation"><span class="secno">4.10.21.2 </span>Constraint validation</a></li><li><a href="association-of-controls-and-forms.html#the-constraint-validation-api"><span class="secno">4.10.21.3 </span>The constraint validation API</a></li><li><a href="association-of-controls-and-forms.html#security-forms"><span class="secno">4.10.21.4 </span>Security</a></li></ol></li><li><a href="association-of-controls-and-forms.html#form-submission"><span class="secno">4.10.22 </span>Form submission</a>
-      <ol><li><a href="association-of-controls-and-forms.html#introduction-1"><span class="secno">4.10.22.1 </span>Introduction</a></li><li><a href="association-of-controls-and-forms.html#implicit-submission"><span class="secno">4.10.22.2 </span>Implicit submission</a></li><li><a href="association-of-controls-and-forms.html#form-submission-algorithm"><span class="secno">4.10.22.3 </span>Form submission algorithm</a></li><li><a href="association-of-controls-and-forms.html#url-encoded-form-data"><span class="secno">4.10.22.4 </span>URL-encoded form data</a></li><li><a href="association-of-controls-and-forms.html#multipart-form-data"><span class="secno">4.10.22.5 </span>Multipart form data</a></li><li><a href="association-of-controls-and-forms.html#plain-text-form-data"><span class="secno">4.10.22.6 </span>Plain text form data</a></li></ol></li><li><a href="association-of-controls-and-forms.html#resetting-a-form"><span class="secno">4.10.23 </span>Resetting a form</a></li><li><a href="association-of-controls-and-forms.html#event-dispatch"><span class="secno">4.10.24 </span>Event dispatch</a></li></ol></li></ol></li></ol></div><h4 id="association-of-controls-and-forms"><span class="secno">4.10.18 </span>Association of controls and forms</h4><p>A <a href="forms.html#form-associated-element">form-associated element</a> can have a relationship
+      <ol><li><a href="association-of-controls-and-forms.html#introduction-2"><span class="secno">4.10.22.1 </span>Introduction</a></li><li><a href="association-of-controls-and-forms.html#implicit-submission"><span class="secno">4.10.22.2 </span>Implicit submission</a></li><li><a href="association-of-controls-and-forms.html#form-submission-algorithm"><span class="secno">4.10.22.3 </span>Form submission algorithm</a></li><li><a href="association-of-controls-and-forms.html#constructing-form-data-set"><span class="secno">4.10.22.4 </span>Constructing the form data set</a></li><li><a href="association-of-controls-and-forms.html#url-encoded-form-data"><span class="secno">4.10.22.5 </span>URL-encoded form data</a></li><li><a href="association-of-controls-and-forms.html#multipart-form-data"><span class="secno">4.10.22.6 </span>Multipart form data</a></li><li><a href="association-of-controls-and-forms.html#plain-text-form-data"><span class="secno">4.10.22.7 </span>Plain text form data</a></li></ol></li><li><a href="association-of-controls-and-forms.html#resetting-a-form"><span class="secno">4.10.23 </span>Resetting a form</a></li></ol></li></ol></li></ol></div><h4 id="association-of-controls-and-forms"><span class="secno">4.10.18 </span>Association of controls and forms</h4><p>A <a href="forms.html#form-associated-element">form-associated element</a> can have a relationship
   with a <code><a href="forms.html#the-form-element">form</a></code> element, which is called the element's
   <dfn id="form-owner">form owner</dfn>. If a <a href="forms.html#form-associated-element">form-associated element</a> is
   not associated with a <code><a href="forms.html#the-form-element">form</a></code> element, its <a href="#form-owner">form
@@ -387,9 +383,9 @@
   parser</a> overrides this requirement when inserting form
   controls.</span></p>
 
-  <p>When a <a href="forms.html#form-associated-element">form-associated element</a>'s <code title="attr-fae-form"><a href="#attr-fae-form">form</a></code> attribute is added, removed, or
-  has its value changed, then the user agent must <a href="#reset-the-form-owner">reset the form
-  owner</a> of that element.</p>
+  <p>When a <a href="forms.html#form-associated-element">form-associated element</a>'s <code title="attr-fae-form"><a href="#attr-fae-form">form</a></code> attribute is set, changed, or
+  removed, then the user agent must <a href="#reset-the-form-owner">reset the form owner</a>
+  of that element.</p>
 
   <p>When a <a href="forms.html#form-associated-element">form-associated element</a> has a <code title="attr-fae-form"><a href="#attr-fae-form">form</a></code> attribute and the <a href="elements.html#concept-id" title="concept-id">ID</a> of any of the
   elements in the <code><a href="infrastructure.html#document">Document</a></code> changes, then the user agent
@@ -420,8 +416,7 @@
     <p>If the element has a <code title="attr-fae-form"><a href="#attr-fae-form">form</a></code>
     content attribute, then run these substeps:</p>
 
-    <ol><!-- note that this ignores the name="" attribute and is
-     unaffected by quirks mode (it's always case sensitive) --><li><p>If the first element <a href="infrastructure.html#in-a-document" title="in a Document">in the
+    <ol><li><p>If the first element <a href="infrastructure.html#in-a-document" title="in a Document">in the
      <code>Document</code></a> to have an <a href="elements.html#concept-id" title="concept-id">ID</a> that is <a href="infrastructure.html#case-sensitive" title="case-sensitive">case-sensitively</a> equal to the
      element's <code title="attr-fae-form"><a href="#attr-fae-form">form</a></code> content
      attribute's value is a <code><a href="forms.html#the-form-element">form</a></code> element, then <a href="#concept-form-association" title="concept-form-association">associate</a> the
@@ -494,7 +489,7 @@
   is specified, its value must not be the empty string.</p><p>Any non-empty value for <code title="attr-form-name"><a href="forms.html#attr-form-name">name</a></code>
   is allowed, but the names "<code title="attr-fe-name-charset"><a href="#attr-fe-name-charset">_charset_</a></code>" and "<code title="attr-fe-name-isindex"><a href="#attr-fe-name-isindex">isindex</a></code>" are special:</p><dl><dt><dfn id="attr-fe-name-isindex" title="attr-fe-name-isindex"><code>isindex</code></dfn></dt>
    <dd>
-    <p>This value, if used as the name of a <a href="states-of-the-type-attribute.html#text-state-and-search-state" title="attr-input-type-text">Text</a> control that is the only
+    <p>This value, if used as the name of a <a href="states-of-the-type-attribute.html#text-state-and-search-state" title="attr-input-type-text">Text</a> control that is the first
     control in a form that is submitted using the <code title="attr-fs-enctype-urlencoded"><a href="#attr-fs-enctype-urlencoded">application/x-www-form-urlencoded</a></code>
     mechanism, causes the submission to only include the value of this
     control, with no name.</p>
@@ -543,7 +538,7 @@
   the <code><a href="the-input-element.html#the-input-element">input</a></code> element's <code title="attr-input-multiple"><a href="common-input-element-attributes.html#attr-input-multiple">multiple</a></code> attribute,
   <code><a href="the-input-element.html#the-input-element">input</a></code> elements can also have separately defined <dfn id="concept-fe-values" title="concept-fe-values">value<em>s</em></dfn>.</p>
 
-  </div><h5 id="autofocusing-a-form-control"><span class="secno">4.10.19.4 </span>Autofocusing a form control</h5><!-- v2: Apply this to contentEditable elements --><p>The <dfn id="attr-fe-autofocus" title="attr-fe-autofocus"><code>autofocus</code></dfn>
+  </div><h5 id="autofocusing-a-form-control"><span class="secno">4.10.19.4 </span>Autofocusing a form control</h5><p>The <dfn id="attr-fe-autofocus" title="attr-fe-autofocus"><code>autofocus</code></dfn>
   content attribute allows the author to indicate that a control is to
   be focused as soon as the page is loaded, allowing the user to just
   start typing without having to manually focus the main control.</p><p>The <code title="attr-fe-autofocus"><a href="#attr-fe-autofocus">autofocus</a></code> attribute is
@@ -695,7 +690,7 @@
   <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>
+  element, the empty string.</p><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
   attributes</a>. If present, they indicate that the form is not to
@@ -754,13 +749,12 @@
   directionality</a> of the element, and gives the name of the
   field that contains this value during <a href="#form-submission">form submission</a>.
   If such an attribute is specified, its value must not be the empty
-  string.</p><h4 id="textFieldSelection"><span class="secno">4.10.20 </span>APIs for the text field selections</h4><!-- v2 idea: DOM Range APIs to expose the textarea/input edited
-  value (ack martijnw) --><p>The <code><a href="the-input-element.html#the-input-element">input</a></code> and <code><a href="the-button-element.html#the-textarea-element">textarea</a></code> elements define
+  string.</p><h4 id="textFieldSelection"><span class="secno">4.10.20 </span>APIs for the text field selections</h4><p>The <code><a href="the-input-element.html#the-input-element">input</a></code> and <code><a href="the-button-element.html#the-textarea-element">textarea</a></code> elements define
   the following members in their DOM interfaces for handling their
   selection:</p><pre class="idl extract">  void <a href="#dom-textarea-input-select" title="dom-textarea/input-select">select</a>();
            attribute unsigned long <a href="#dom-textarea-input-selectionstart" title="dom-textarea/input-selectionStart">selectionStart</a>;
            attribute unsigned long <a href="#dom-textarea-input-selectionend" title="dom-textarea/input-selectionEnd">selectionEnd</a>;
-  void <a href="#dom-textarea-input-setselectionrange" title="dom-textarea/input-setSelectionRange">setSelectionRange</a>(in unsigned long start, in unsigned long end);</pre><!-- v2: also add textLength? it seems to be widely used --><p>These methods and attributes expose and control the selection of
+  void <a href="#dom-textarea-input-setselectionrange" title="dom-textarea/input-setSelectionRange">setSelectionRange</a>(in unsigned long start, in unsigned long end);</pre><p>These methods and attributes expose and control the selection of
   <code><a href="the-input-element.html#the-input-element">input</a></code> and <code><a href="the-button-element.html#the-textarea-element">textarea</a></code> text fields.</p><dl class="domintro"><dt><var title="">element</var> . <code title="dom-textarea/input-select"><a href="#dom-textarea-input-select">select</a></code>()</dt>
 
    <dd>
@@ -1166,9 +1160,7 @@
        input.value == "fine" ||
        input.value == "tired") {
      input.setCustomValidity('"' + input.value + '" is not a feeling.');
-<!--   } else if (input.value == "...") {
-     input.setCustomValidity('...');
--->   } else {
+   } else {
      // input is fine -- reset the error message
      input.setCustomValidity('');
    }
@@ -1258,7 +1250,7 @@
   constraint validation features are only intended to improve the user
   experience, not to provide any kind of security mechanism.</p><h4 id="form-submission"><span class="secno">4.10.22 </span><dfn>Form submission</dfn></h4><div class="impl">
 
-  <h5 id="introduction-1"><span class="secno">4.10.22.1 </span>Introduction</h5>
+  <h5 id="introduction-2"><span class="secno">4.10.22.1 </span>Introduction</h5>
 
   </div><p><i>This section is non-normative.</i></p><p>When a form is submitted, the data in the form is converted into
   the structure specified by the <a href="#concept-fs-enctype" title="concept-fs-enctype">enctype</a>, and then sent to the
@@ -1334,7 +1326,7 @@
    redundantly calling the <code title="dom-form-submit"><a href="forms.html#dom-form-submit">submit()</a></code> method on <var title="">form</var>), then abort these steps. This doesn't affect
    the earlier instance of this algorithm.</p></li>
 
-   <!-- lock (implicit in previous step) -->
+   
 
    <li><p>If the <var title="">scripted-submit</var> flag is not set,
    and the <var title="">submitter</var> element's <a href="#concept-fs-novalidate" title="concept-fs-novalidate">no-validate state</a> is false,
@@ -1350,183 +1342,11 @@
    continue (effectively the default action is to perform the
    submission).</p></li>
 
-   <!-- if you add any steps between the "lock" and "unlock" lines,
-   make sure to update the step immediately before the "lock" line -->
-
-   <!-- unlock -->
-
-   <li><p>Let <var title="">controls</var> be a list of all the <a href="forms.html#category-submit" title="category-submit">submittable elements</a> whose
-   <a href="#form-owner">form owner</a> is <var title="">form</var>, in <a href="infrastructure.html#tree-order">tree
-   order</a>.</p></li>
-
-   <li><p>Let the <var title="">form data set</var> be a list of
-   name-value-type tuples, initially empty.</p></li>
-
-   <li id="constructing-form-data-set">
-
-    <p><strong>Constructing the form data set</strong>. For each
-    element <var title="">field</var> in <var title="">controls</var>,
-    in <a href="infrastructure.html#tree-order">tree order</a>, run the following substeps:</p>
-
-    <ol><li>
-
-      <p>If any of the following conditions are met, then skip these
-      substeps for this element:</p>
-
-      <ul><li>The <var title="">field</var> element has a
-       <code><a href="the-button-element.html#the-datalist-element">datalist</a></code> element ancestor.</li>
-
-       <li>The <var title="">field</var> element is <a href="#concept-fe-disabled" title="concept-fe-disabled">disabled</a>.</li>
-
-       <li>The <var title="">field</var> element is a <a href="forms.html#concept-button" title="concept-button">button</a> but it is not <var title="">submitter</var>.</li>
-
-       <li>The <var title="">field</var> element is an
-       <code><a href="the-input-element.html#the-input-element">input</a></code> element whose <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute is in the <a href="number-state.html#checkbox-state" title="attr-input-type-checkbox">Checkbox</a> state and
-       whose <a href="#concept-fe-checked" title="concept-fe-checked">checkedness</a> is
-       false.</li>
-
-       <li>The <var title="">field</var> element is an
-       <code><a href="the-input-element.html#the-input-element">input</a></code> element whose <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute is in the <a href="number-state.html#radio-button-state" title="attr-input-type-radio">Radio Button</a> state and
-       whose <a href="#concept-fe-checked" title="concept-fe-checked">checkedness</a> is
-       false.</li>
-
-       <li>The <var title="">field</var> element is not an
-       <code><a href="the-input-element.html#the-input-element">input</a></code> element whose <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute is in the <a href="number-state.html#image-button-state" title="attr-input-type-image">Image Button</a> state, and
-       either the <var title="">field</var> element does not have a
-       <code title="attr-fe-name"><a href="#attr-fe-name">name</a></code> attribute specified, or
-       its <code title="attr-fe-name"><a href="#attr-fe-name">name</a></code> attribute's value is
-       the empty string.</li>
-
-       <li>The <var title="">field</var> element is an
-       <code><a href="the-iframe-element.html#the-object-element">object</a></code> element that is not using a
-       <a href="infrastructure.html#plugin">plugin</a>.</li>
-
-      </ul><p>Otherwise, process <var title="">field</var> as follows:</p>
-
-     </li>
-
-     <li><p>Let <var title="">type</var> be the value of the <code title="">type</code> IDL attribute of <var title="">field</var>.</p></li> <!-- if the field is an <object>
-     element, this will get ignored. -->
-
-     <li>
-
-      <p>If the <var title="">field</var> element is an
-      <code><a href="the-input-element.html#the-input-element">input</a></code> element whose <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute is in the <a href="number-state.html#image-button-state" title="attr-input-type-image">Image Button</a> state,
-      then run these further nested substeps:</p>
-
-      <ol><li><p>If the <var title="">field</var> element has a <code title="attr-fe-name"><a href="#attr-fe-name">name</a></code> attribute specified and its
-       value is not the empty string, let <var title="">name</var> be
-       that value followed by a single U+002E FULL STOP character (.).
-       Otherwise, let <var title="">name</var> be the empty
-       string.</p></li>
-
-       <li><p>Let <var title="">name<sub title="">x</sub></var> be the
-       string consisting of the concatenation of <var title="">name</var> and a single U+0078 LATIN SMALL LETTER X
-       character (x).</p></li>
-
-       <li><p>Let <var title="">name<sub title="">y</sub></var> be the
-       string consisting of the concatenation of <var title="">name</var> and a single U+0079 LATIN SMALL LETTER Y
-       character (y).</p></li>
-
-       <li><p>The <var title="">field</var> element is <var title="">submitter</var>, and before this algorithm was invoked
-       the user <a href="number-state.html#concept-input-type-image-coordinate" title="concept-input-type-image-coordinate">indicated a
-       coordinate</a>. Let <var title="">x</var> be the <var title="">x</var>-component of the coordinate selected by the
-       user, and let <var title="">y</var> be the <var title="">y</var>-component of the coordinate selected by the
-       user.</p></li>
-
-       <li><p>Append an entry to the <var title="">form data set</var>
-       with the name <var title="">name<sub title="">x</sub></var>,
-       the value <var title="">x</var>, and the type <var title="">type</var>.</p></li>
-
-       <li><p>Append an entry to the <var title="">form data set</var>
-       with the name <var title="">name<sub title="">y</sub></var> and
-       the value <var title="">y</var>, and the type <var title="">type</var>.</p></li>
-
-       <li><p>Skip the remaining substeps for this element: if there
-       are any more elements in <var title="">controls</var>, return
-       to the top of the <a href="#constructing-form-data-set">constructing the form data
-       set</a> step, otherwise, jump to the next step in the overall
-       form submission algorithm.</p></li>
-
-      </ol></li>
-
-     <li><p>Let <var title="">name</var> be the value of the <var title="">field</var> element's <code title="attr-fe-name"><a href="#attr-fe-name">name</a></code> attribute.</p></li>
-
-     <li><p>If the <var title="">field</var> element is a
-     <code><a href="the-button-element.html#the-select-element">select</a></code> element, then for each <code><a href="the-button-element.html#the-option-element">option</a></code>
-     element in the <code><a href="the-button-element.html#the-select-element">select</a></code> element whose <a href="the-button-element.html#concept-option-selectedness" title="concept-option-selectedness">selectedness</a> is true,
-     append an entry to the <var title="">form data set</var> with the
-     <var title="">name</var> as the name, the <a href="the-button-element.html#concept-option-value" title="concept-option-value">value</a> of the
-     <code><a href="the-button-element.html#the-option-element">option</a></code> element as the value, and <var title="">type</var> as the type.</p></li>
-
-     <li>
-
-      <p>Otherwise, if the <var title="">field</var> element is an
-      <code><a href="the-input-element.html#the-input-element">input</a></code> element whose <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute is in the <a href="number-state.html#checkbox-state" title="attr-input-type-checkbox">Checkbox</a> state or the
-      <a href="number-state.html#radio-button-state" title="attr-input-type-radio">Radio Button</a> state,
-      then run these further nested substeps:</p>
-
-      <ol><li><p>If the <var title="">field</var> element has a <code title="attr-input-value"><a href="the-input-element.html#attr-input-value">value</a></code> attribute specified, then
-       let <var title="">value</var> be the value of that attribute;
-       otherwise, let <var title="">value</var> be the string
-       "<code title="">on</code>".</p></li>
-
-       <li><p>Append an entry to the <var title="">form data set</var>
-       with <var title="">name</var> as the name, <var title="">value</var> as the value, and <var title="">type</var>
-       as the type.</p></li>
-
-      </ol></li>
-
-     <li><p>Otherwise, if the <var title="">field</var> element is an
-     <code><a href="the-input-element.html#the-input-element">input</a></code> element whose <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute is in the <a href="number-state.html#file-upload-state" title="attr-input-type-file">File Upload</a> state, then for
-     each file <a href="number-state.html#concept-input-type-file-selected" title="concept-input-type-file-selected">selected</a> in the
-     <code><a href="the-input-element.html#the-input-element">input</a></code> element, append an entry to the <var title="">form data set</var> with the <var title="">name</var> as
-     the name, the file (consisting of the name, the type, and the
-     body) as the value, and <var title="">type</var> as the type. If
-     there are no <a href="number-state.html#concept-input-type-file-selected" title="concept-input-type-file-selected">selected files</a>,
-     then append an entry to the <var title="">form data set</var>
-     with the <var title="">name</var> as the name, the empty string
-     as the value, and <code>application/octet-stream</code> as the
-     type.</p></li>
-     <!-- https://bugzilla.mozilla.org/show_bug.cgi?id=529859 -->
-
-     <li><p>Otherwise, if the <var title="">field</var> element is an
-     <code><a href="the-iframe-element.html#the-object-element">object</a></code> element: try to obtain a form submission
-     value from the <a href="infrastructure.html#plugin">plugin</a><!-- using NPAPI's
-     NPP_GetValue() entry point with the NPPVformValue variable -->,
-     and if that is successful, append an entry to the <var title="">form data set</var> with <var title="">name</var> as the
-     name, the returned form submission value as the value, and the
-     string "<code title="">object</code>" as the type.</p></li>
-
-     <li><p>Otherwise, append an entry to the <var title="">form data
-     set</var> with <var title="">name</var> as the name, the <a href="#concept-fe-value" title="concept-fe-value">value</a> of the <var title="">field</var> element as the value, and <var title="">type</var> as the type.</p></li>
-
-     <li>
-
-      <p>If the element has a <a href="#form-control-dirname-attribute">form control <code title="">dirname</code> attribute</a>, and that attribute's
-      value is not the empty string, then run these substeps:</p>
-
-      <ol><li><p>Let <var title="">dirname</var> be the value of the
-       element's <code title="">dirname</code> attribute.</p></li>
-
-       <li><p>Let <var title="">dir</var> be the string "<code title="">ltr</code>" if <a href="elements.html#the-directionality">the directionality</a> of the
-       element is '<a href="elements.html#concept-ltr" title="concept-ltr">ltr</a>', and "<code title="">rtl</code>" otherwise (i.e. when <a href="elements.html#the-directionality">the
-       directionality</a> of the element is '<a href="elements.html#concept-rtl" title="concept-rtl">rtl</a>').</p></li>
-
-       <li><p>Append an entry to the <var title="">form data set</var>
-       with <var title="">dirname</var> as the name, <var title="">dir</var> as the value, and the string "<code title="">direction</code>" as the type.</p></li>
-
-      </ol><p class="note">An element can only have a <a href="#form-control-dirname-attribute">form control
-      <code title="">dirname</code> attribute</a> if it is a
-      <code><a href="the-button-element.html#the-textarea-element">textarea</a></code> element or an <code><a href="the-input-element.html#the-input-element">input</a></code> element
-      whose <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute is in
-      either the <a href="states-of-the-type-attribute.html#text-state-and-search-state" title="attr-input-type-text">Text</a> state
-      or the <a href="states-of-the-type-attribute.html#text-state-and-search-state" title="attr-input-type-search">Search</a>
-      state.</p>
-
-     </li>
+   
+   
 
-    </ol></li>
+   <li><p>Let <var title="">form data set</var> be the result of
+   <a href="#constructing-the-form-data-set">constructing the form data set</a> for <var title="">form</var>.</p></li>
 
    <li><p>Let <var title="">action</var> be the <var title="">submitter</var> element's <a href="#concept-fs-action" title="concept-fs-action">action</a>.</p></li>
 
@@ -1540,14 +1360,7 @@
     violation is motivated by a desire for compatibility with legacy
     content. <a href="references.html#refsRFC3986">[RFC3986]</a></p>
 
-    <!-- Don't ask me why. But that's what IE does. It even treats
-    action="" differently from action=" " or action="#" (the latter
-    two resolve to the base URL, the first one resolves to the doc
-    URL). And other browsers concur. It is even required, see e.g.
-      http://bugs.webkit.org/show_bug.cgi?id=7763
-      https://bugzilla.mozilla.org/show_bug.cgi?id=297761
-    -->
-
+    
    </li>
 
    <li><p><a href="urls.html#resolve-a-url" title="resolve a url">Resolve</a> the
@@ -1622,16 +1435,14 @@
       <var title="">form data set</var> using the <a href="#application-x-www-form-urlencoded-encoding-algorithm"><code title="">application/x-www-form-urlencoded</code> encoding
       algorithm</a>, interpreted as a US-ASCII string.</p>
 
-      <!-- by this point we've already tried to resolve the URL, so we
-      know we can parse it -->
-
+      
       <p>Let <var title="">destination</var> be a new <a href="urls.html#url">URL</a>
       that is equal to the <var title="">action</var> except that its
       <a href="urls.html#url-query" title="url-query">&lt;query&gt;</a> component is
       replaced by <var title="">query</var> (adding a U+003F QUESTION
       MARK character (?) if appropriate).</p>
 
-      <p><a href="history.html#navigate">Navigate</a><!--DONAV form--> <var title="">target
+      <p><a href="history.html#navigate">Navigate</a> <var title="">target
       browsing context</var> to <var title="">destination</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
@@ -1655,18 +1466,17 @@
 
        <dt>If <var title="">enctype</var> is <code title="attr-fs-enctype-formdata"><a href="#attr-fs-enctype-formdata">multipart/form-data</a></code></dt>
 
-       <dd>Let <var title="">MIME type</var> be "<code title="">multipart/form-data</code>".</dd>
+       <dd>Let <var title="">MIME type</var> be the concatenation of
+       the string "<code title="">multipart/form-data;</code>", a
+       U+0020 SPACE character, and the <a href="#multipart-form-data-boundary-string"><code title="">multipart/form-data</code> boundary string</a>
+       generated by the <a href="#multipart-form-data-encoding-algorithm"><code title="">multipart/form-data</code> encoding
+       algorithm</a>.</dd>
 
        <dt>If <var title="">enctype</var> is <code title="attr-fs-enctype-text"><a href="#attr-fs-enctype-text">text/plain</a></code></dt>
 
        <dd>Let <var title="">MIME type</var> be "<code title="">text/plain</code>".</dd>
 
-      </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 <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>
+      </dl><p>Otherwise, <a href="history.html#navigate">navigate</a> <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
@@ -1677,7 +1487,7 @@
      <dt><dfn id="submit-get-action" title="submit-get-action">Get action URL</dfn>
      </dt><dd>
 
-      <p><a href="history.html#navigate">Navigate</a><!--DONAV form--> <var title="">target
+      <p><a href="history.html#navigate">Navigate</a> <var title="">target
       browsing context</var> to <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>
@@ -1707,7 +1517,7 @@
       string, replace the first occurrence of "<code title="">%%</code>" in <var title="">action</var> with the
       resulting escaped string. <a href="references.html#refsRFC3986">[RFC3986]</a></p>
 
-      <p><a href="history.html#navigate">Navigate</a><!--DONAV form--> <var title="">target
+      <p><a href="history.html#navigate">Navigate</a> <var title="">target
       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>
@@ -1733,7 +1543,7 @@
 
       <p>Append <var title="">headers</var> to <var title="">destination</var>.</p>
 
-      <p><a href="history.html#navigate">Navigate</a><!--DONAV form--> <var title="">target
+      <p><a href="history.html#navigate">Navigate</a> <var title="">target
       browsing context</var> to <var title="">destination</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
@@ -1764,7 +1574,7 @@
       <p>Append <var title="">body</var>, interpreted as a US-ASCII
       string, to <var title="">destination</var>.</p>
 
-      <p><a href="history.html#navigate">Navigate</a><!--DONAV form--> <var title="">target
+      <p><a href="history.html#navigate">Navigate</a> <var title="">target
       browsing context</var> to <var title="">destination</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
@@ -1792,14 +1602,187 @@
 
     </dl></li>
 
-  </ol></div><div class="impl">
+  </ol><h5 id="constructing-form-data-set"><span class="secno">4.10.22.4 </span>Constructing the form data set</h5>
 
-  <h5 id="url-encoded-form-data"><span class="secno">4.10.22.4 </span>URL-encoded form data</h5>
+  <p>The algorithm to <dfn id="constructing-the-form-data-set" title="constructing the form data&#10;  set">construct the form data set</dfn> for a form <var title="">form</var> is as follows:</p>
+
+  <ol><li><p>Let <var title="">controls</var> be a list of all the <a href="forms.html#category-submit" title="category-submit">submittable elements</a> whose
+   <a href="#form-owner">form owner</a> is <var title="">form</var>, in <a href="infrastructure.html#tree-order">tree
+   order</a>.</p></li>
+
+   <li><p>Let the <var title="">form data set</var> be a list of
+   name-value-type tuples, initially empty.</p></li>
+
+   <li>
+
+    <p><i>Loop</i>: For each element <var title="">field</var> in <var title="">controls</var>, in <a href="infrastructure.html#tree-order">tree order</a>, run the
+    following substeps:</p>
+
+    <ol><li>
+
+      <p>If any of the following conditions are met, then skip these
+      substeps for this element:</p>
+
+      <ul><li>The <var title="">field</var> element has a
+       <code><a href="the-button-element.html#the-datalist-element">datalist</a></code> element ancestor.</li>
+
+       <li>The <var title="">field</var> element is <a href="#concept-fe-disabled" title="concept-fe-disabled">disabled</a>.</li>
+
+       <li>The <var title="">field</var> element is a <a href="forms.html#concept-button" title="concept-button">button</a> but it is not <var title="">submitter</var>.</li>
+
+       <li>The <var title="">field</var> element is an
+       <code><a href="the-input-element.html#the-input-element">input</a></code> element whose <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute is in the <a href="number-state.html#checkbox-state" title="attr-input-type-checkbox">Checkbox</a> state and
+       whose <a href="#concept-fe-checked" title="concept-fe-checked">checkedness</a> is
+       false.</li>
+
+       <li>The <var title="">field</var> element is an
+       <code><a href="the-input-element.html#the-input-element">input</a></code> element whose <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute is in the <a href="number-state.html#radio-button-state" title="attr-input-type-radio">Radio Button</a> state and
+       whose <a href="#concept-fe-checked" title="concept-fe-checked">checkedness</a> is
+       false.</li>
+
+       <li>The <var title="">field</var> element is not an
+       <code><a href="the-input-element.html#the-input-element">input</a></code> element whose <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute is in the <a href="number-state.html#image-button-state" title="attr-input-type-image">Image Button</a> state, and
+       either the <var title="">field</var> element does not have a
+       <code title="attr-fe-name"><a href="#attr-fe-name">name</a></code> attribute specified, or
+       its <code title="attr-fe-name"><a href="#attr-fe-name">name</a></code> attribute's value is
+       the empty string.</li>
+
+       <li>The <var title="">field</var> element is an
+       <code><a href="the-iframe-element.html#the-object-element">object</a></code> element that is not using a
+       <a href="infrastructure.html#plugin">plugin</a>.</li>
+
+      </ul><p>Otherwise, process <var title="">field</var> as follows:</p>
+
+     </li>
+
+     <li><p>Let <var title="">type</var> be the value of the <code title="">type</code> IDL attribute of <var title="">field</var>.</p></li> 
+     <li>
+
+      <p>If the <var title="">field</var> element is an
+      <code><a href="the-input-element.html#the-input-element">input</a></code> element whose <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute is in the <a href="number-state.html#image-button-state" title="attr-input-type-image">Image Button</a> state,
+      then run these further nested substeps:</p>
+
+      <ol><li><p>If the <var title="">field</var> element has a <code title="attr-fe-name"><a href="#attr-fe-name">name</a></code> attribute specified and its
+       value is not the empty string, let <var title="">name</var> be
+       that value followed by a single U+002E FULL STOP character (.).
+       Otherwise, let <var title="">name</var> be the empty
+       string.</p></li>
+
+       <li><p>Let <var title="">name<sub title="">x</sub></var> be the
+       string consisting of the concatenation of <var title="">name</var> and a single U+0078 LATIN SMALL LETTER X
+       character (x).</p></li>
+
+       <li><p>Let <var title="">name<sub title="">y</sub></var> be the
+       string consisting of the concatenation of <var title="">name</var> and a single U+0079 LATIN SMALL LETTER Y
+       character (y).</p></li>
+
+       <li><p>The <var title="">field</var> element is <var title="">submitter</var>, and before this algorithm was invoked
+       the user <a href="number-state.html#concept-input-type-image-coordinate" title="concept-input-type-image-coordinate">indicated a
+       coordinate</a>. Let <var title="">x</var> be the <var title="">x</var>-component of the coordinate selected by the
+       user, and let <var title="">y</var> be the <var title="">y</var>-component of the coordinate selected by the
+       user.</p></li>
+
+       <li><p>Append an entry to the <var title="">form data set</var>
+       with the name <var title="">name<sub title="">x</sub></var>,
+       the value <var title="">x</var>, and the type <var title="">type</var>.</p></li>
+
+       <li><p>Append an entry to the <var title="">form data set</var>
+       with the name <var title="">name<sub title="">y</sub></var> and
+       the value <var title="">y</var>, and the type <var title="">type</var>.</p></li>
+
+       <li><p>Skip the remaining substeps for this element: if there
+       are any more elements in <var title="">controls</var>, return
+       to the top of the <i>loop</i> step, otherwise, jump to the
+       <i>end</i> step below.</p></li>
+
+      </ol></li>
+
+     <li><p>Let <var title="">name</var> be the value of the <var title="">field</var> element's <code title="attr-fe-name"><a href="#attr-fe-name">name</a></code> attribute.</p></li>
+
+     <li><p>If the <var title="">field</var> element is a
+     <code><a href="the-button-element.html#the-select-element">select</a></code> element, then for each <code><a href="the-button-element.html#the-option-element">option</a></code>
+     element in the <code><a href="the-button-element.html#the-select-element">select</a></code> element whose <a href="the-button-element.html#concept-option-selectedness" title="concept-option-selectedness">selectedness</a> is true,
+     append an entry to the <var title="">form data set</var> with the
+     <var title="">name</var> as the name, the <a href="the-button-element.html#concept-option-value" title="concept-option-value">value</a> of the
+     <code><a href="the-button-element.html#the-option-element">option</a></code> element as the value, and <var title="">type</var> as the type.</p></li>
+
+     <li>
+
+      <p>Otherwise, if the <var title="">field</var> element is an
+      <code><a href="the-input-element.html#the-input-element">input</a></code> element whose <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute is in the <a href="number-state.html#checkbox-state" title="attr-input-type-checkbox">Checkbox</a> state or the
+      <a href="number-state.html#radio-button-state" title="attr-input-type-radio">Radio Button</a> state,
+      then run these further nested substeps:</p>
+
+      <ol><li><p>If the <var title="">field</var> element has a <code title="attr-input-value"><a href="the-input-element.html#attr-input-value">value</a></code> attribute specified, then
+       let <var title="">value</var> be the value of that attribute;
+       otherwise, let <var title="">value</var> be the string
+       "<code title="">on</code>".</p></li>
+
+       <li><p>Append an entry to the <var title="">form data set</var>
+       with <var title="">name</var> as the name, <var title="">value</var> as the value, and <var title="">type</var>
+       as the type.</p></li>
+
+      </ol></li>
+
+     <li><p>Otherwise, if the <var title="">field</var> element is an
+     <code><a href="the-input-element.html#the-input-element">input</a></code> element whose <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute is in the <a href="number-state.html#file-upload-state" title="attr-input-type-file">File Upload</a> state, then for
+     each file <a href="number-state.html#concept-input-type-file-selected" title="concept-input-type-file-selected">selected</a> in the
+     <code><a href="the-input-element.html#the-input-element">input</a></code> element, append an entry to the <var title="">form data set</var> with the <var title="">name</var> as
+     the name, the file (consisting of the name, the type, and the
+     body) as the value, and <var title="">type</var> as the type. If
+     there are no <a href="number-state.html#concept-input-type-file-selected" title="concept-input-type-file-selected">selected files</a>,
+     then append an entry to the <var title="">form data set</var>
+     with the <var title="">name</var> as the name, the empty string
+     as the value, and <code>application/octet-stream</code> as the
+     type.</p></li>
+     
+
+     <li><p>Otherwise, if the <var title="">field</var> element is an
+     <code><a href="the-iframe-element.html#the-object-element">object</a></code> element: try to obtain a form submission
+     value from the <a href="infrastructure.html#plugin">plugin</a>,
+     and if that is successful, append an entry to the <var title="">form data set</var> with <var title="">name</var> as the
+     name, the returned form submission value as the value, and the
+     string "<code title="">object</code>" as the type.</p></li>
+
+     <li><p>Otherwise, append an entry to the <var title="">form data
+     set</var> with <var title="">name</var> as the name, the <a href="#concept-fe-value" title="concept-fe-value">value</a> of the <var title="">field</var> element as the value, and <var title="">type</var> as the type.</p></li>
+
+     <li>
+
+      <p>If the element has a <a href="#form-control-dirname-attribute">form control <code title="">dirname</code> attribute</a>, and that attribute's
+      value is not the empty string, then run these substeps:</p>
+
+      <ol><li><p>Let <var title="">dirname</var> be the value of the
+       element's <code title="">dirname</code> attribute.</p></li>
+
+       <li><p>Let <var title="">dir</var> be the string "<code title="">ltr</code>" if <a href="elements.html#the-directionality">the directionality</a> of the
+       element is '<a href="elements.html#concept-ltr" title="concept-ltr">ltr</a>', and "<code title="">rtl</code>" otherwise (i.e. when <a href="elements.html#the-directionality">the
+       directionality</a> of the element is '<a href="elements.html#concept-rtl" title="concept-rtl">rtl</a>').</p></li>
+
+       <li><p>Append an entry to the <var title="">form data set</var>
+       with <var title="">dirname</var> as the name, <var title="">dir</var> as the value, and the string "<code title="">direction</code>" as the type.</p></li>
+
+      </ol><p class="note">An element can only have a <a href="#form-control-dirname-attribute">form control
+      <code title="">dirname</code> attribute</a> if it is a
+      <code><a href="the-button-element.html#the-textarea-element">textarea</a></code> element or an <code><a href="the-input-element.html#the-input-element">input</a></code> element
+      whose <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute is in
+      either the <a href="states-of-the-type-attribute.html#text-state-and-search-state" title="attr-input-type-text">Text</a> state
+      or the <a href="states-of-the-type-attribute.html#text-state-and-search-state" title="attr-input-type-search">Search</a>
+      state.</p>
+
+     </li>
+
+    </ol></li>
+
+   <li><p><i>End</i>: Return the <var title="">form data
+   step</var>.</p></li>
+
+  </ol><h5 id="url-encoded-form-data"><span class="secno">4.10.22.5 </span>URL-encoded form data</h5>
 
   <p>The <dfn id="application-x-www-form-urlencoded-encoding-algorithm"><code title="">application/x-www-form-urlencoded</code> encoding
   algorithm</dfn> is as follows:</p>
 
-  <ol><!-- the first few steps of this are the same as in the next section --><li><p>Let <var title="">result</var> be the empty string.</p></li>
+  <ol><li><p>Let <var title="">result</var> be the empty string.</p></li>
 
    <li>
 
@@ -1832,9 +1815,7 @@
      with <var title="">charset</var>.</p></li>
 
      <li><p>If the entry's type is "<code title="">file</code>",
-     replace its value with the file's filename only.</p></li> <!--
-     this is not present in the next section -->
-
+     replace its value with the file's filename only.</p></li> 
      <li><p>For each character in the entry's name and value that
      cannot be expressed using the selected character encoding,
      replace the character by a string consisting of a U+0026
@@ -1842,11 +1823,8 @@
      one or more characters in the range U+0030 DIGIT ZERO (0) to
      U+0039 DIGIT NINE (9) representing the Unicode code point of the
      character in base ten, and finally a U+003B SEMICOLON character
-     (;).</p></li><!-- we should say it should be the shortest
-     possible string, no leading zeros. this whole step is asinine,
-     though, so... -->
-
-     <!-- this is where the similarities with the next section end -->
+     (;).</p></li>
+     
 
      <li>
 
@@ -1859,7 +1837,7 @@
        character (+).</dd>
 
 
-       <!-- * - . _ 0-9 a-z A-Z -->
+       
 
        <dt>If the character isn't in the range U+0020, U+002A,
        U+002D, U+002E, U+0030 to U+0039, U+0041 to U+005A, U+005F,
@@ -1925,16 +1903,16 @@
 
   </ol></div><div class="impl">
 
-  <h5 id="multipart-form-data"><span class="secno">4.10.22.5 </span>Multipart form data</h5>
+  <h5 id="multipart-form-data"><span class="secno">4.10.22.6 </span>Multipart form data</h5>
 
-  <!-- http://hixie.ch/tests/adhoc/html/forms/submission/multipart_form-data/ -->
+  
 
-  <!-- NOTE: This algorithm is also used by the XHR spec -->
+  
 
   <p>The <dfn id="multipart-form-data-encoding-algorithm"><code title="">multipart/form-data</code> encoding
   algorithm</dfn> is as follows:</p>
 
-  <ol><!-- the first few steps of this are the same as in the previous section --><li><p>Let <var title="">result</var> be the empty string.</p></li>
+  <ol><li><p>Let <var title="">result</var> be the empty string.</p></li>
 
    <li>
 
@@ -1971,9 +1949,7 @@
     <ol><li><p>If the entry's name is "<code title="attr-fe-name-charset"><a href="#attr-fe-name-charset">_charset_</a></code>" and its type is
      "<code title="">hidden</code>", replace its value with <var title="">charset</var>.</p></li>
 
-     <!-- the step that replaces a file with its name is missing in
-     this version of the algorithm -->
-
+     
      <li><p>For each character in the entry's name and value that
      cannot be expressed using the selected character encoding,
      replace the character by a string consisting of a U+0026
@@ -1981,11 +1957,8 @@
      one or more characters in the range U+0030 DIGIT ZERO (0) to
      U+0039 DIGIT NINE (9) representing the Unicode code point of the
      character in base ten, and finally a U+003B SEMICOLON character
-     (;).</p></li><!-- we should say it should be the shortest
-     possible string, no leading zeros. this whole step is asinine,
-     though, so... -->
-
-     <!-- this is where the similarities with the previous section end -->
+     (;).</p></li>
+     
 
     </ol></li>
 
@@ -2011,11 +1984,16 @@
     not get converted to a 7-bit safe encoding as suggested in RFC
     2388).</p>
 
+    <p>The boundary used by the user agent in generating the return
+    value of this algorithm is the <dfn id="multipart-form-data-boundary-string"><code title="">multipart/form-data</code> boundary string</dfn>. (This
+    value is used to generate the MIME type of the form submission
+    payload generated by this algorithm.)</p>
+
    </li>
 
   </ol></div><div class="impl">
 
-  <h5 id="plain-text-form-data"><span class="secno">4.10.22.6 </span>Plain text form data</h5>
+  <h5 id="plain-text-form-data"><span class="secno">4.10.22.7 </span>Plain text form data</h5>
 
   <p>The <dfn id="text-plain-encoding-algorithm"><code title="">text/plain</code> encoding
   algorithm</dfn> is as follows:</p>
@@ -2024,9 +2002,7 @@
 
    <li>
 
-    <!-- this is different from application/x-www-form-urlencoded in
-    that it isn't limited to ASCII-compatible encodings -->
-
+    
     <p>If the <code><a href="forms.html#the-form-element">form</a></code> element has an <code title="attr-form-accept-charset"><a href="forms.html#attr-form-accept-charset">accept-charset</a></code> attribute,
     then, taking into account the characters found in the <var title="">form data set</var>'s names and values, and the character
     encodings supported by the user agent, select a character encoding
@@ -2075,7 +2051,7 @@
   <a href="webappapis.html#fire-a-simple-event">fire a simple event</a> named <code title="event-reset">reset</code>, that is cancelable, at <var title="">form</var>, and then, if that event is not canceled, must
   invoke the <a href="#concept-form-reset-control" title="concept-form-reset-control">reset
   algorithm</a> of each <a href="forms.html#category-reset" title="category-reset">resettable
-  element</a> whose <a href="#form-owner">form owner</a> is <var title="">form</var>, and <a href="#broadcast-formchange-events">broadcast <code title="event-formchange">formchange</code> events</a> from <var title="">form</var>.</p>
+  element</a> whose <a href="#form-owner">form owner</a> is <var title="">form</var>.</p>
 
   <p>Each <a href="forms.html#category-reset" title="category-reset">resettable element</a>
   defines its own <dfn id="concept-form-reset-control" title="concept-form-reset-control">reset
@@ -2084,22 +2060,4 @@
   e.g., do not cause <code title="event-input">input</code> events to
   fire).</p>
 
-  </div><div class="impl">
-
-  <h4 id="event-dispatch"><span class="secno">4.10.24 </span>Event dispatch</h4>
-
-  <p>When the user agent is to <dfn id="broadcast-forminput-events">broadcast <code title="event-forminput">forminput</code> events</dfn> or
-  <dfn id="broadcast-formchange-events">broadcast <code title="event-formchange">formchange</code>
-  events</dfn> from a <code><a href="forms.html#the-form-element">form</a></code> element <var title="">form</var>, it must run the following steps:</p>
-
-  <ol><li><p>Let <var title="">controls</var> be a list of all the <a href="forms.html#category-reset" title="category-reset">resettable elements</a> whose <a href="#form-owner">form
-   owner</a> is <var title="">form</var>.</p></li>
-
-   <li>If the user agent was to <a href="#broadcast-forminput-events">broadcast <code title="event-forminput">forminput</code> events</a>, let <var title="">event name</var> be <code title="event-forminput">forminput</code>. Otherwise the user agent
-   was to <a href="#broadcast-formchange-events">broadcast <code title="event-formchange">formchange</code> events</a>; let <var title="">event name</var> be <code title="event-formchange">formchange</code>.</li>
-
-   <li><p>For each element in <var title="">controls</var>, in
-   <a href="infrastructure.html#tree-order">tree order</a>, <a href="webappapis.html#fire-a-simple-event">fire a simple event</a> named
-   <var title="">event name</var> at the element.</p></li>
-
-  </ol></div></body></html>
+  </div></body></html>

Index: forms.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/forms.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- forms.html	25 Feb 2011 07:05:28 -0000	1.7
+++ forms.html	30 Apr 2011 11:35:45 -0000	1.8
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>4.10 Forms &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -350,8 +346,8 @@
    <a href="spec.html#contents">Table of contents</a> &#x2013;
    <a href="the-input-element.html" class="next">4.10.7 The input element</a>
   <ol class="toc"><li><ol><li><a href="forms.html#forms"><span class="secno">4.10 </span>Forms</a>
-    <ol><li><a href="forms.html#introduction-0"><span class="secno">4.10.1 </span>Introduction</a>
-      <ol><li><a href="forms.html#writing-a-form-s-user-interface"><span class="secno">4.10.1.1 </span>Writing a form's user interface</a></li><li><a href="forms.html#implementing-the-server-side-processing-for-a-form"><span class="secno">4.10.1.2 </span>Implementing the server-side processing for a form</a></li><li><a href="forms.html#configuring-a-form-to-communicate-with-a-server"><span class="secno">4.10.1.3 </span>Configuring a form to communicate with a server</a></li><li><a href="forms.html#client-side-form-validation"><span class="secno">4.10.1.4 </span>Client-side form validation</a></li></ol></li><li><a href="forms.html#categories"><span class="secno">4.10.2 </span>Categories</a></li><li><a href="forms.html#the-form-element"><span class="secno">4.10.3 </span>The <code>form</code> element</a></li><li><a href="forms.html#the-fieldset-element"><span class="secno">4.10.4 </span>The <code>fieldset</code> element</a></li><li><a href="forms.html#the-legend-element"><span class="secno">4.10.5 </span>The <code>legend</code> element</a></li><li><a href="forms.html#the-label-element"><span class="secno">4.10.6 </span>The <code>label</code> element</a></li></ol></li></ol></li></ol></div><h3 id="forms"><span class="secno">4.10 </span>Forms</h3><h4 id="introduction-0"><span class="secno">4.10.1 </span>Introduction</h4><p><i>This section is non-normative.</i></p><p>A form is a component of a Web page that has form controls, such
+    <ol><li><a href="forms.html#introduction-1"><span class="secno">4.10.1 </span>Introduction</a>
+      <ol><li><a href="forms.html#writing-a-form-s-user-interface"><span class="secno">4.10.1.1 </span>Writing a form's user interface</a></li><li><a href="forms.html#implementing-the-server-side-processing-for-a-form"><span class="secno">4.10.1.2 </span>Implementing the server-side processing for a form</a></li><li><a href="forms.html#configuring-a-form-to-communicate-with-a-server"><span class="secno">4.10.1.3 </span>Configuring a form to communicate with a server</a></li><li><a href="forms.html#client-side-form-validation"><span class="secno">4.10.1.4 </span>Client-side form validation</a></li></ol></li><li><a href="forms.html#categories"><span class="secno">4.10.2 </span>Categories</a></li><li><a href="forms.html#the-form-element"><span class="secno">4.10.3 </span>The <code>form</code> element</a></li><li><a href="forms.html#the-fieldset-element"><span class="secno">4.10.4 </span>The <code>fieldset</code> element</a></li><li><a href="forms.html#the-legend-element"><span class="secno">4.10.5 </span>The <code>legend</code> element</a></li><li><a href="forms.html#the-label-element"><span class="secno">4.10.6 </span>The <code>label</code> element</a></li></ol></li></ol></li></ol></div><h3 id="forms"><span class="secno">4.10 </span>Forms</h3><h4 id="introduction-1"><span class="secno">4.10.1 </span>Introduction</h4><p><i>This section is non-normative.</i></p><p>A form is a component of a Web page that has form controls, such
   as text fields, buttons, checkboxes, range controls, or color
   pickers. A user can interact with such a form, providing data that
   can then be sent to the server for further processing (e.g.
@@ -630,7 +626,7 @@
   the usual ones like <a href="content-models.html#flow-content">flow content</a>, <a href="content-models.html#phrasing-content">phrasing
   content</a>, and <a href="content-models.html#interactive-content">interactive content</a>.</p><p>A number of the elements are <dfn id="form-associated-element" title="form-associated&#10;  element">form-associated elements</dfn>, which means they can have a
   <a href="association-of-controls-and-forms.html#form-owner">form owner</a> and, to expose this, have a <code title="attr-fae-form"><a href="association-of-controls-and-forms.html#attr-fae-form">form</a></code> content attribute with a matching
-  <code title="dom-fae-form"><a href="association-of-controls-and-forms.html#dom-fae-form">form</a></code> IDL attribute.</p><!-- when updating this also update the category index --><ul class="brief category-list"><li><code><a href="the-button-element.html#the-button-element">button</a></code></li>
+  <code title="dom-fae-form"><a href="association-of-controls-and-forms.html#dom-fae-form">form</a></code> IDL attribute.</p><ul class="brief category-list"><li><code><a href="the-button-element.html#the-button-element">button</a></code></li>
    <li><code><a href="#the-fieldset-element">fieldset</a></code></li>
    <li><code><a href="the-input-element.html#the-input-element">input</a></code></li>
    <li><code><a href="the-button-element.html#the-keygen-element">keygen</a></code></li>
@@ -649,7 +645,7 @@
     <p>Denotes elements that are listed in the <code title="dom-form-elements"><a href="#dom-form-elements"><var title="">form</var>.elements</a></code>
     and <code title="dom-fieldset-elements"><a href="#dom-fieldset-elements"><var title="">fieldset</var>.elements</a></code> APIs.</p>
 
-    <!-- when updating this also update the category index -->
+    
     <ul class="brief category-list"><li><code><a href="the-button-element.html#the-button-element">button</a></code></li>
      <li><code><a href="#the-fieldset-element">fieldset</a></code></li>
      <li><code><a href="the-input-element.html#the-input-element">input</a></code></li>
@@ -667,7 +663,7 @@
     <p>Denotes elements that can be associated with <code><a href="#the-label-element">label</a></code>
     elements.</p>
 
-    <!-- when updating this also update the category index -->
+    
     <ul class="brief category-list"><li><code><a href="the-button-element.html#the-button-element">button</a></code></li>
      <li><code><a href="the-input-element.html#the-input-element">input</a></code> (if the <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute is <em>not</em> in the <a href="states-of-the-type-attribute.html#hidden-state" title="attr-input-type-hidden">Hidden</a> state)</li>
      <li><code><a href="the-button-element.html#the-keygen-element">keygen</a></code></li>
@@ -685,7 +681,7 @@
     <p>Denotes elements that can be used for <a href="association-of-controls-and-forms.html#constructing-form-data-set">constructing the form data
     set</a> when a <code><a href="#the-form-element">form</a></code> element is <a href="association-of-controls-and-forms.html#concept-form-submit" title="concept-form-submit">submitted</a>.</p>
 
-    <!-- when updating this also update the category index -->
+    
     <ul class="brief category-list"><li><code><a href="the-button-element.html#the-button-element">button</a></code></li>
      <li><code><a href="the-input-element.html#the-input-element">input</a></code></li>
      <li><code><a href="the-button-element.html#the-keygen-element">keygen</a></code></li>
@@ -701,7 +697,7 @@
     <p>Denotes elements that can be affected when a <code><a href="#the-form-element">form</a></code>
     element is <a href="association-of-controls-and-forms.html#concept-form-reset" title="concept-form-reset">reset</a>.</p>
 
-    <!-- when updating this also update the category index -->
+    
     <ul class="brief category-list"><li><code><a href="the-input-element.html#the-input-element">input</a></code></li>
      <li><code><a href="the-button-element.html#the-keygen-element">keygen</a></code></li>
      <li><code><a href="the-button-element.html#the-output-element">output</a></code></li>
@@ -738,7 +734,7 @@
            attribute DOMString <a href="association-of-controls-and-forms.html#dom-fs-action" title="dom-fs-action">action</a>;
            attribute DOMString <a href="#dom-form-autocomplete" title="dom-form-autocomplete">autocomplete</a>;
            attribute DOMString <a href="association-of-controls-and-forms.html#dom-fs-enctype" title="dom-fs-enctype">enctype</a>;
-           attribute DOMString <a href="association-of-controls-and-forms.html#dom-fs-encoding" title="dom-fs-encoding">encoding</a>;<!-- historical artefact -->
+           attribute DOMString <a href="association-of-controls-and-forms.html#dom-fs-encoding" title="dom-fs-encoding">encoding</a>;
            attribute DOMString <a href="association-of-controls-and-forms.html#dom-fs-method" title="dom-fs-method">method</a>;
            attribute DOMString <a href="#dom-form-name" title="dom-form-name">name</a>;
            attribute boolean <a href="association-of-controls-and-forms.html#dom-fs-novalidate" title="dom-fs-noValidate">noValidate</a>;
@@ -752,9 +748,6 @@
   void <a href="#dom-form-submit" title="dom-form-submit">submit</a>();
   void <a href="#dom-form-reset" title="dom-form-reset">reset</a>();
   boolean <a href="#dom-form-checkvalidity" title="dom-form-checkValidity">checkValidity</a>();
-
-  void <a href="#dom-form-dispatchforminput" title="dom-form-dispatchFormInput">dispatchFormInput</a>();
-  void <a href="#dom-form-dispatchformchange" title="dom-form-dispatchFormChange">dispatchFormChange</a>();
 };</pre>
    </dd>
   </dl><p>The <code><a href="#the-form-element">form</a></code> element <a href="rendering.html#represents">represents</a> a
@@ -857,22 +850,6 @@
 
    </dd>
 
-   <dt><var title="">form</var> . <code title="dom-form-dispatchFormInput"><a href="#dom-form-dispatchforminput">dispatchFormInput</a></code>()</dt>
-
-   <dd>
-
-    <p>Dispatches a <code title="event-forminput">forminput</code> event at all the form controls.</p>
-
-   </dd>
-
-   <dt><var title="">form</var> . <code title="dom-form-dispatchFormChange"><a href="#dom-form-dispatchformchange">dispatchFormChange</a></code>()</dt>
-
-   <dd>
-
-    <p>Dispatches a <code title="event-formchange">formchange</code> event at all the form controls.</p>
-
-   </dd>
-
   </dl><div class="impl">
 
   <p>The <dfn id="dom-form-autocomplete" title="dom-form-autocomplete"><code>autocomplete</code></dfn> IDL
@@ -947,28 +924,7 @@
   names map</a> is removed from the <code><a href="infrastructure.html#document">Document</a></code>, then its
   entries must be removed from the map.</p>
 
-  <!--
-    This ridiculous setup is intended to do as much of the right thing
-    while still supporting code written to work in IE7. IE versions
-    prior to IE8 do not update the names on the <form> element
-    collection to match new names when elements are renamed, and there
-    are enough pages that rename elements and then access them by
-    their old name that we have to support this.
-
-    But we still want to expose them using the new names, so as far as
-    possible we pretend the legacy names aren't there except if
-    there's no other element actually named that way.
-
-    Removing the element did remove the legacy name in IE7:
-    http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C!DOCTYPE%20html%3E...%3Cform%20action%3D%22%2F%22%3E%3Cinput%20name%3Dsubmit%3E%3C%2Fform%3E%0A%3Cscript%3E%0A%20w(document.forms%5B0%5D.submit)%3B%0A%20w(document.forms%5B0%5D.removeChild(document.getElementsByTagName('input')%5B0%5D))%3B%0A%20w(document.forms%5B0%5D.length)%3B%0A%20try%20%7B%20document.forms%5B0%5D.submit()%3B%20%7D%20catch%20(e)%20%20%7B%20w(e.message)%20%7D%0A%3C%2Fscript%3E
-
-    There's no interop on what happens when the name was originally a
-    duplicate name, so we don't persist such accesses - at the time
-    of writing, Safari returned the first element, Firefox returned
-    null (as we do), and IE7 returned the original collection:
-    http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C!DOCTYPE%20html%3E...%3Cform%20action%3D%22%2F%22%3E%3Cinput%20name%3Da%20id%3Dfirst%3E%3Cinput%20name%3Da%20id%3Dsecond%3E%3C%2Fform%3E%0A%3Cscript%3E%0A%20w%28document.forms[0].a%29%3B%0A%20document.getElementsByTagName%28%27input%27%29[0].name%20%3D%20%27b%27%3B%0A%20document.getElementsByTagName%28%27input%27%29[1].name%20%3D%20%27b%27%3B%0A%20w%28document.forms[0].length%29%3B%0A%20w%28document.forms[0].a.id%29%3B%0A%3C%2Fscript%3E
-  -->
-
+  
   <hr/><p>The <dfn id="dom-form-submit" title="dom-form-submit"><code>submit()</code></dfn>
   method, when invoked, must <a href="association-of-controls-and-forms.html#concept-form-submit" title="concept-form-submit">submit</a> the <code><a href="#the-form-element">form</a></code>
   element from the <code><a href="#the-form-element">form</a></code> element itself, with the <var title="">scripted-submit</var> flag set.</p>
@@ -994,14 +950,6 @@
   if the constraint validation return a <i>positive</i> result, and
   false if it returned a <i>negative</i> result.</p>
 
-  <p>If the <dfn id="dom-form-dispatchforminput" title="dom-form-dispatchFormInput"><code>dispatchFormInput()</code></dfn>
-  method is invoked, the user agent must <a href="association-of-controls-and-forms.html#broadcast-forminput-events">broadcast <code title="event-forminput">forminput</code> events</a> from the
-  <code><a href="#the-form-element">form</a></code> element.</p>
-
-  <p>If the <dfn id="dom-form-dispatchformchange" title="dom-form-dispatchFormChange"><code>dispatchFormChange()</code></dfn>
-  method is invoked, the user agent must <a href="association-of-controls-and-forms.html#broadcast-formchange-events">broadcast <code title="event-formchange">formchange</code> events</a> from the
-  <code><a href="#the-form-element">form</a></code> element.</p>
-
   </div><div class="example">
 
    <p>This example shows two search forms:</p>
@@ -1236,11 +1184,7 @@
   might be, if anything, should match the platform's label
   behavior.</p>
 
-  <!-- activation behaviour need not be dependent on whether the
-  labeled control is being rendered:
-   http://software.hixie.ch/utilities/js/live-dom-viewer/saved/371
-  -->
-
+  
   <div class="example">
 
    <p>For example, on platforms where clicking a checkbox label checks

Index: interactive-elements.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/interactive-elements.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- interactive-elements.html	25 Feb 2011 07:05:29 -0000	1.7
+++ interactive-elements.html	30 Apr 2011 11:35:45 -0000	1.8
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>4.11 Interactive elements &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -465,7 +461,7 @@
    <dd><code title="attr-command-disabled"><a href="#attr-command-disabled">disabled</a></code></dd>
    <dd><code title="attr-command-checked"><a href="#attr-command-checked">checked</a></code></dd>
    <dd><code title="attr-command-radiogroup"><a href="#attr-command-radiogroup">radiogroup</a></code></dd>
-   <!--<dd><code title="attr-command-default">default</code></dd>-->
+   
    <dd>Also, the <code title="attr-command-title"><a href="#attr-command-title">title</a></code> attribute has special semantics on this element.</dd>
    <dt>DOM interface:</dt>
    <dd>
@@ -475,16 +471,12 @@
            attribute DOMString <a href="#dom-command-icon" title="dom-command-icon">icon</a>;
            attribute boolean <a href="#dom-command-disabled" title="dom-command-disabled">disabled</a>;
            attribute boolean <a href="#dom-command-checked" title="dom-command-checked">checked</a>;
-           attribute DOMString <a href="#dom-command-radiogroup" title="dom-command-radiogroup">radiogroup</a>;<!--
-           attribute boolean <span title="dom-command-default">default</span>;-->
-};</pre>
+           attribute DOMString <a href="#dom-command-radiogroup" title="dom-command-radiogroup">radiogroup</a>;};</pre>
    </dd>
   </dl><p>The <code><a href="#the-command">command</a></code> element represents a command that the user
   can invoke.</p><p>A command can be part of a context menu or toolbar, using the
   <code><a href="#menus">menu</a></code> element, or can be put anywhere else in the page,
-  to define a keyboard shortcut.</p><!-- in the future we'll also add
-  a command="" attribute to refer to a command, which can then be
-  defined anywhere --><p>The <dfn id="attr-command-type" title="attr-command-type"><code>type</code></dfn>
+  to define a keyboard shortcut.</p><p>The <dfn id="attr-command-type" title="attr-command-type"><code>type</code></dfn>
   attribute indicates the kind of command: either a normal command
   with an associated action, or a state or option that can be toggled,
   or a selection of one item from a list of items.</p><p>The attribute is an <a href="common-microsyntaxes.html#enumerated-attribute">enumerated attribute</a> with three
@@ -518,9 +510,7 @@
   spaces</a>. <span class="impl">To obtain the <a href="urls.html#absolute-url">absolute
   URL</a> of the icon when the attribute's value is not the empty
   string, the attribute's value must be <a href="urls.html#resolve-a-url" title="resolve a&#10;  url">resolved</a> relative to the element. When the attribute is
-  absent, or its value is the empty string, or <a href="urls.html#resolve-a-url" title="resolve a&#10;  url">resolving</a> its value fails, there is no icon.</span></p><!-- this is affected by the base URL being changed, so users of
-  this should cache the image once they've fetched it once, at least
-  until the relative url changes again --><p>The <dfn id="attr-command-disabled" title="attr-command-disabled"><code>disabled</code></dfn> attribute
+  absent, or its value is the empty string, or <a href="urls.html#resolve-a-url" title="resolve a&#10;  url">resolving</a> its value fails, there is no icon.</span></p><p>The <dfn id="attr-command-disabled" title="attr-command-disabled"><code>disabled</code></dfn> attribute
   is a <a href="common-microsyntaxes.html#boolean-attribute">boolean attribute</a> that, if present, indicates that
   the command is not available in the current state.</p><p class="note">The distinction between <code title="attr-command-disabled"><a href="#attr-command-disabled">disabled</a></code> and <code title="attr-hidden"><a href="editing.html#the-hidden-attribute">hidden</a></code> is subtle. A command would be
   disabled if, in the same context, it could be enabled if only
@@ -538,37 +528,13 @@
   state.</p><p>The <dfn id="attr-command-radiogroup" title="attr-command-radiogroup"><code>radiogroup</code></dfn>
   attribute gives the name of the group of commands that will be
   toggled when the command itself is toggled, for commands whose <code title="attr-command-type"><a href="#attr-command-type">type</a></code> attribute has the value "<code title="">radio</code>". The scope of the name is the child list of
-  the parent element. The attribute must be omitted unless the <code title="attr-command-type"><a href="#attr-command-type">type</a></code> attribute is in the <a href="#attr-command-type-state-radio" title="attr-command-type-state-radio">Radio</a> state.</p><!--
-  <p>If the <code>command</code> element is used when <span
-  title="menu generation">generating</span> a <span>context
-  menu</span>, then the <dfn
-  title="attr-command-default"><code>default</code></dfn> attribute
-  indicates, if present, that the command is the one that would have
-  been invoked if the user had directly activated the menu's subject
-  instead of using its context menu. The <code
-  title="attr-command-default">default</code> attribute is a
-  <span>boolean attribute</span>. The attribute must be omitted unless
-  the <code title="attr-command-type">type</code> attribute is in the
-  <span title="attr-command-type-state-command">Command</span>
-  state.</p>
-
-  <div class="example">
-
-   ...an example that shows an element that, if double-clicked,
-   invokes an action, but that also has a context menu, showing the
-   various <code>command</code> attributes off, and that has a default
-   command...
-
-  </div>
---><div class="impl">
+  the parent element. The attribute must be omitted unless the <code title="attr-command-type"><a href="#attr-command-type">type</a></code> attribute is in the <a href="#attr-command-type-state-radio" title="attr-command-type-state-radio">Radio</a> state.</p><div class="impl">
 
   <p>The <dfn id="dom-command-type" title="dom-command-type"><code>type</code></dfn> IDL
   attribute must <a href="common-dom-interfaces.html#reflect">reflect</a> the content attribute of the
   same name, <a href="common-dom-interfaces.html#limited-to-only-known-values">limited to only known values</a>.</p>
 
-  <p>The <dfn id="dom-command-label" title="dom-command-label"><code>label</code></dfn>, <dfn id="dom-command-icon" title="dom-command-icon"><code>icon</code></dfn>, <dfn id="dom-command-disabled" title="dom-command-disabled"><code>disabled</code></dfn>, <dfn id="dom-command-checked" title="dom-command-checked"><code>checked</code></dfn>, and <dfn id="dom-command-radiogroup" title="dom-command-radiogroup"><code>radiogroup</code></dfn><!--,
-  and <dfn title="dom-command-default"><code>default</code></dfn>-->
-  IDL attributes must <a href="common-dom-interfaces.html#reflect">reflect</a> the respective content
+  <p>The <dfn id="dom-command-label" title="dom-command-label"><code>label</code></dfn>, <dfn id="dom-command-icon" title="dom-command-icon"><code>icon</code></dfn>, <dfn id="dom-command-disabled" title="dom-command-disabled"><code>disabled</code></dfn>, <dfn id="dom-command-checked" title="dom-command-checked"><code>checked</code></dfn>, and <dfn id="dom-command-radiogroup" title="dom-command-radiogroup"><code>radiogroup</code></dfn>  IDL attributes must <a href="common-dom-interfaces.html#reflect">reflect</a> the respective content
   attributes of the same name.</p>
 
   <p>The element's <a href="content-models.html#activation-behavior">activation behavior</a> depends on the
@@ -608,12 +574,7 @@
   </dl><p class="note">Firing a synthetic <code title="event-click"><a href="infrastructure.html#event-click">click</a></code> event at the element does not cause
   any of the actions described above to happen.</p>
 
-  <!-- v2COMMAND: the command="" attribute to make a <command> element
-  reflect the state of another command, so that the script can update
-  one place in the page and have context menus, toolbars, shortcuts,
-  etc, automatically update. Once we add this, expose the Triggers
-  facet again. -->
-
+  
   </div><p class="note"><code><a href="#the-command">command</a></code> elements are not rendered
   unless they <a href="#menus" title="menu">form part of a menu</a>.</p><div class="example">
 
@@ -653,7 +614,7 @@
            attribute DOMString <a href="#dom-menu-type" title="dom-menu-type">type</a>;
            attribute DOMString <a href="#dom-menu-label" title="dom-menu-label">label</a>;
 };</pre>
-  </dd></dl><p>The <code><a href="#menus">menu</a></code> element represents a list of commands.</p><!-- v2 idea: <menu> should get an icon, like <command> --><p>The <dfn id="attr-menu-type" title="attr-menu-type"><code>type</code></dfn> attribute
+  </dd></dl><p>The <code><a href="#menus">menu</a></code> element represents a list of commands.</p><p>The <dfn id="attr-menu-type" title="attr-menu-type"><code>type</code></dfn> attribute
   is an <a href="common-microsyntaxes.html#enumerated-attribute">enumerated attribute</a> indicating the kind of menu
   being declared. The attribute has three states. The <code title="attr-menu-type-context">context</code> keyword maps to the
   <dfn id="context-menu-state" title="context menu state">context menu</dfn> state, in which
@@ -715,9 +676,7 @@
  &lt;menu type="toolbar"&gt;
   &lt;label for="goto"&gt;Go to...&lt;/label&gt;
   &lt;menu label="Go"&gt;
-   &lt;select id="goto"<!--
-           onchange="if (this.options[this.selectedIndex].value)
-                     window.location = this.options[this.selectedIndex].value"-->&gt;
+   &lt;select id="goto"&gt;
     &lt;option value="" selected="selected"&gt; Select site: &lt;/option&gt;
     &lt;option value="http://www.apple.com/"&gt; Apple &lt;/option&gt;
     &lt;option value="http://www.mozilla.org/"&gt; Mozilla &lt;/option&gt;
@@ -748,18 +707,7 @@
 
   <dl class="switch"><dt>An element that <a href="commands.html#concept-command" title="concept-command">defines a command</a></dt>
 
-   <dd>Append the command to the menu, respecting its <a href="commands.html#concept-facet" title="concept-facet">facets</a><!-- we might need to be
-   explicit about what this means for each facet, if testing shows
-   this isn't well-implemented. e.g.: If there's an Icon facet for the
-   command, it should be <span title="fetch">fetched</span> (this
-   would be http-origin privacy-sensitive), and then that image should
-   be associated with the command, such that each command only has its
-   image fetched once, to prevent changes to the base URL from having
-   effects after the image has been fetched once. (no need to resolve
-   the Icon facet, it's an absolute URL) -->. <!--If the element is a
-   <code>command</code> element with a <code
-   title="attr-command-default">default</code> attribute, mark the
-   command as being a default command.--></dd>
+   <dd>Append the command to the menu, respecting its <a href="commands.html#concept-facet" title="concept-facet">facets</a>. </dd>
 
 
    <dt>An <code><a href="grouping-content.html#the-hr-element">hr</a></code> element</dt>
@@ -784,7 +732,7 @@
    of the <code><a href="#menus">menu</a></code> or <code><a href="the-button-element.html#the-select-element">select</a></code> element, then
    append another separator.</dd>
 
-   <!-- v2: we might want to support <select> in <label> as giving a named submenu -->
+   
 
 
    <dt>A <code><a href="#menus">menu</a></code> element with a <code title="attr-menu-label"><a href="#attr-menu-label">label</a></code> attribute</dt>
@@ -859,7 +807,7 @@
   event</a> named <code title="event-show">show</code> at the
   <code><a href="#menus">menu</a></code> element of the context menu of the nearest
   ancestor (including the element itself) with one assigned.</p>
-  <!-- v2: include modifier key information -->
+  
 
   <p>The default action of <em>this</em> event is that the user agent
   must show a context menu <a href="#building-menus-and-toolbars" title="building menus and&#10;  toolbars">built</a> from the <code><a href="#menus">menu</a></code> element.</p>

Index: editing.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/editing.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- editing.html	25 Feb 2011 07:05:27 -0000	1.8
+++ editing.html	30 Apr 2011 11:35:45 -0000	1.9
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>7 User interaction &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -352,7 +348,7 @@
   <ol class="toc"><li><a href="editing.html#editing"><span class="secno">7 </span>User interaction</a>
   <ol><li><a href="editing.html#the-hidden-attribute"><span class="secno">7.1 </span>The <code>hidden</code> attribute</a></li><li><a href="editing.html#activation"><span class="secno">7.2 </span>Activation</a></li><li><a href="editing.html#focus"><span class="secno">7.3 </span>Focus</a>
     <ol><li><a href="editing.html#sequential-focus-navigation-and-the-tabindex-attribute"><span class="secno">7.3.1 </span>Sequential focus navigation and the <code title="attr-tabindex">tabindex</code> attribute</a></li><li><a href="editing.html#focus-management"><span class="secno">7.3.2 </span>Focus management</a></li><li><a href="editing.html#document-level-focus-apis"><span class="secno">7.3.3 </span>Document-level focus APIs</a></li><li><a href="editing.html#element-level-focus-apis"><span class="secno">7.3.4 </span>Element-level focus APIs</a></li></ol></li><li><a href="editing.html#assigning-keyboard-shortcuts"><span class="secno">7.4 </span>Assigning keyboard shortcuts</a>
-    <ol><li><a href="editing.html#introduction-5"><span class="secno">7.4.1 </span>Introduction</a></li><li><a href="editing.html#the-accesskey-attribute"><span class="secno">7.4.2 </span>The <code>accesskey</code> attribute</a></li><li><a href="editing.html#processing-model-3"><span class="secno">7.4.3 </span>Processing model</a></li></ol></li><li><a href="editing.html#contenteditable"><span class="secno">7.5 </span>The <code title="attr-contenteditable">contenteditable</code> attribute</a>
+    <ol><li><a href="editing.html#introduction-6"><span class="secno">7.4.1 </span>Introduction</a></li><li><a href="editing.html#the-accesskey-attribute"><span class="secno">7.4.2 </span>The <code>accesskey</code> attribute</a></li><li><a href="editing.html#processing-model-3"><span class="secno">7.4.3 </span>Processing model</a></li></ol></li><li><a href="editing.html#contenteditable"><span class="secno">7.5 </span>The <code title="attr-contenteditable">contenteditable</code> attribute</a>
     <ol><li><a href="editing.html#user-editing-actions"><span class="secno">7.5.1 </span>User editing actions</a></li><li><a href="editing.html#making-entire-documents-editable"><span class="secno">7.5.2 </span>Making entire documents editable</a></li></ol></li><li><a href="editing.html#spelling-and-grammar-checking"><span class="secno">7.6 </span>Spelling and grammar checking</a></li></ol></li></ol></div><h2 id="editing"><span class="secno">7 </span><dfn>User interaction</dfn></h2><h3 id="the-hidden-attribute"><span class="secno">7.1 </span>The <dfn title="attr-hidden"><code>hidden</code></dfn> attribute</h3><p>All <a href="infrastructure.html#html-elements">HTML elements</a> may have the <code title="attr-hidden"><a href="#the-hidden-attribute">hidden</a></code> content attribute set. The <code title="attr-hidden"><a href="#the-hidden-attribute">hidden</a></code> attribute is a <a href="common-microsyntaxes.html#boolean-attribute">boolean
   attribute</a>. When specified on an element, it indicates that
   the element is not yet, or is no longer, relevant. <span class="impl">User agents should not render elements that have the
@@ -389,7 +385,7 @@
   controls in one big page with a scrollbar. It is similarly incorrect
   to use this attribute to hide content just from one presentation
   &#x2014; if something is marked <code title="attr-hidden"><a href="#the-hidden-attribute">hidden</a></code>, it is hidden from all
-  presentations, including, for instance, screen readers.</p><!-- for example, "<a hidden href=#content>Skip to content</a>" would be inappropriate. --><!-- (but only add that example if you first add some more good valid examples --><p>Elements that are not <code title="attr-hidden"><a href="#the-hidden-attribute">hidden</a></code>
+  presentations, including, for instance, screen readers.</p><p>Elements that are not <code title="attr-hidden"><a href="#the-hidden-attribute">hidden</a></code>
   should not link to or refer to elements that are <code title="attr-hidden"><a href="#the-hidden-attribute">hidden</a></code>.</p><div class="example">
 
    <p>For example, it would be incorrect to use the <code title="attr-hyperlink-href"><a href="links.html#attr-hyperlink-href">href</a></code> attribute to link to a
@@ -412,11 +408,7 @@
   attribute must <a href="common-dom-interfaces.html#reflect">reflect</a> the content attribute of the
   same name.</p>
 
-  </div><h3 id="activation"><span class="secno">7.2 </span>Activation</h3><!-- v2 idea: HTMLImageElement.click(x, y); or clickPoint(), if
-       click() can't be done in IE; can this be emulated in IE by
-       posting a synthetic mouse click event with those X and Y
-       coords? (ack Csaba Gabor)
-  --><dl class="domintro"><dt><var title="">element</var> . <code title="dom-click"><a href="#dom-click">click</a></code>()</dt>
+  </div><h3 id="activation"><span class="secno">7.2 </span>Activation</h3><dl class="domintro"><dt><var title="">element</var> . <code title="dom-click"><a href="#dom-click">click</a></code>()</dt>
 
    <dd>
 
@@ -446,15 +438,7 @@
    <li><p>Set the <var title="">click in progress</var> flag on the
    element to false.</p></li>
 
-  </ol></div><h3 id="focus"><span class="secno">7.3 </span>Focus</h3><!-- http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C!DOCTYPE%20html%3E%20%0A...%3Cform%3E%3Cinput%20name%3Da%20onfocus%3D%22value%2B%3D1%3Bd.name%3D%27a%27%3Bname%3D%27d%27%3Bb.focus()%22%3E%0A%3Cinput%20name%3Db%20onfocus%3D%22value%2B%3D1%3Bc.focus()%22%3E%0A%3Cinput%20name%3Dc%20onfocus%3D%22value%2B%3D1%3Bd.focus()%22%3E%0A%3Cinput%20name%3Dd%20onfocus%3D%22value%2B%3D1%3Ba.focus()%22%3E --><!-- http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C!DOCTYPE%20html%3E%0A...%3Cform%3E%0A%3Ctextarea%20name%3Dt%20cols%3D100%20rows%3D3%3E%3C%2Ftextarea%3E%3Cp%3E%0A%3Cinput%20name%3Da%20onfocus%3D%22t.value%2B%3D%27af1%20%27%3Bb.focus()%3Balert(document.activeElement.name)%3Bt.value%2B%3D%27af2%20%27%3B%22%20onblur%3D%22t.value%2B%3D%27ab%20%27%3B%22%3E%0A%3Cinput%20name%3Db%20onfocus%3D%22t.value%2B%3D%27bf1%20%27%3Bc.focus()%3Bt.value%2B%3D%27bf2%20%27%3B%22%20onblur%3D%22t.value%2B%3D%27bb%20%27%3B%22%3E%0A%3Cinput%20name%3Dc%20onfocus%3D%22t.value%2B%3D%27cf1%20%27%3Bc.focus()%3Bt.value%2B%3D%27cf2%20%27%3B%22%20onblur%3D%22t.value%2B%3D%27cb%20%27%3B%22%3E%0A --><!-- http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C!DOCTYPE%20html%3E%3Cbody%20onload%3D%22document.forms%5B0%5D.a.focus()%22%3E%0A...%3Cform%3E%0A%3Ctextarea%20name%3Dt%20cols%3D100%20rows%3D3%3E%3C%2Ftextarea%3E%3Cp%3E%0A%3Cinput%20name%3Da%20onblur%3D%22t.value%2B%3D'ab%20'%3B%20b.focus()%3B%22%3E%0A%3Cinput%20name%3Db%20onfocus%3D%22t.value%2B%3D'bf1%20'%3Ba.focus()%3Bt.value%2B%3D'bf2%20'%3B%22%20onblur%3D%22t.value%2B%3D'bb%20'%3B%22%3E --><!-- http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C!DOCTYPE%20html%3E%3Cbody%3E...%3Cform%3E%0A%3Ctextarea%20name%3Dt%20cols%3D100%20rows%3D3%3E%3C%2Ftextarea%3E%3Cp%3E%0A%3Cinput%20name%3Da%20onfocus%3D%22t.value%2B%3D%27af%20%27%3B%22%20onblur%3D%22t.value%2B%3D%27ab1%20%27%3Bb.focus()%3Bt.value%2B%3D%27ab2%20%27%3B%22%3E%0A%3Cinput%20name%3Db%20onfocus%3D%22t.value%2B%3D%27bf1%20%27%3Ba.focus()%3Bt.value%2B%3D%27bf2%20%27%3B%22%20onblur%3D%22t.value%2B%3D%27bb%20%27%3B%22%3E --><!-- v2: more things to define, if no other specs define them:
-   - define onfocus/onblur behaviour for Window
-   - Other things to look at are IE's focus APIs (HTMLElement.setActive(),
-     onBeforeActivate, onActivate, onBeforeDeactivate, onDeactivate):
-       https://bugzilla.mozilla.org/show_bug.cgi?id=296471
-       https://bugzilla.mozilla.org/show_bug.cgi?id=296469
-       http://msdn.microsoft.com/workshop/author/dhtml/reference/methods/setactive.asp
-       http://msdn.microsoft.com/workshop/author/dhtml/reference/events/onbeforeactivate.asp
-  --><div class="impl">
+  </ol></div><h3 id="focus"><span class="secno">7.3 </span>Focus</h3><div class="impl">
 
   <p>When an element is <i>focused</i>, key events received by the
   document must be targeted at that element. There may be no element
@@ -631,7 +615,7 @@
   <ol><li><p>If the element is not <a href="infrastructure.html#in-a-document" title="in a Document">in a
    <code>Document</code></a>, or if the element's
    <code><a href="infrastructure.html#document">Document</a></code> has no <a href="browsers.html#browsing-context">browsing context</a>, or if
-   the element's <code><a href="infrastructure.html#document">Document</a></code>' <a href="browsers.html#browsing-context">browsing context</a>
+   the element's <code><a href="infrastructure.html#document">Document</a></code>'s <a href="browsers.html#browsing-context">browsing context</a>
    has no <a href="browsers.html#top-level-browsing-context">top-level browsing context</a>, then abort these
    steps.</p>
 
@@ -663,7 +647,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
@@ -676,14 +660,12 @@
    element, and the element does not have a defined <a href="content-models.html#activation-behavior">activation
    behavior</a>, and the user has changed the element's <a href="association-of-controls-and-forms.html#concept-fe-value" title="concept-fe-value">value</a> or its list of <a href="number-state.html#concept-input-type-file-selected" title="concept-input-type-file-selected">selected files</a>
    while the control was focused without committing that change, then
-   <a href="webappapis.html#fire-a-simple-event">fire a simple event</a> that bubbles named <code title="event-change">change</code> at the element, then
-   <a href="association-of-controls-and-forms.html#broadcast-formchange-events">broadcast <code title="event-formchange">formchange</code>
-   events</a> at the element's <a href="association-of-controls-and-forms.html#form-owner">form owner</a>.</p>
+   <a href="webappapis.html#fire-a-simple-event">fire a simple event</a> that bubbles named <code title="event-change">change</code> at the element.</p>
 
    </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
@@ -829,7 +811,7 @@
   unusable by keyboard users. Ignoring calls to this method would thus
   allow keyboard users to interact with the page.</p>
 
-  </div><h3 id="assigning-keyboard-shortcuts"><span class="secno">7.4 </span>Assigning keyboard shortcuts</h3><h4 id="introduction-5"><span class="secno">7.4.1 </span>Introduction</h4><p><i>This section is non-normative.</i></p><p>Each element that can be activated or focused can be assigned a
+  </div><h3 id="assigning-keyboard-shortcuts"><span class="secno">7.4 </span>Assigning keyboard shortcuts</h3><h4 id="introduction-6"><span class="secno">7.4.1 </span>Introduction</h4><p><i>This section is non-normative.</i></p><p>Each element that can be activated or focused can be assigned a
   single key combination to activate it, using the <code title="attr-accesskey"><a href="#the-accesskey-attribute">accesskey</a></code> attribute.</p><p>The exact shortcut is determined by the user agent, based on
   information about the user's keyboard, what keyboard shortcuts
   already exist on the platform, and what other shortcuts have been
@@ -1062,9 +1044,7 @@
   <p class="note">How the caret and selection are represented depends
   entirely on the UA.</p>
 
-  <!-- v2: would be useful to have a way to mark an element as
-  unremovable. -->
-
+  
   </div><div class="impl">
 
   <h4 id="user-editing-actions"><span class="secno">7.5.1 </span>User editing actions</h4>
@@ -1388,13 +1368,13 @@
   grammar-checking enabled, the UA must use the following
   algorithm:</p>
 
-  <ol><!-- user override --><li>If the user has disabled the checking for this text, then the
+  <ol><li>If the user has disabled the checking for this text, then the
    checking is disabled.</li>
 
    <li>Otherwise, if the user has forced the checking for this text to
    always be enabled, then the checking is enabled.</li>
 
-   <!-- content attribute: on, off -->
+   
 
    <li>Otherwise, if the element with which the text is associated has
    a <code title="attr-spellcheck"><a href="#attr-spellcheck">spellcheck</a></code> content
@@ -1402,7 +1382,7 @@
    then checking is enabled; otherwise, if that attribute is in the
    <i>false</i> state, then checking is disabled.</li>
 
-   <!-- inherit, if there is one to inherit from -->
+   
 
    <li>Otherwise, if there is an ancestor element with a <code title="attr-spellcheck"><a href="#attr-spellcheck">spellcheck</a></code> content attribute that is
    not in the <i>default</i> state, then: if the nearest such
@@ -1410,7 +1390,7 @@
    attribute is in the <i>true</i> state, then checking is enabled;
    otherwise, checking is disabled.</li>
 
-   <!-- default -->
+   
 
    <li>Otherwise, if the element's <a href="#concept-spellcheck-default" title="concept-spellcheck-default">default behavior</a> is <a href="#concept-spellcheck-default-true" title="concept-spellcheck-default-true">true-by-default</a>,
    then checking is enabled.</li>
@@ -1418,7 +1398,7 @@
    <li>Otherwise, if the element's <a href="#concept-spellcheck-default" title="concept-spellcheck-default">default behavior</a> is <a href="#concept-spellcheck-default-false" title="concept-spellcheck-default-false">false-by-default</a>,
    then checking is disabled.</li>
 
-   <!-- default inheritance -->
+   
 
    <li>Otherwise, if the element's parent element has <em>its</em>
    checking enabled, then checking is enabled.</li>

Index: video.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/video.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- video.html	25 Feb 2011 07:05:31 -0000	1.9
+++ video.html	30 Apr 2011 11:35:46 -0000	1.10
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>4.8.6 The video element &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -350,8 +346,10 @@
    <a href="spec.html#contents">Table of contents</a> &#x2013;
[...3125 lines suppressed...]
 
-  <h5 id="best-practices-for-implementors-of-media-elements"><span class="secno">4.8.10.16 </span>Best practices for implementors of media elements</h5>
+  <h5 id="best-practices-for-implementors-of-media-elements"><span class="secno">4.8.10.18 </span>Best practices for implementors of media elements</h5>
 
   <p><i>This section is non-normative.</i></p>
 
@@ -4880,6 +5979,13 @@
   buffer everything and allow the user to seek through the earlier
   material, pause it, play it forwards and backwards, etc.</p>
 
+  <p>When multiple tracks are synchronised with a
+  <code><a href="#mediacontroller">MediaController</a></code>, it is possible for scripts to add and
+  remove media elements from the <code><a href="#mediacontroller">MediaController</a></code>'s list
+  of <a href="#slaved-media-elements">slaved media elements</a>, even while these tracks are
+  playing. How smoothly the media plays back in such situations is
+  another quality-of-implementation issue.</p>
+
   <hr/><p>When a <a href="#media-element">media element</a> that is paused is <a href="infrastructure.html#remove-an-element-from-a-document" title="remove an element from a document">removed from a
   document</a> and not reinserted before the next time the
   <a href="webappapis.html#event-loop">event loop</a> spins, implementations that are resource

Index: browsers.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/browsers.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- browsers.html	25 Feb 2011 07:05:27 -0000	1.8
+++ browsers.html	30 Apr 2011 11:35:43 -0000	1.9
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>5 Loading Web pages &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -781,13 +777,13 @@
 
    </li>
 
-  </ol></div><h3 id="the-window-object"><span class="secno">5.2 </span>The <code><a href="#window">Window</a></code> object</h3><pre class="idl">[ReplaceableNamedProperties] <!-- XXX http://www.w3.org/Bugs/Public/show_bug.cgi?id=8241 -->
+  </ol></div><h3 id="the-window-object"><span class="secno">5.2 </span>The <code><a href="#window">Window</a></code> object</h3><pre class="idl">[ReplaceableNamedProperties] 
 interface <dfn id="window">Window</dfn> {
   // the current browsing context
   readonly attribute <a href="#windowproxy">WindowProxy</a> <a href="#dom-window" title="dom-window">window</a>;
   readonly attribute <a href="#windowproxy">WindowProxy</a> <a href="#dom-self" title="dom-self">self</a>;
   readonly attribute <a href="infrastructure.html#document">Document</a> <a href="#dom-document" title="dom-document">document</a>;
-           attribute DOMString <a href="#dom-name" title="dom-name">name</a>; <!-- not [Replaceable] per WebKit and IE8 -->
+           attribute DOMString <a href="#dom-name" title="dom-name">name</a>; 
   [PutForwards=<a href="history.html#dom-location-href" title="dom-location-href">href</a>] readonly attribute <a href="history.html#location">Location</a> <a href="history.html#dom-location" title="dom-location">location</a>;
   readonly attribute <a href="history.html#history-0">History</a> <a href="history.html#dom-history" title="dom-history">history</a>;
   [Replaceable] readonly attribute <a href="#barprop">BarProp</a> <a href="#dom-window-locationbar" title="dom-window-locationbar">locationbar</a>;
@@ -795,9 +791,7 @@
   [Replaceable] readonly attribute <a href="#barprop">BarProp</a> <a href="#dom-window-personalbar" title="dom-window-personalbar">personalbar</a>;
   [Replaceable] readonly attribute <a href="#barprop">BarProp</a> <a href="#dom-window-scrollbars" title="dom-window-scrollbars">scrollbars</a>;
   [Replaceable] readonly attribute <a href="#barprop">BarProp</a> <a href="#dom-window-statusbar" title="dom-window-statusbar">statusbar</a>;
-  [Replaceable] readonly attribute <a href="#barprop">BarProp</a> <a href="#dom-window-toolbar" title="dom-window-toolbar">toolbar</a>;<!--
-  [Replaceable] readonly attribute <span>BarProp</span> <span title="dom-window-directories">directories</span>; // legacy (Gecko-only) -->
-  void <a href="#dom-window-close" title="dom-window-close">close</a>();
+  [Replaceable] readonly attribute <a href="#barprop">BarProp</a> <a href="#dom-window-toolbar" title="dom-window-toolbar">toolbar</a>;  void <a href="#dom-window-close" title="dom-window-close">close</a>();
   void <a href="#dom-window-stop" title="dom-window-stop">stop</a>();
   void <a href="editing.html#dom-window-focus" title="dom-window-focus">focus</a>();
   void <a href="editing.html#dom-window-blur" title="dom-window-blur">blur</a>();
@@ -814,7 +808,7 @@
   <a href="#dom-window-nameditem" title="dom-window-namedItem">getter</a> any (in DOMString name);
 
   // the user agent
-  readonly attribute <a href="timers.html#navigator">Navigator</a> <a href="timers.html#dom-navigator" title="dom-navigator">navigator</a>; <!-- IE also has window.clientInformation === window.navigator -->
+  readonly attribute <a href="timers.html#navigator">Navigator</a> <a href="timers.html#dom-navigator" title="dom-navigator">navigator</a>; 
   readonly attribute <a href="offline.html#applicationcache">ApplicationCache</a> <a href="offline.html#dom-applicationcache" title="dom-applicationCache">applicationCache</a>;
 
   // user prompts
@@ -822,7 +816,7 @@
   boolean <a href="timers.html#dom-confirm" title="dom-confirm">confirm</a>(in DOMString message);
   DOMString <a href="timers.html#dom-prompt" title="dom-prompt">prompt</a>(in DOMString message, in optional DOMString default);
   void <a href="timers.html#dom-print" title="dom-print">print</a>();
-  any <a href="timers.html#dom-showmodaldialog" title="dom-showModalDialog">showModalDialog</a>(in DOMString url, in optional any argument<!--, in optional DOMString features-->);
+  any <a href="timers.html#dom-showmodaldialog" title="dom-showModalDialog">showModalDialog</a>(in DOMString url, in optional any argument);
 
   // <a href="webappapis.html#event-handler-idl-attributes">event handler IDL attributes</a>
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-onabort" title="handler-onabort">onabort</a>;
@@ -835,9 +829,7 @@
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-onchange" title="handler-onchange">onchange</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-onclick" title="handler-onclick">onclick</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-oncontextmenu" title="handler-oncontextmenu">oncontextmenu</a>;
-<!--KEEP-END w3c-html--><!--TT-->
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-oncuechange" title="handler-oncuechange">oncuechange</a>;
-<!--KEEP-START w3c-html--><!--TT-->
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-ondblclick" title="handler-ondblclick">ondblclick</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-ondrag" title="handler-ondrag">ondrag</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-ondragend" title="handler-ondragend">ondragend</a>;
@@ -851,8 +843,6 @@
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-onended" title="handler-onended">onended</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-window-onerror" title="handler-window-onerror">onerror</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-window-onfocus" title="handler-window-onfocus">onfocus</a>;
-           attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-onformchange" title="handler-onformchange">onformchange</a>;
-           attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-onforminput" title="handler-onforminput">onforminput</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-window-onhashchange" title="handler-window-onhashchange">onhashchange</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-oninput" title="handler-oninput">oninput</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-oninvalid" title="handler-oninvalid">oninvalid</a>;
@@ -899,12 +889,7 @@
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-onvolumechange" title="handler-onvolumechange">onvolumechange</a>;
            attribute <a href="webappapis.html#function">Function</a> <a href="webappapis.html#handler-onwaiting" title="handler-onwaiting">onwaiting</a>;
 };
-<a href="#window">Window</a> implements <a href="infrastructure.html#eventtarget">EventTarget</a>;</pre><!-- for more features to add here, look here:
- http://msdn.microsoft.com/workshop/author/dhtml/reference/objects/obj_window.asp
- http://www.mozilla.org/docs/dom/domref/dom_window_ref.html
- http://lxr.mozilla.org/mozilla/source/dom/public/idl/base/nsIDOMWindow.idl - scrollBy, etc
- http://lxr.mozilla.org/mozilla/source/dom/public/idl/base/nsIDOMWindowInternal.idl - DOM level 0
---><dl class="domintro"><dt><var title="">window</var> . <code title="dom-window"><a href="#dom-window">window</a></code></dt>
+<a href="#window">Window</a> implements <a href="infrastructure.html#eventtarget">EventTarget</a>;</pre><dl class="domintro"><dt><var title="">window</var> . <code title="dom-window"><a href="#dom-window">window</a></code></dt>
    <dt><var title="">window</var> . <code title="dom-frames"><a href="#dom-frames">frames</a></code></dt>
    <dt><var title="">window</var> . <code title="dom-self"><a href="#dom-self">self</a></code></dt>
 
@@ -1088,8 +1073,7 @@
   agent could override the selection of the target browsing context to
   instead target a new tab.</p>
 
-  <p>Then, the user agent must <a href="history.html#navigate">navigate</a><!--DONAV
-  window.open()--> the selected <a href="#browsing-context">browsing context</a> to the
+  <p>Then, the user agent must <a href="history.html#navigate">navigate</a> the selected <a href="#browsing-context">browsing context</a> to the
   <a href="urls.html#absolute-url">absolute URL</a> (or error) obtained from <a href="urls.html#resolve-a-url" title="resolve a url">resolving</a> <var title="">url</var>
   earlier. If the <var title="">replace</var> is true or if the
   <a href="#browsing-context">browsing context</a> was just created as part of <a href="#the-rules-for-choosing-a-browsing-context-given-a-browsing-context-name">the
@@ -1157,7 +1141,7 @@
   context</a> of the <a href="#entry-script">entry script</a> accessing the IDL
   attribute; otherwise, it must return zero.</p>
 
-  <!-- in other words, frames are only accessible to same-thread processes -->
+  
 
   <p>The <a href="infrastructure.html#supported-property-indices">supported property indices</a> on the
   <code><a href="#window">Window</a></code> object at any instant are the numbers in the
@@ -1210,8 +1194,7 @@
     name <var title="">name</var> in the <a href="#active-document">active document</a>.
 
     </p><p class="note">There will be at least one such element, by
-    definition.<!-- (If there wasn't, then this algorithm wouldn't
-    have been invoked by Web IDL.) --></p>
+    definition.</p>
 
    </li>
 
@@ -1236,9 +1219,7 @@
 
     <p>Otherwise return an <code><a href="common-dom-interfaces.html#htmlcollection">HTMLCollection</a></code> rooted at the
     <code><a href="infrastructure.html#document">Document</a></code> node, whose filter matches only <a href="#dom-window-nameditem-filter" title="dom-window-namedItem-filter">named elements</a> with
-    the name <var title="">name</var>.</p> <!-- the same one each time
-    is returned, because of the rule under collections -->
-
+    the name <var title="">name</var>.</p> 
    </li>
 
   </ol><p><dfn id="dom-window-nameditem-filter" title="dom-window-nameditem-filter">Named elements</dfn>
@@ -1250,7 +1231,7 @@
    <code><a href="obsolete.html#frameset">frameset</a></code>, <code><a href="the-iframe-element.html#the-iframe-element">iframe</a></code>, <code><a href="embedded-content-1.html#the-img-element">img</a></code>, or
    <code><a href="the-iframe-element.html#the-object-element">object</a></code> elements that have a <code title="attr-name">name</code> content attribute whose value is <var title="">name</var>, or</li>
 
-   <li><a href="infrastructure.html#html-elements">HTML elements</a> elements that have an <code title="attr-id"><a href="elements.html#the-id-attribute">id</a></code> content attribute whose value is <var title="">name</var>.</li>
+   <li><a href="infrastructure.html#html-elements">HTML elements</a> that have an <code title="attr-id"><a href="elements.html#the-id-attribute">id</a></code> content attribute whose value is <var title="">name</var>.</li>
 
   </ul></div><div class="impl">
 
@@ -1330,7 +1311,7 @@
    </dd>
 
    <dt><var title="">window</var> . <code title="dom-window-personalbar"><a href="#dom-window-personalbar">personalbar</a></code> . <code title="dom-BarProp-visible"><a href="#dom-barprop-visible">visible</a></code></dt>
-   <!--<dt><var title="">window</var> . <code title="dom-window-directories">directories</code> . <code title="dom-BarProp-visible">visible</code></dt>-->
+   
    <dd>
     <p>Returns true if the personal bar is visible; otherwise, returns false.</p>
    </dd>
@@ -1429,12 +1410,6 @@
   attribute must return <a href="#the-toolbar-barprop-object">the toolbar <code>BarProp</code>
   object</a>.</p>
 
-<!--
-  <p>For legacy reasons, the <dfn
-  title="dom-window-directories"><code>directories</code></dfn>
-  attribute must also return <span>the personal bar
-  <code>BarProp</code> object</span>.</p>
--->
 
   </div><div class="impl">
 

Index: edits.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/edits.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- edits.html	25 Feb 2011 07:05:28 -0000	1.7
+++ edits.html	30 Apr 2011 11:35:45 -0000	1.8
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>4.7 Edits &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -422,9 +418,7 @@
  &lt;/ins&gt;
 &lt;/aside&gt;</pre>
 
-   <!-- Those dates aren't random. They're the start and end of
-   something. Can you guess what? -->
-
+   
   </div><h4 id="the-del-element"><span class="secno">4.7.2 </span>The <dfn><code>del</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
    <dd><a href="content-models.html#flow-content">Flow content</a>.</dd>
    <dd>When the element only contains <a href="content-models.html#phrasing-content">phrasing content</a>: <a href="content-models.html#phrasing-content">phrasing content</a>.</dd>

Index: the-xhtml-syntax.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/the-xhtml-syntax.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- the-xhtml-syntax.html	25 Feb 2011 07:05:30 -0000	1.7
+++ the-xhtml-syntax.html	30 Apr 2011 11:35:46 -0000	1.8
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>9 The XHTML syntax &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -510,8 +506,7 @@
   <p>For <code><a href="infrastructure.html#element">Element</a></code>s, if any of the elements in the
   serialization are in no namespace, the default namespace in scope
   for those elements must be explicitly declared as the empty
-  string.<!-- because otherwise round-tripping might break since it'll
-  pick up the surrounding default ns when setting --> (This doesn't
+  string. (This doesn't
   apply in the <code><a href="infrastructure.html#document">Document</a></code> case.) <a href="references.html#refsXML">[XML]</a> <a href="references.html#refsXMLNS">[XMLNS]</a></p>
 
   <p>For the purposes of this section, an internal general parsed
@@ -536,14 +531,10 @@
    and a U+0027 APOSTROPHE (') or that contains characters that are
    not matched by the XML <code title="">Char</code> production. <a href="references.html#refsXML">[XML]</a></li>
 
-   <li>A node with a <!--prefix or--> local name containing a U+003A
-   COLON (:).</li> <!--(prefixes can get adjusted, so this isn't an
-   excuse) -->
-
-   <li>A node with a <!--prefix or--> local name that does not match
-   the XML <code title="">Name</code> production. <a href="references.html#refsXML">[XML]</a></li> <!--(again, prefixes can get
-   adjusted, so this isn't an excuse) -->
-
+   <li>A node with a  local name containing a U+003A
+   COLON (:).</li> 
+   <li>A node with a  local name that does not match
+   the XML <code title="">Name</code> production. <a href="references.html#refsXML">[XML]</a></li> 
    <li>An <code><a href="infrastructure.html#attr">Attr</a></code> node with no namespace whose local name is
    the lowercase string "<code title="">xmlns</code>". <a href="references.html#refsXMLNS">[XMLNS]</a></li>
 
@@ -555,9 +546,7 @@
    <code><a href="infrastructure.html#processinginstruction">ProcessingInstruction</a></code> node whose data contains
    characters that are not matched by the XML <code title="">Char</code> production. <a href="references.html#refsXML">[XML]</a></li>
 
-   <!--<li>A <code>CDATASection</code> node whose data contains the
-   string "<code title="">]]&gt;</code>".</li> (these can be split)-->
-
+   
    <li>A <code><a href="infrastructure.html#comment-0">Comment</a></code> node whose data contains two adjacent
    U+002D HYPHEN-MINUS characters (-) or ends with such a
    character.</li>
@@ -580,7 +569,7 @@
 
   <h3 id="parsing-xhtml-fragments"><span class="secno">9.4 </span>Parsing XHTML fragments</h3>
 
-  <p>The <dfn id="xml-fragment-parsing-algorithm">XML fragment parsing algorithm</dfn> for either returns
+  <p>The <dfn id="xml-fragment-parsing-algorithm">XML fragment parsing algorithm</dfn> either returns
   a <code><a href="infrastructure.html#document">Document</a></code> or raises a <code><a href="common-dom-interfaces.html#syntax_err">SYNTAX_ERR</a></code>
   exception. Given a string <var title="">input</var> and an optional
   context element <var title="">context</var>, the algorithm is as

Index: iana.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/iana.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- iana.html	25 Feb 2011 07:05:28 -0000	1.8
+++ iana.html	30 Apr 2011 11:35:45 -0000	1.9
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>12 IANA considerations &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -350,16 +346,8 @@
    <a href="spec.html#contents">Table of contents</a> &#x2013;
    <a href="index.html" class="next">Index</a>
   <ol class="toc"><li><a href="iana.html#iana"><span class="secno">12 </span>IANA considerations</a>
-  <ol><li><a href="iana.html#text-html"><span class="secno">12.1 </span><code>text/html</code></a></li><li><a href="iana.html#text-html-sandboxed"><span class="secno">12.2 </span><code>text/html-sandboxed</code></a></li><li><a href="iana.html#application-xhtml-xml"><span class="secno">12.3 </span><code>application/xhtml+xml</code></a></li><li><a href="iana.html#text-cache-manifest"><span class="secno">12.4 </span><code>text/cache-manifest</code></a></li></ol></li></ol></div><h2 id="iana"><span class="secno">12 </span>IANA considerations</h2><!-- http://www.w3.org/2002/06/registering-mediatype.html --><h3 id="text-html"><span class="secno">12.1 </span><dfn><code>text/html</code></dfn></h3><p>This registration is for community review and will be submitted
-  to the IESG for review, approval, and registration with IANA.</p><!--
-   To: http://tools.ietf.org/html/rfc2854
-
-   Include a request to retire RFC 2854 persuant to section 6.4 of RFC 2026.
-  --><dl><dt>Type name:</dt>
+  <ol><li><a href="iana.html#text-html"><span class="secno">12.1 </span><code>text/html</code></a></li><li><a href="iana.html#text-html-sandboxed"><span class="secno">12.2 </span><code>text/html-sandboxed</code></a></li><li><a href="iana.html#application-xhtml-xml"><span class="secno">12.3 </span><code>application/xhtml+xml</code></a></li><li><a href="iana.html#text-cache-manifest"><span class="secno">12.4 </span><code>text/cache-manifest</code></a></li></ol></li></ol></div><h2 id="iana"><span class="secno">12 </span>IANA considerations</h2><h3 id="text-html"><span class="secno">12.1 </span><dfn><code>text/html</code></dfn></h3><p>This registration is for community review and will be submitted
+  to the IESG for review, approval, and registration with IANA.</p><dl><dt>Type name:</dt>
    <dd>text</dd>
    <dt>Subtype name:</dt>
    <dd>html</dd>
@@ -465,10 +453,7 @@
    <dd>W3C</dd>
   </dl><p>Fragment identifiers used with <code><a href="#text-html">text/html</a></code> resources
   refer to <a href="history.html#the-indicated-part-of-the-document">the indicated part of the document</a>.</p><h3 id="text-html-sandboxed"><span class="secno">12.2 </span><dfn><code>text/html-sandboxed</code></dfn></h3><p>This registration is for community review and will be submitted
-  to the IESG for review, approval, and registration with IANA.</p><!--
-   To: http://tools.ietf.org/html/rfc3236
-  --><dl><dt>Type name:</dt>
+  to the IESG for review, approval, and registration with IANA.</p><dl><dt>Type name:</dt>
    <dd>application</dd>
    <dt>Subtype name:</dt>
    <dd>xhtml+xml</dd>
@@ -592,10 +571,7 @@
   </dl><p>Fragment identifiers used with <code><a href="#application-xhtml-xml">application/xhtml+xml</a></code>
   resources have the same semantics as with any <a href="infrastructure.html#xml-mime-type">XML MIME
   type</a>. <a href="references.html#refsRFC3023">[RFC3023]</a></p><h3 id="text-cache-manifest"><span class="secno">12.4 </span><dfn><code>text/cache-manifest</code></dfn></h3><p>This registration is for community review and will be submitted
-  to the IESG for review, approval, and registration with IANA.</p><!--
-   To: http://groups.google.com/group/gears-users/browse_thread/thread/efbd808325df607a/c73adb34f9b63cf7?hl=en&q=whatwg#c73adb34f9b63cf7
-
-
-     * Multiuser appcaches.
-
-       If the application code (HTML, JS, CSS) is all the same for two
-       users, then appcache works for multiple users by just having
-       the data for the users separate from the logic.
-
-       This is the expected model for most apps. For example, your
-       typical blog has just one set of CSS for all users.
-
-       For systems where the user affects what HTML, JS, and CSS is
-       served back, the spec as written pretty much requires that
-       there be one app per user, and one generic "login" app that
-       then redirects to one of those other apps - and where each app
-       has a different base URL, separate manifest, etc.
-
-       An alternative that we could explore in a future version is to
-       have the manifest include a manifest name, and then have script
-       that allows you to "activate" a particular manifest name for a
-       given appcache.
-
-       So each appcache group would be futher subdivided into named
-       subgroups, and for a given manifest URL with such a group of
-       subgroups, one subgroup would be the default one at a time. The
-       inactive ones would just lie dormant, but and the active ones
-       would act like now, but there'd be a scripted way to change the
-       default (and maybe query what available variants exist for the
-       current appcache), so that you could log back in as someone
-       else by just making the script pick the other user's variant,
-       and then reloading.
-
-  --><h4 id="introduction-3"><span class="secno">5.6.1 </span>Introduction</h4><p><i>This section is non-normative.</i></p><p>In order to enable users to continue interacting with Web
+      <ol><li><a href="offline.html#some-sample-manifests"><span class="secno">5.6.3.1 </span>Some sample manifests</a></li><li><a href="offline.html#writing-cache-manifests"><span class="secno">5.6.3.2 </span>Writing cache manifests</a></li><li><a href="offline.html#parsing-cache-manifests"><span class="secno">5.6.3.3 </span>Parsing cache manifests</a></li></ol></li><li><a href="offline.html#downloading-or-updating-an-application-cache"><span class="secno">5.6.4 </span>Downloading or updating an application cache</a></li><li><a href="offline.html#the-application-cache-selection-algorithm"><span class="secno">5.6.5 </span>The application cache selection algorithm</a></li><li><a href="offline.html#changesToNetworkingModel"><span class="secno">5.6.6 </span>Changes to the networking model</a></li><li><a href="offline.html#expiring-application-caches"><span class="secno">5.6.7 </span>Expiring application caches</a></li><li><a href="offline.html#disk-space"><span class="secno">5.6.8 </span>Disk space</a></li><li><a href="offline.html#application-cache-api"><span class="secno">5.6.9 </span>Application cache API</a></li><li><a href="offline.html#browser-state"><span class="secno">5.6.10 </span>Browser state</a></li></ol></li></ol></li></ol></div><h3 id="offline"><span class="secno">5.6 </span>Offline Web applications</h3><h4 id="introduction-4"><span class="secno">5.6.1 </span>Introduction</h4><p><i>This section is non-normative.</i></p><p>In order to enable users to continue interacting with Web
   applications and documents even when their network connection is
   unavailable &#x2014; for instance, because they are traveling outside
   of their ISP's coverage area &#x2014; authors can provide a manifest
@@ -441,9 +397,7 @@
   served over TLS (encrypted, using <code title="">https:</code>) are
   overridden by manifests. Thus, pages will not expire from an
   application cache before the user agent has updated it, and even
-  applications served over TLS can be made to work offline.</p><!--(doesn't currently function)
-  <p><a href="http://www.whatwg.org/demos/offline/clock/clock2.html">View this example online</a>.</p>
---><h5 id="appcacheevents"><span class="secno">5.6.1.1 </span>Event summary</h5><p><i>This section is non-normative.</i></p><p>When the user visits a page that declares a manifest, the browser
+  applications served over TLS can be made to work offline.</p><h5 id="appcacheevents"><span class="secno">5.6.1.1 </span>Event summary</h5><p><i>This section is non-normative.</i></p><p>When the user visits a page that declares a manifest, the browser
   will try to update the cache. It does this by fetching a copy of the
   manifest and, if the manifest has changed since the user agent last
   saw it, redownloading all the resources it mentions and caching them
@@ -629,7 +583,7 @@
 
   <p>A <code><a href="infrastructure.html#document">Document</a></code> initially is not associated with an
   <a href="#application-cache">application cache</a>, but can become associated with one
-  early during the page load process, when steps <a href="tokenization.html#parser-appcache">in the parser</a> and in the <a href="history.html#navigate" title="navigate">navigation</a> sections cause <a href="#concept-appcache-init" title="concept-appcache-init">cache selection</a> to occur.</p>
+  early during the page load process, when steps <a href="tree-construction.html#parser-appcache">in the parser</a> and in the <a href="history.html#navigate" title="navigate">navigation</a> sections cause <a href="#concept-appcache-init" title="concept-appcache-init">cache selection</a> to occur.</p>
 
   <p>A <code>SharedWorkerGlobalScope</code> can be associated with an
   <a href="#application-cache">application cache</a> when it is created.
@@ -678,9 +632,7 @@
    identified by <code title="">http://example.com/app1/manifest</code> contains a
    namespace with a match for that URL.</p>
 
-   <!-- "resolve a url" canonicalises the case for the scheme and host
-   and removes the port if it is the default -->
-
+   
   </div>
 
   </div><h4 id="manifests"><span class="secno">5.6.3 </span>The cache manifest syntax</h4><h5 id="some-sample-manifests"><span class="secno">5.6.3.1 </span>Some sample manifests</h5><p><i>This section is non-normative.</i></p><div class="example">
@@ -850,17 +802,11 @@
     <p>When the current section is the <a href="#concept-appcache-manifest-network" title="concept-appcache-manifest-network">online whitelist
     section</a>, data lines must consist of zero or more U+0020
     SPACE and U+0009 CHARACTER TABULATION (tab) characters, either a
-    single U+002A ASTERISK character (*) <!--
-    concept-appcache-onlinewhitelist-wildcard --> or a <a href="urls.html#valid-url">valid
+    single U+002A ASTERISK character (*)  or a <a href="urls.html#valid-url">valid
     URL</a> identifying a resource other than the manifest itself,
     and then zero or more U+0020 SPACE and U+0009 CHARACTER TABULATION
     (tab) characters.</p>
 
-<!--
-    <p class="note">The URLs in data lines can't be empty strings,
-    since those would be relative URLs to the manifest itself. Such
-    lines would be confused with blank or invalid lines, anyway.</p>
--->
 
   </dd></dl><p>Manifests may contain sections more than once. Sections may be
   empty.</p><p>If the manifest's <a href="urls.html#url-scheme" title="url-scheme">&lt;scheme&gt;</a>
@@ -879,8 +825,7 @@
   sections</a>. (This is needed for any URL that the page is
   intending to use to communicate back to the server.) To specify that
   all URLs are automatically whitelisted in this way, a U+002A
-  ASTERISK character (*) may be specified as one of the URLs. <!--
-  concept-appcache-onlinewhitelist-wildcard --></p><p>Authors should not include namespaces in the <a href="#concept-appcache-onlinewhitelist" title="concept-appcache-onlinewhitelist">online whitelist</a> for
+  ASTERISK character (*) may be specified as one of the URLs. </p><p>Authors should not include namespaces in the <a href="#concept-appcache-onlinewhitelist" title="concept-appcache-onlinewhitelist">online whitelist</a> for
   which another namespace in the <a href="#concept-appcache-onlinewhitelist" title="concept-appcache-onlinewhitelist">online whitelist</a> is
   a <a href="infrastructure.html#prefix-match">prefix match</a>.</p><p>Relative URLs must be given relative to the manifest's own
   URL. All URLs in the manifest must have the same <a href="urls.html#url-scheme" title="url-scheme">&lt;scheme&gt;</a> as the manifest itself
@@ -897,11 +842,7 @@
   that the user agent must run the following steps:</p>
 
   <ol><li><p>The user agent must decode the byte stream corresponding
-   with the manifest to be parsed <a href="infrastructure.html#decoded-as-utf-8-with-error-handling" title="decoded as UTF-8, with&#10;   error handling">as UTF-8, with error handling</a>. <!--All
-   U+0000 NULL characters must be replaced by U+FFFD REPLACEMENT
-   CHARACTERs. (this isn't black-box testable since neither U+0000 nor
-   U+FFFD are valid anywhere in the syntax and thus both will be
-   treated the same anyway)--></p></li>
+   with the manifest to be parsed <a href="infrastructure.html#decoded-as-utf-8-with-error-handling" title="decoded as UTF-8, with&#10;   error handling">as UTF-8, with error handling</a>. </p></li>
 
    <li><p>Let <var title="">base URL</var> be the <a href="urls.html#absolute-url">absolute
    URL</a> representing the manifest.</p></li>
@@ -920,8 +861,7 @@
    URLs</a> for an <a href="#concept-appcache-onlinewhitelist" title="concept-appcache-onlinewhitelist">online
    whitelist</a>.</p></li>
 
-   <li><p>Let <var title="">online whitelist wildcard flag</var> be <i title="">blocking</i>. <!--
-   concept-appcache-onlinewhitelist-wildcard --></p></li>
+   <li><p>Let <var title="">online whitelist wildcard flag</var> be <i title="">blocking</i>. </p></li>
 
    <li><p>Let <var title="">input</var> be the decoded text of the
    manifest's byte stream.</p></li>
@@ -961,7 +901,7 @@
    step. Otherwise, <a href="common-microsyntaxes.html#collect-a-sequence-of-characters">collect a sequence of characters</a> that
    are U+000A LINE FEED (LF), U+000D CARRIAGE RETURN (CR), U+0020
    SPACE, or U+0009 CHARACTER TABULATION (tab) characters.</p></li>
-   <!-- strips leading spaces, ignores space-only lines, ignores blank lines -->
+   
 
    <li><p>Now, <a href="common-microsyntaxes.html#collect-a-sequence-of-characters">collect a sequence of characters</a> that are
    <em>not</em> U+000A LINE FEED (LF) or U+000D CARRIAGE RETURN (CR)
@@ -1071,9 +1011,7 @@
 
       <p>If the <a href="urls.html#absolute-url">absolute URL</a> corresponding to either <var title="">part one</var> or <var title="">part two</var> does not
       have the <a href="origin-0.html#same-origin">same origin</a> as the manifest's URL, then
-      jump back to the step labeled "start of line".</p> <!-- SECURITY
-      -->
-
+      jump back to the step labeled "start of line".</p> 
       <p>Drop any <a href="urls.html#url-fragment" title="url-fragment">&lt;fragment&gt;</a>
       components of the resulting <a href="urls.html#absolute-url" title="absolute URL">absolute
       URLs</a>.</p>
@@ -1321,9 +1259,7 @@
     <p><i>Fetching the manifest</i>: <a href="fetching-resources.html#fetch">Fetch</a> the resource
     from <var title="">manifest URL</var> with the <i>synchronous
     flag</i> set, and let <var title="">manifest</var> be that
-    resource.</p> <!-- http-origin privacy sensitive, though it
-    doesn't matter, since this can never be cross-origin -->
-
+    resource.</p> 
     <p>If the resource is labeled with the <a href="infrastructure.html#mime-type">MIME type</a>
     <code><a href="iana.html#text-cache-manifest">text/cache-manifest</a></code>, parse <var title="">manifest</var> according to the <a href="#parse-a-manifest" title="parse a&#10;    manifest">rules for parsing manifests</a>, obtaining a list of
     <a href="#concept-appcache-explicit" title="concept-appcache-explicit">explicit entries</a>,
@@ -1564,7 +1500,7 @@
       group</var> as an HTTP cache, and honor HTTP caching semantics
       (such as expiration, ETags, and so forth) with respect to that
       cache. User agents may also have other caches in place that are
-      also honored.</p> <!-- not http-origin privacy sensitive -->
+      also honored.</p> 
 
       <p class="note">If the resource in question is already being
       downloaded for other reasons then the existing download process
@@ -1752,10 +1688,7 @@
 
     <p><a href="fetching-resources.html#fetch">Fetch</a> the resource from <var title="">manifest
     URL</var> again, with the <i>synchronous flag</i> set, and let
-    <var title="">second manifest</var> be that resource.</p> <!--
-    http-origin privacy sensitive, though it doesn't matter, since
-    this can never be cross-origin -->
-
+    <var title="">second manifest</var> be that resource.</p> 
    </li>
 
    <li>
@@ -1956,11 +1889,7 @@
 
    <dt>If <var title="">document</var> was loaded from an
    <a href="#application-cache">application cache</a>, and that <a href="#application-cache">application
-   cache</a> still exists (it is not now <a href="#concept-appcache-obsolete" title="concept-appcache-obsolete">obsolete</a>)<!--[redundant],
-   and either there is no <var title="">manifest URL</var>, or the URL
-   of the <span title="concept-appcache-manifest">manifest</span> of
-   the cache's <span>application cache group</span> is the same as
-   <var title="">manifest URL</var>--></dt>
+   cache</a> still exists (it is not now <a href="#concept-appcache-obsolete" title="concept-appcache-obsolete">obsolete</a>)</dt>
 
    <dd>
 
@@ -1973,8 +1902,7 @@
    </dd>
 
 
-   <dt>If <var title="">document</var> <!--[redundant] was not loaded
-   from an <span>application cache</span>, but it--> was loaded using
+   <dt>If <var title="">document</var>  was loaded using
    HTTP GET <a href="fetching-resources.html#concept-http-equivalent-get" title="concept-http-equivalent-get">or
    equivalent</a>, and, there is a <var title="">manifest
    URL</var>, and <var title="">manifest URL</var> has the <a href="origin-0.html#same-origin">same
@@ -1991,9 +1919,7 @@
    </dd>
 
 
-   <dt>Otherwise</dt> <!-- not from cache and either no <var
-   title="">manifest URL</var>, or non-GET, or wrong-origin manifest -->
-
+   <dt>Otherwise</dt> 
    <dd>
 
     <p>The <code><a href="infrastructure.html#document">Document</a></code> is not associated with any

Index: content-models.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/content-models.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- content-models.html	25 Feb 2011 07:05:27 -0000	1.8
+++ content-models.html	30 Apr 2011 11:35:44 -0000	1.9
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>3.2.5 Content models &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -352,7 +348,7 @@
   <ol class="toc"><li><ol><li><ol><li><a href="content-models.html#content-models"><span class="secno">3.2.5 </span>Content models</a>
       <ol><li><a href="content-models.html#kinds-of-content"><span class="secno">3.2.5.1 </span>Kinds of content</a>
         <ol><li><a href="content-models.html#metadata-content-0"><span class="secno">3.2.5.1.1 </span>Metadata content</a></li><li><a href="content-models.html#flow-content-0"><span class="secno">3.2.5.1.2 </span>Flow content</a></li><li><a href="content-models.html#sectioning-content-0"><span class="secno">3.2.5.1.3 </span>Sectioning content</a></li><li><a href="content-models.html#heading-content-0"><span class="secno">3.2.5.1.4 </span>Heading content</a></li><li><a href="content-models.html#phrasing-content-0"><span class="secno">3.2.5.1.5 </span>Phrasing content</a></li><li><a href="content-models.html#embedded-content-0"><span class="secno">3.2.5.1.6 </span>Embedded content</a></li><li><a href="content-models.html#interactive-content-0"><span class="secno">3.2.5.1.7 </span>Interactive content</a></li></ol></li><li><a href="content-models.html#transparent-content-models"><span class="secno">3.2.5.2 </span>Transparent content models</a></li><li><a href="content-models.html#paragraphs"><span class="secno">3.2.5.3 </span>Paragraphs</a></li></ol></li><li><a href="content-models.html#requirements-relating-to-bidirectional-algorithm-formatting-characters"><span class="secno">3.2.6 </span>Requirements relating to bidirectional-algorithm formatting
-  characters</a></li><li><a href="content-models.html#annotations-for-assistive-technology-products-aria"><span class="secno">3.2.7 </span>Annotations for assistive technology products (ARIA)</a></li></ol></li></ol></li></ol></div><h4 id="content-models"><span class="secno">3.2.5 </span><dfn>Content models</dfn></h4><p>Each element defined in this specification has a content model: a
+  characters</a></li><li><a href="content-models.html#wai-aria"><span class="secno">3.2.7 </span>WAI-ARIA</a></li></ol></li></ol></li></ol></div><h4 id="content-models"><span class="secno">3.2.5 </span><dfn>Content models</dfn></h4><p>Each element defined in this specification has a content model: a
   description of the element's expected contents. An <a href="infrastructure.html#html-elements" title="HTML&#10;  elements">HTML element</a> must have contents that match the
   requirements described in the element's content model.</p><p class="note">As noted in the conformance and terminology
   sections, for the purposes of determining if an element matches its
@@ -361,8 +357,7 @@
   they were expanded in place</a>.</p><p>The <a href="common-microsyntaxes.html#space-character" title="space character">space characters</a> are
   always allowed between elements. User agents represent these
   characters between elements in the source markup as text nodes in
-  the DOM.<!-- not a conf criteria since the parser now requires this
-  --> Empty <a href="infrastructure.html#text-node" title="text node">text nodes</a> and <a href="infrastructure.html#text-node" title="text node">text nodes</a> consisting of just sequences of
+  the DOM. Empty <a href="infrastructure.html#text-node" title="text node">text nodes</a> and <a href="infrastructure.html#text-node" title="text node">text nodes</a> consisting of just sequences of
   those characters are considered <dfn id="inter-element-whitespace">inter-element
   whitespace</dfn>.</p><p><a href="#inter-element-whitespace">Inter-element whitespace</a>, comment nodes, and
   processing instruction nodes must be ignored when establishing
@@ -414,7 +409,7 @@
   particular category.</p><h6 id="metadata-content-0"><span class="secno">3.2.5.1.1 </span>Metadata content</h6><p><dfn id="metadata-content">Metadata content</dfn> is content that sets up the
   presentation or behavior of the rest of the content, or that sets
   up the relationship of the document with other documents, or that
-  conveys other "out of band" information.</p><!-- when updating this also update the category index --><ul class="brief category-list"><li><code><a href="semantics.html#the-base-element">base</a></code></li>
+  conveys other "out of band" information.</p><ul class="brief category-list"><li><code><a href="semantics.html#the-base-element">base</a></code></li>
    <li><code><a href="interactive-elements.html#the-command">command</a></code></li>
    <li><code><a href="semantics.html#the-link-element">link</a></code></li>
    <li><code><a href="semantics.html#meta">meta</a></code></li>
@@ -451,7 +446,7 @@
    <p>This isn't possible in the HTML serialization, however.</p>
 
   </div><h6 id="flow-content-0"><span class="secno">3.2.5.1.2 </span>Flow content</h6><p>Most elements that are used in the body of documents and
-  applications are categorized as <dfn id="flow-content">flow content</dfn>.</p><!-- when updating this also update the category index --><ul class="brief category-list"><li><code><a href="text-level-semantics.html#the-a-element">a</a></code></li>
+  applications are categorized as <dfn id="flow-content">flow content</dfn>.</p><ul class="brief category-list"><li><code><a href="text-level-semantics.html#the-a-element">a</a></code></li>
    <li><code><a href="text-level-semantics.html#the-abbr-element">abbr</a></code></li>
    <li><code><a href="sections.html#the-address-element">address</a></code></li>
    <li><code><a href="the-map-element.html#the-area-element">area</a></code> (if it is a descendant of a <code><a href="the-map-element.html#the-map-element">map</a></code> element)</li>
@@ -527,6 +522,7 @@
    <li><code><a href="tabular-data.html#the-table-element">table</a></code></li>
    <li><code><a href="the-button-element.html#the-textarea-element">textarea</a></code></li>
    <li><code><a href="text-level-semantics.html#the-time-element">time</a></code></li>
+   <li><code><a href="text-level-semantics.html#the-u-element">u</a></code></li>
    <li><code><a href="grouping-content.html#the-ul-element">ul</a></code></li>
    <li><code><a href="text-level-semantics.html#the-var-element">var</a></code></li>
    <li><code><a href="video.html#video">video</a></code></li>
@@ -544,7 +540,7 @@
   when it is used as a placeholder which will later be filled in by a
   script, or when the element is part of a template and would on most
   pages be filled in but on some pages is not relevant.</p><h6 id="sectioning-content-0"><span class="secno">3.2.5.1.3 </span>Sectioning content</h6><p><dfn id="sectioning-content">Sectioning content</dfn> is content that defines the scope
-  of <a href="#heading-content" title="heading content">headings</a> and <a href="sections.html#the-footer-element" title="footer">footers</a>.</p><!-- when updating this also update the category index --><ul class="brief category-list"><li><code><a href="sections.html#the-article-element">article</a></code></li>
+  of <a href="#heading-content" title="heading content">headings</a> and <a href="sections.html#the-footer-element" title="footer">footers</a>.</p><ul class="brief category-list"><li><code><a href="sections.html#the-article-element">article</a></code></li>
    <li><code><a href="sections.html#the-aside-element">aside</a></code></li>
    <li><code><a href="sections.html#the-nav-element">nav</a></code></li>
    <li><code><a href="sections.html#the-section-element">section</a></code></li>
@@ -554,7 +550,7 @@
   from <a href="#sectioning-content">sectioning content</a>, but they can also have an
   <a href="sections.html#outline">outline</a>.</p><h6 id="heading-content-0"><span class="secno">3.2.5.1.4 </span>Heading content</h6><p><dfn id="heading-content">Heading content</dfn> defines the header of a section
   (whether explicitly marked up using <a href="#sectioning-content">sectioning content</a>
-  elements, or implied by the heading content itself).</p><!-- when updating this also update the category index --><ul class="brief category-list"><li><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h1</a></code></li>
+  elements, or implied by the heading content itself).</p><ul class="brief category-list"><li><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h1</a></code></li>
    <li><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h2</a></code></li>
    <li><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h3</a></code></li>
    <li><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h4</a></code></li>
@@ -563,7 +559,7 @@
    <li><code><a href="sections.html#the-hgroup-element">hgroup</a></code></li>
   </ul><h6 id="phrasing-content-0"><span class="secno">3.2.5.1.5 </span>Phrasing content</h6><p><dfn id="phrasing-content">Phrasing content</dfn> is the text of the document, as well
   as elements that mark up that text at the intra-paragraph
-  level. Runs of <a href="#phrasing-content">phrasing content</a> form <a href="#paragraph" title="paragraph">paragraphs</a>.</p><!-- when updating this also update the category index --><ul class="brief category-list"><li><code><a href="text-level-semantics.html#the-a-element">a</a></code> (if it contains only <a href="#phrasing-content">phrasing content</a>)</li>
+  level. Runs of <a href="#phrasing-content">phrasing content</a> form <a href="#paragraph" title="paragraph">paragraphs</a>.</p><ul class="brief category-list"><li><code><a href="text-level-semantics.html#the-a-element">a</a></code> (if it contains only <a href="#phrasing-content">phrasing content</a>)</li>
    <li><code><a href="text-level-semantics.html#the-abbr-element">abbr</a></code></li>
    <li><code><a href="the-map-element.html#the-area-element">area</a></code> (if it is a descendant of a <code><a href="the-map-element.html#the-map-element">map</a></code> element)</li>
    <li><code><a href="video.html#audio">audio</a></code></li>
@@ -611,6 +607,7 @@
    <li><code><a href="the-map-element.html#svg">svg</a></code></li>
    <li><code><a href="the-button-element.html#the-textarea-element">textarea</a></code></li>
    <li><code><a href="text-level-semantics.html#the-time-element">time</a></code></li>
+   <li><code><a href="text-level-semantics.html#the-u-element">u</a></code></li>
    <li><code><a href="text-level-semantics.html#the-var-element">var</a></code></li>
    <li><code><a href="video.html#video">video</a></code></li>
    <li><code><a href="text-level-semantics.html#the-wbr-element">wbr</a></code></li>
@@ -629,7 +626,7 @@
   model on its own, but is also <a href="#phrasing-content">phrasing content</a>, and can
   be <a href="#inter-element-whitespace">inter-element whitespace</a> (if the <a href="infrastructure.html#text-node" title="text&#10;  node">text nodes</a> are empty or contain just <a href="common-microsyntaxes.html#space-character" title="space&#10;  character">space characters</a>).</p><h6 id="embedded-content-0"><span class="secno">3.2.5.1.6 </span>Embedded content</h6><p class="XXX annotation"><span><a href="http://www.w3.org/html/wg/tracker/issues/80">ISSUE-80</a> (title-alternative) blocks progress to Last Call</span></p><p><dfn id="embedded-content">Embedded content</dfn> is content that imports another
   resource into the document, or content from another vocabulary that
-  is inserted into the document.</p><!-- when updating this also update the category index --><ul class="brief category-list"><li><code><a href="video.html#audio">audio</a></code></li>
+  is inserted into the document.</p><ul class="brief category-list"><li><code><a href="video.html#audio">audio</a></code></li>
    <li><code><a href="the-canvas-element.html#the-canvas-element">canvas</a></code></li>
    <li><code><a href="the-iframe-element.html#the-embed-element">embed</a></code></li>
    <li><code><a href="the-iframe-element.html#the-iframe-element">iframe</a></code></li>
@@ -644,14 +641,8 @@
   defined in this specification. (For example, MathML, or SVG.)</p><p>Some embedded content elements can have <dfn id="fallback-content">fallback
   content</dfn>: content that is to be used when the external resource
   cannot be used (e.g. because it is of an unsupported format). The
-  element definitions state what the fallback is, if any.</p><h6 id="interactive-content-0"><span class="secno">3.2.5.1.7 </span>Interactive content</h6><!--
-TESTS:
-http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20html%3E%0A%3Cp%20tabindex%3D1%3Etest%20%3Ca%20href%3D%22%22%3E%20%3Cem%3Etest%3C/em%3E%20%3C/a%3E%0A%3Cscript%3E%0A%20function%20test%20%28e%29%20%7B%20w%28e.type%20+%20%27%20on%20%27%20+%20e.target.tagName%20+%20%27%20through%20%27%20+%20e.currentTarget.tagName%29%3B%20%7D%0A%20document.getElementsByTagName%28%27a%27%29%5B0%5D.addEventListener%28%27click%27%2C%20test%2C%20false%29%3B%0A%20document.getElementsByTagName%28%27a%27%29%5B0%5D.addEventListener%28%27DOMActivate%27%2C%20test%2C%20false%29%3B%0A%20document.getElementsByTagName%28%27p%27%29%5B0%5D.addEventListener%28%27click%27%2C%20test%2C%20false%29%3B%0A%20document.getElementsByTagName%28%27p%27%29%5B0%5D.addEventListener%28%27DOMActivate%27%2C%20test%2C%20false%29%3B%0A%3C/script%3E%0A
-http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20HTML%3E%0A%3Ca%20href%3Dhttp%3A//google.com/%20target%3Da%3EA%3C/a%3E%3Ca%20href%3Dhttp%3A//yahoo.com/%20target%3Db%3EB%3C/a%3E%3Cbr%3E%0A%3Ciframe%20name%3Da%3E%3C/iframe%3E%3Ciframe%20name%3Db%3E%3C/iframe%3E%0A%3Cscript%3E%0A%20var%20a%20%3D%20document.getElementsByTagName%28%27a%27%29%5B0%5D%3B%0A%20var%20b%20%3D%20document.getElementsByTagName%28%27a%27%29%5B1%5D%3B%0A%20a.appendChild%28b%29%3B%0A%3C/script%3E
-http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20HTML%3E%0A%3Cform%20action%3D%22http%3A//google.com/%22%20onsubmit%3D%22w%28%27onsubmit%27%29%22%3E%3Cem%3EA%3C/em%3E%3C/form%3E%0A%3Cscript%3E%0Adocument.getElementsByTagName%28%27form%27%29%5B0%5D.attachEvent%28%27onsubmit%27%2C%20function%20%28%29%20%7B%20w%28%27submit%20fired%27%29%20%7D%29%3B%0Adocument.getElementsByTagName%28%27form%27%29%5B0%5D.fireEvent%28%27onsubmit%27%29%3B%0A%3C/script%3E
-http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20HTML%3E%0A%3Cform%20action%3D%22http%3A//google.com/%22%3EX%3C/form%3E%0A%3Cscript%3E%0Avar%20evt%20%3D%20document.createEvent%28%22Events%22%29%3B%0Aevt.initEvent%28%22submit%22%2C%20true%2C%20true%29%3B%0Adocument.getElementsByTagName%28%27form%27%29%5B0%5D.dispatchEvent%28evt%29%3B%0A%3C/script%3E
---><p><dfn id="interactive-content">Interactive content</dfn> is content that is specifically
-  intended for user interaction.</p><!-- when updating this also update the category index --><ul class="brief category-list"><li><code><a href="text-level-semantics.html#the-a-element">a</a></code></li>
+  element definitions state what the fallback is, if any.</p><h6 id="interactive-content-0"><span class="secno">3.2.5.1.7 </span>Interactive content</h6><p><dfn id="interactive-content">Interactive content</dfn> is content that is specifically
+  intended for user interaction.</p><ul class="brief category-list"><li><code><a href="text-level-semantics.html#the-a-element">a</a></code></li>
    <li><code><a href="video.html#audio">audio</a></code> (if the <code title="attr-media-controls"><a href="video.html#attr-media-controls">controls</a></code> attribute is present)</li>
    <li><code><a href="the-button-element.html#the-button-element">button</a></code></li>
    <li><code><a href="interactive-elements.html#the-details-element">details</a></code></li>
@@ -662,7 +653,7 @@
    <li><code><a href="the-button-element.html#the-keygen-element">keygen</a></code></li>
    <li><code><a href="forms.html#the-label-element">label</a></code></li>
    <li><code><a href="interactive-elements.html#menus">menu</a></code> (if the <code title="attr-menu-type"><a href="interactive-elements.html#attr-menu-type">type</a></code> attribute is in the <a href="interactive-elements.html#toolbar-state" title="toolbar state">toolbar</a> state)</li>
-   <li><code><a href="the-iframe-element.html#the-object-element">object</a></code> (if the <code title="attr-hyperlink-usemap"><a href="the-map-element.html#attr-hyperlink-usemap">usemap</a></code> attribute is present)<!-- see also comment in <object> section --></li>
+   <li><code><a href="the-iframe-element.html#the-object-element">object</a></code> (if the <code title="attr-hyperlink-usemap"><a href="the-map-element.html#attr-hyperlink-usemap">usemap</a></code> attribute is present)</li>
    <li><code><a href="the-button-element.html#the-select-element">select</a></code></li>
    <li><code><a href="the-button-element.html#the-textarea-element">textarea</a></code></li>
    <li><code><a href="video.html#video">video</a></code> (if the <code title="attr-media-controls"><a href="video.html#attr-media-controls">controls</a></code> attribute is present)</li>
@@ -678,7 +669,7 @@
   triggers an element with a defined <a href="#activation-behavior">activation behavior</a>
   in a manner other than clicking it, the default action of the
   interaction event must be to <a href="#run-synthetic-click-activation-steps">run synthetic click activation
-  steps</a> on the element.</p> <!-- interaction event spec point -->
+  steps</a> on the element.</p> 
 
   <p>When a user agent is to <dfn id="run-synthetic-click-activation-steps">run synthetic click activation
   steps</dfn> on an element, the user agent must <a href="#run-pre-click-activation-steps">run pre-click
@@ -701,7 +692,7 @@
    <li>
 
     <p>Dispatch the required <code title="event-click"><a href="infrastructure.html#event-click">click</a></code>
-    event.</p> <!-- interaction event spec point -->
+    event.</p> 
 
     <p>If there is an element <var title="">e</var>, then the default
     action of the <code title="event-click"><a href="infrastructure.html#event-click">click</a></code> event must be
@@ -762,37 +753,7 @@
    that allows <a href="#phrasing-content">phrasing content</a>, and the <code><a href="text-level-semantics.html#the-rt-element">rt</a></code>
    element is not <a href="#phrasing-content">phrasing content</a>.</p>
 
-  </div><!--(as far as I can tell, there's no way to violate this requirement
-     without first violating the earlier requirement)
-  <p>Furthermore, when a content model includes a part that is
-  "transparent", those parts must not contain content that would not
-  be conformant if all transparent elements in the tree were replaced,
-  in their parent element, by the children in the "transparent" part
-  of their content model, retaining order.</p>
-
-  <div class="example">
-
-   <p>Consider the following markup fragment:</p>
-
-   <pre>&lt;p>Hello &lt;a href="world.html">&lt;em>wonderful&lt;/em> world&lt;/a>!&lt;/p></pre>
-
-   <p>Its DOM looks like the following:</p>
-
-   <ul class="domTree"><li class="t1"><code>p</code><ul><li class="t3"><code>#text</code>: <span title="">Hello </span></li><li class="t1"><code>a</code> <span class="t2" title=""><code class="attribute name">href</code>="<code class="attribute value">world.html</code>"</span><ul><li class="t1"><code>em</code><ul><li class="t3"><code>#text</code>: <span title="">wonderful</span></li></ul></li><li class="t3"><code>#text</code>: <span title=""> world</span></li></ul></li><li class="t3"><code>#text</code>: <span title="">!</span></li></ul></li></ul>
-
-   <p>The content model of the <code>a</code> element is
-   <span>transparent</span>. To see if its contents are conforming,
-   therefore, the element is replaced by its contents:</p>
-
-   <ul class="domTree"><li class="t1"><code>p</code><ul><li class="t3"><code>#text</code>: <span title="">Hello </span></li><li class="t1"><code>em</code><ul><li class="t3"><code>#text</code>: <span title="">wonderful</span></li></ul></li><li class="t3"><code>#text</code>: <span title=""> world</span></li><li class="t3"><code>#text</code>: <span title="">!</span></li></ul></li></ul>
-
-   <p>Since that is conforming, the contents of the <code>a</code> are
-   conforming in the original fragment (there is no complication
-   regarding the various parts of the <code>p</code> element's content
-   model, since that element's content model has only one part).</p>
-
-  </div>
---><p class="note">In some cases, where transparent elements are nested
+  </div><p class="note">In some cases, where transparent elements are nested
   in each other, the process has to be applied iteratively.</p><div class="example">
 
    <p>Consider the following markup fragment:</p>
@@ -879,9 +840,7 @@
   <code><a href="the-iframe-element.html#the-object-element">object</a></code>, <code><a href="video.html#video">video</a></code>, <code><a href="video.html#audio">audio</a></code>, and
   <code><a href="the-canvas-element.html#the-canvas-element">canvas</a></code> elements, and indirectly through elements in
   other namespaces that allow HTML to be further embedded therein,
-  like <code><a href="the-map-element.html#svg">svg</a></code> or <code><a href="the-map-element.html#math">math</a></code>).</p> <!-- example below
-  -->
-
+  like <code><a href="the-map-element.html#svg">svg</a></code> or <code><a href="the-map-element.html#math">math</a></code>).</p> 
   </div><p>A <a href="#paragraph">paragraph</a> is also formed explicitly by
   <code><a href="grouping-content.html#the-p-element">p</a></code> elements.</p><p class="note">The <code><a href="grouping-content.html#the-p-element">p</a></code> element can be used to wrap
   individual paragraphs when there would otherwise not be any content
@@ -917,9 +876,7 @@
 
   </div><div class="example">
 
-   <!-- I don't know if there's a better way to deal with this, but if
-   there is, let me know... -->
-
+   
    <p>It is possible for paragraphs to overlap when using certain
    elements that define fallback content. For example, in the
    following section:</p>
@@ -974,7 +931,7 @@
   generated by these characters do not start and end with different
   parent elements, and so that all such embeddings and overrides are
   explicitly terminated by a U+202C POP DIRECTIONAL FORMATTING
-  character. This helps reduces incidences of text being reused in a
+  character. This helps reduce incidences of text being reused in a
   manner that has unforeseen effects on the bidirectional
   algorithm.</p><p>The aforementioned restrictions are defined by specifying that
   certain parts of documents form <a href="#bidirectional-algorithm-formatting-character-ranges">bidirectional-algorithm
@@ -998,14 +955,20 @@
   prefer to use the <code title="attr-dir"><a href="elements.html#the-dir-attribute">dir</a></code> attribute, the
   <code><a href="text-level-semantics.html#the-bdo-element">bdo</a></code> element, and the <code><a href="text-level-semantics.html#the-bdi-element">bdi</a></code> element, rather
   than maintaining the bidirectional-algorithm formatting characters
-  manually.</p><h4 id="annotations-for-assistive-technology-products-aria"><span class="secno">3.2.7 </span><dfn>Annotations for assistive technology products</dfn> (ARIA)</h4><p class="XXX annotation"><span><a href="http://www.w3.org/html/wg/tracker/issues/109">ISSUE-109</a> (aria-section-title) and <a href="http://www.w3.org/html/wg/tracker/issues/129">ISSUE-129</a> (aria-mapping) block progress to Last Call</span></p><p>Authors may use the ARIA <code title="attr-aria-role">role</code>
+  manually.</p><h4 id="wai-aria"><span class="secno">3.2.7 </span><dfn>WAI-ARIA</dfn></h4><p>Authors may use the ARIA <code title="attr-aria-role">role</code>
   and <code title="attr-aria-*">aria-*</code> attributes on <a href="infrastructure.html#html-elements">HTML
   elements</a>, in accordance with the requirements described in
   the ARIA specifications, except where these conflict with the
-  <span>strong native semantics</span> described below. These
+  <span>strong native semantics</span> or are equal to the
+  <span>default implied ARIA semantics</span> described below. These
   exceptions are intended to prevent authors from making assistive
   technology products report nonsensical states that do not represent
-  the actual state of the document. <a href="references.html#refsARIA">[ARIA]</a></p><div class="impl">
+  the actual state of the document. <a href="references.html#refsARIA">[ARIA]</a></p><p>Authors must not set the ARIA <code title="attr-aria-role">role</code> and <code title="attr-aria-*">aria-*</code> attributes in a manner that
+  conflicts with the semantics described in the following table,
+  except that the <code title="attr-aria-role-presentation">presentation</code> role may
+  always be used. Authors must not set the ARIA <code title="attr-aria-role">role</code> and <code title="attr-aria-*">aria-*</code> attributes to values that match
+  the <span>default implicit ARIA semantics</span> defined in the
+  following two tables.</p><div class="impl">
 
   <p>User agents are required to implement ARIA semantics on all
   <a href="infrastructure.html#html-elements">HTML elements</a>, as defined in the ARIA
@@ -1013,31 +976,21 @@
   below must be recognized by implementations. <a href="references.html#refsARIAIMPL">[ARIAIMPL]</a></p>
 
   </div><p>The following table defines the <span>strong native
-  semantics</span> <span class="impl">and corresponding <span>implicit
-  ARIA semantics</span></span> that apply to <a href="infrastructure.html#html-elements">HTML
-  elements</a>. Each language feature (element or attribute) in a
-  cell in the first column implies the ARIA semantics (role, states,
-  and/or properties) given in the cell in the second column of the
-  same row. Authors must not set the ARIA <code title="attr-aria-role">role</code> and <code title="attr-aria-*">aria-*</code> attributes in a manner that
-  conflicts with the semantics described in the following table,
-  except that the <code title="attr-aria-role-presentation">presentation</code> role may
-  always be used. <span class="impl">When multiple rows apply to an
-  element, the role from the last row to define a role must be
-  applied, and the states and properties from all the rows must be
-  combined.</span></p><table id="table-aria-strong"><thead><tr><th>Language feature
-     </th><th>Strong native semantics <span class="impl">and implied ARIA semantics</span>
-
-   </th></tr></thead><tbody><tr><td><code><a href="semantics.html#the-base-element">base</a></code> element
-     </td><td>No role
-
-    </td></tr><tr><td><code><a href="text-level-semantics.html#the-a-element">a</a></code> element that creates a <a href="links.html#hyperlink">hyperlink</a>
-     </td><td><code title="attr-aria-role-link">link</code> role
+  semantics</span> and corresponding <span>default implicit ARIA
+  semantics</span> that apply to <a href="infrastructure.html#html-elements">HTML elements</a>. Each
+  language feature (element or attribute) in a cell in the first
+  column implies the ARIA semantics (role, states, and/or properties)
+  given in the cell in the second column of the same row. <span class="impl">When multiple rows apply to an element, the role from
+  the last row to define a role must be applied, and the states and
+  properties from all the rows must be combined.</span></p><table id="table-aria-strong"><thead><tr><th>Language feature
+     </th><th>Strong native semantics and default implied ARIA semantics
 
-    </td></tr><tr><td><code><a href="the-map-element.html#the-area-element">area</a></code> element that creates a <a href="links.html#hyperlink">hyperlink</a>
+   </th></tr></thead><tbody><tr><td><code><a href="the-map-element.html#the-area-element">area</a></code> element that creates a <a href="links.html#hyperlink">hyperlink</a>
      </td><td><code title="attr-aria-role-link">link</code> role
+     
 
-    </td></tr><tr><td><code><a href="the-button-element.html#the-button-element">button</a></code> element
-     </td><td><code title="attr-aria-role-button">button</code> role
+    </td></tr><tr><td><code><a href="semantics.html#the-base-element">base</a></code> element
+     </td><td>No role
 
     </td></tr><tr><td><code><a href="the-button-element.html#the-datalist-element">datalist</a></code> element
      </td><td><code title="attr-aria-role-listbox">listbox</code> role, with the <code title="attr-aria-multiselectable">aria-multiselectable</code> property set to "false"
@@ -1045,23 +998,6 @@
     </td></tr><tr><td><code><a href="interactive-elements.html#the-details-element">details</a></code> element
      </td><td><code title="attr-aria-expanded">aria-expanded</code> state set to "true" if the element's <code title="attr-details-open"><a href="interactive-elements.html#attr-details-open">open</a></code> attribute is present, and set to "false" otherwise
 
-    </td></tr><tr><td><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h1</a></code> element that does not have an <code><a href="sections.html#the-hgroup-element">hgroup</a></code> ancestor
-     </td><td><code title="attr-aria-role-heading">heading</code> role, with the <code title="attr-aria-level">aria-level</code> property set to the element's <a href="sections.html#outline-depth">outline depth</a>
-
-    </td></tr><tr><td><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h2</a></code> element that does not have an <code><a href="sections.html#the-hgroup-element">hgroup</a></code> ancestor
-     </td><td><code title="attr-aria-role-heading">heading</code> role, with the <code title="attr-aria-level">aria-level</code> property set to the element's <a href="sections.html#outline-depth">outline depth</a>
-
-    </td></tr><tr><td><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h3</a></code> element that does not have an <code><a href="sections.html#the-hgroup-element">hgroup</a></code> ancestor
-     </td><td><code title="attr-aria-role-heading">heading</code> role, with the <code title="attr-aria-level">aria-level</code> property set to the element's <a href="sections.html#outline-depth">outline depth</a>
-
-    </td></tr><tr><td><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h4</a></code> element that does not have an <code><a href="sections.html#the-hgroup-element">hgroup</a></code> ancestor
-     </td><td><code title="attr-aria-role-heading">heading</code> role, with the <code title="attr-aria-level">aria-level</code> property set to the element's <a href="sections.html#outline-depth">outline depth</a>
-
-    </td></tr><tr><td><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h5</a></code> element that does not have an <code><a href="sections.html#the-hgroup-element">hgroup</a></code> ancestor
-     </td><td><code title="attr-aria-role-heading">heading</code> role, with the <code title="attr-aria-level">aria-level</code> property set to the element's <a href="sections.html#outline-depth">outline depth</a>
-
-    </td></tr><tr><td><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h6</a></code> element that does not have an <code><a href="sections.html#the-hgroup-element">hgroup</a></code> ancestor
-     </td><td><code title="attr-aria-role-heading">heading</code> role, with the <code title="attr-aria-level">aria-level</code> property set to the element's <a href="sections.html#outline-depth">outline depth</a>
 
     </td></tr><tr><td><code><a href="semantics.html#the-head-element-0">head</a></code> element
      </td><td>No role
@@ -1078,9 +1014,6 @@
     </td></tr><tr><td><code><a href="embedded-content-1.html#the-img-element">img</a></code> element whose <code title="attr-img-alt"><a href="embedded-content-1.html#attr-img-alt">alt</a></code> attribute's value is empty
      </td><td><code title="attr-aria-role-presentation">presentation</code> role
 
-    </td></tr><tr><td><code><a href="the-input-element.html#the-input-element">input</a></code> element with a <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute in the <a href="number-state.html#button-state" title="attr-input-type-button">Button</a> state
-     </td><td><code title="attr-aria-role-button">button</code> role
-
     </td></tr><tr><td><code><a href="the-input-element.html#the-input-element">input</a></code> element with a <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute in the <a href="number-state.html#checkbox-state" title="attr-input-type-checkbox">Checkbox</a> state
      </td><td><code title="attr-aria-checked">aria-checked</code> state set to "mixed" if the element's <code title="dom-input-indeterminate"><a href="the-input-element.html#dom-input-indeterminate">indeterminate</a></code> IDL attribute is true, or "true" if the element's <a href="association-of-controls-and-forms.html#concept-fe-checked" title="concept-fe-checked">checkedness</a> is true, or "false" otherwise
 
@@ -1105,9 +1038,6 @@
     </td></tr><tr><td><code><a href="the-input-element.html#the-input-element">input</a></code> element with a <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute in the <a href="states-of-the-type-attribute.html#hidden-state" title="attr-input-type-hidden">Hidden</a> state
      </td><td>No role
 
-    </td></tr><tr><td><code><a href="the-input-element.html#the-input-element">input</a></code> element with a <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute in the <a href="number-state.html#image-button-state" title="attr-input-type-image">Image Button</a> state
-     </td><td><code title="attr-aria-role-button">button</code> role
-
     </td></tr><tr><td><code><a href="the-input-element.html#the-input-element">input</a></code> element with a <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute in the <a href="states-of-the-type-attribute.html#month-state" title="attr-input-type-month">Month</a> state
      </td><td>No role, with the <code title="title-aria-readonly">aria-readonly</code> state set to "true" if the element has a <code title="attr-input-readonly"><a href="common-input-element-attributes.html#attr-input-readonly">readonly</a></code> attribute
 
@@ -1244,19 +1174,24 @@
      </td><td>The <code title="title-aria-invalid">aria-invalid</code> state set to "true"
 
   </td></tr></tbody></table><p>Some <a href="infrastructure.html#html-elements">HTML elements</a> have native semantics that can be
-  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 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
-  element may be given the <code title="attr-aria-role-presentation">presentation</code> role,
+  overridden. The following table lists these elements and their
+  <span>default implicit ARIA semantics</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 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 element may be
+  given the <code title="attr-aria-role-presentation">presentation</code> role,
   regardless of the restrictions below.</p><table id="table-aria-weak"><thead><tr><th>Language feature
      </th><th>Default implied ARIA semantic
      </th><th>Restrictions
 
-   </th></tr></thead><tbody><tr><td><code><a href="sections.html#the-address-element">address</a></code> element
+   </th></tr></thead><tbody><tr><td><code><a href="text-level-semantics.html#the-a-element">a</a></code> element that creates a <a href="links.html#hyperlink">hyperlink</a>
+     </td><td><code title="attr-aria-role-link">link</code> role
+     </td><td>Role must be either <code title="attr-aria-role-link">link</code>, <code title="attr-aria-role-button">button</code>, <code title="attr-aria-role-checkbox">checkbox</code>, <code title="attr-aria-role-menuitem">menuitem</code>, <code title="attr-aria-role-menuitemcheckbox">menuitemcheckbox</code>, <code title="attr-aria-role-menuitemradio">menuitemradio</code>, <code title="attr-aria-role-tab">tab</code>, or <code title="attr-aria-role-treeitem">treeitem</code>
+
+    </td></tr><tr><td><code><a href="sections.html#the-address-element">address</a></code> element
      </td><td>No role
      </td><td>If specified, role must be <code title="attr-aria-role-contentinfo">contentinfo</code>
 
@@ -1272,6 +1207,10 @@
      </td><td>No role
      </td><td>If specified, role must be <code title="attr-aria-role-application">application</code>
 
+    </td></tr><tr><td><code><a href="the-button-element.html#the-button-element">button</a></code> element
+     </td><td><code title="attr-aria-role-button">button</code> role
+     </td><td>Role must be either <code title="attr-aria-role-button">button</code>, <code title="attr-aria-role-link">link</code>, <code title="attr-aria-role-menuitem">menuitem</code>, <code title="attr-aria-role-menuitemcheckbox">menuitemcheckbox</code>, <code title="attr-aria-role-menuitemradio">menuitemradio</code>, <code title="attr-aria-role-radio">radio</code>
+
     </td></tr><tr><td><code><a href="interactive-elements.html#the-details-element">details</a></code> element
      </td><td><code title="attr-aria-role-group">group</code> role
      </td><td>Role must be a role that supports <code title="attr-aria-expanded">aria-expanded</code>
@@ -1284,6 +1223,30 @@
      </td><td>No role
      </td><td>If specified, role must be <code title="attr-aria-role-contentinfo">contentinfo</code>
 
+    </td></tr><tr><td><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h1</a></code> element that does not have an <code><a href="sections.html#the-hgroup-element">hgroup</a></code> ancestor
+     </td><td><code title="attr-aria-role-heading">heading</code> role, with the <code title="attr-aria-level">aria-level</code> property set to the element's <a href="sections.html#outline-depth">outline depth</a>
+     </td><td>Role must be either <code title="attr-aria-role-link">link</code>, <code title="attr-aria-role-menuitem">menuitem</code>, <code title="attr-aria-role-menuitemcheckbox">menuitemcheckbox</code>, <code title="attr-aria-role-menuitemradio">menuitemradio</code>, <code title="attr-aria-role-tab">tab</code>, or <code title="attr-aria-role-treeitem">treeitem</code>
+
+    </td></tr><tr><td><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h2</a></code> element that does not have an <code><a href="sections.html#the-hgroup-element">hgroup</a></code> ancestor
+     </td><td><code title="attr-aria-role-heading">heading</code> role, with the <code title="attr-aria-level">aria-level</code> property set to the element's <a href="sections.html#outline-depth">outline depth</a>
+     </td><td>Role must be either <code title="attr-aria-role-link">link</code>, <code title="attr-aria-role-menuitem">menuitem</code>, <code title="attr-aria-role-menuitemcheckbox">menuitemcheckbox</code>, <code title="attr-aria-role-menuitemradio">menuitemradio</code>, <code title="attr-aria-role-tab">tab</code>, or <code title="attr-aria-role-treeitem">treeitem</code>
+
+    </td></tr><tr><td><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h3</a></code> element that does not have an <code><a href="sections.html#the-hgroup-element">hgroup</a></code> ancestor
+     </td><td><code title="attr-aria-role-heading">heading</code> role, with the <code title="attr-aria-level">aria-level</code> property set to the element's <a href="sections.html#outline-depth">outline depth</a>
+     </td><td>Role must be either <code title="attr-aria-role-link">link</code>, <code title="attr-aria-role-menuitem">menuitem</code>, <code title="attr-aria-role-menuitemcheckbox">menuitemcheckbox</code>, <code title="attr-aria-role-menuitemradio">menuitemradio</code>, <code title="attr-aria-role-tab">tab</code>, or <code title="attr-aria-role-treeitem">treeitem</code>
+
+    </td></tr><tr><td><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h4</a></code> element that does not have an <code><a href="sections.html#the-hgroup-element">hgroup</a></code> ancestor
+     </td><td><code title="attr-aria-role-heading">heading</code> role, with the <code title="attr-aria-level">aria-level</code> property set to the element's <a href="sections.html#outline-depth">outline depth</a>
+     </td><td>Role must be either <code title="attr-aria-role-link">link</code>, <code title="attr-aria-role-menuitem">menuitem</code>, <code title="attr-aria-role-menuitemcheckbox">menuitemcheckbox</code>, <code title="attr-aria-role-menuitemradio">menuitemradio</code>, <code title="attr-aria-role-tab">tab</code>, or <code title="attr-aria-role-treeitem">treeitem</code>
+
+    </td></tr><tr><td><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h5</a></code> element that does not have an <code><a href="sections.html#the-hgroup-element">hgroup</a></code> ancestor
+     </td><td><code title="attr-aria-role-heading">heading</code> role, with the <code title="attr-aria-level">aria-level</code> property set to the element's <a href="sections.html#outline-depth">outline depth</a>
+     </td><td>Role must be either <code title="attr-aria-role-link">link</code>, <code title="attr-aria-role-menuitem">menuitem</code>, <code title="attr-aria-role-menuitemcheckbox">menuitemcheckbox</code>, <code title="attr-aria-role-menuitemradio">menuitemradio</code>, <code title="attr-aria-role-tab">tab</code>, or <code title="attr-aria-role-treeitem">treeitem</code>
+
+    </td></tr><tr><td><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h6</a></code> element that does not have an <code><a href="sections.html#the-hgroup-element">hgroup</a></code> ancestor
+     </td><td><code title="attr-aria-role-heading">heading</code> role, with the <code title="attr-aria-level">aria-level</code> property set to the element's <a href="sections.html#outline-depth">outline depth</a>
+     </td><td>Role must be either <code title="attr-aria-role-link">link</code>, <code title="attr-aria-role-menuitem">menuitem</code>, <code title="attr-aria-role-menuitemcheckbox">menuitemcheckbox</code>, <code title="attr-aria-role-menuitemradio">menuitemradio</code>, <code title="attr-aria-role-tab">tab</code>, or <code title="attr-aria-role-treeitem">treeitem</code>
+
     </td></tr><tr><td><code><a href="sections.html#the-header-element">header</a></code> element
      </td><td>No role
      </td><td>If specified, role must be <code title="attr-aria-role-banner">banner</code>
@@ -1296,10 +1259,22 @@
      </td><td><code title="attr-aria-role-img">img</code> role
      </td><td>No restrictions
 
+    </td></tr><tr><td><code><a href="embedded-content-1.html#the-img-element">img</a></code> element whose <code title="attr-img-alt"><a href="embedded-content-1.html#attr-img-alt">alt</a></code> attribute's value is present and not empty
+     </td><td><code title="attr-aria-role-img">img</code> role
+     </td><td>No restrictions
+
+    </td></tr><tr><td><code><a href="the-input-element.html#the-input-element">input</a></code> element with a <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute in the <a href="number-state.html#button-state" title="attr-input-type-button">Button</a> state
+     </td><td><code title="attr-aria-role-button">button</code> role
+     </td><td>Role must be either <code title="attr-aria-role-button">button</code>, <code title="attr-aria-role-link">link</code>, <code title="attr-aria-role-menuitem">menuitem</code>, <code title="attr-aria-role-menuitemcheckbox">menuitemcheckbox</code>, <code title="attr-aria-role-menuitemradio">menuitemradio</code>, <code title="attr-aria-role-radio">radio</code>
+
     </td></tr><tr><td><code><a href="the-input-element.html#the-input-element">input</a></code> element with a <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute in the <a href="number-state.html#checkbox-state" title="attr-input-type-checkbox">Checkbox</a> state
      </td><td><code title="attr-aria-role-checkbox">checkbox</code> role
      </td><td>Role must be either <code title="attr-aria-role-checkbox">checkbox</code> or <code title="attr-aria-role-menuitemcheckbox">menuitemcheckbox</code>
 
+    </td></tr><tr><td><code><a href="the-input-element.html#the-input-element">input</a></code> element with a <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute in the <a href="number-state.html#image-button-state" title="attr-input-type-image">Image Button</a> state
+     </td><td><code title="attr-aria-role-button">button</code> role
+     </td><td>Role must be either <code title="attr-aria-role-button">button</code>, <code title="attr-aria-role-link">link</code>, <code title="attr-aria-role-menuitem">menuitem</code>, <code title="attr-aria-role-menuitemcheckbox">menuitemcheckbox</code>, <code title="attr-aria-role-menuitemradio">menuitemradio</code>, <code title="attr-aria-role-radio">radio</code>
+
     </td></tr><tr><td><code><a href="the-input-element.html#the-input-element">input</a></code> element with a <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute in the <a href="number-state.html#radio-button-state" title="attr-input-type-radio">Radio Button</a> state
      </td><td><code title="attr-aria-role-radio">radio</code> role
      </td><td>Role must be either <code title="attr-aria-role-radio">radio</code> or <code title="attr-aria-role-menuitemradio">menuitemradio</code>
@@ -1310,7 +1285,7 @@
 
     </td></tr><tr><td><code><a href="the-iframe-element.html#the-object-element">object</a></code> element
      </td><td>No role
-     </td><td>If specified, role must be either <code title="attr-aria-role-application">application</code>, <code title="attr-aria-role-document">document</code>, or <code title="attr-aria-role-img">image</code>
+     </td><td>If specified, role must be either <code title="attr-aria-role-application">application</code>, <code title="attr-aria-role-document">document</code>, or <code title="attr-aria-role-img">img</code>
 
     </td></tr><tr><td><code><a href="grouping-content.html#the-ol-element">ol</a></code> element
      </td><td><code title="attr-aria-role-list">list</code> role
@@ -1350,6 +1325,16 @@
 
   </td></tr></tbody></table><div class="impl">
 
+  <p>The WAI-ARIA specification neither requires or forbids user
+  agents from enhancing native presentation and interaction behaviors
+  on the basis of WAI- ARIA markup. Even mainstream user agents might
+  choose to expose metadata or navigational features directly or via
+  user-installed extensions; for example, exposing required form
+  fields or landmark navigation. User agents are encouraged to
+  maximize their usefulness to users, including users without
+  disabilities.</p>
+<!-- EDITORIAL -->
+
   <p>Conformance checkers are encouraged to phrase errors such that
   authors are encouraged to use more appropriate elements rather than
   remove accessibility annotations. For example, if an <code><a href="text-level-semantics.html#the-a-element">a</a></code>
@@ -1369,7 +1354,7 @@
    features described in this section, one can instead make the ATs
    skip the ASCII art and just read the caption:</p>
 
-   <pre>&lt;figure <strong>role="img" aria-labelledby="fish-caption"</strong>&gt; <!-- that's "labelled" with TWO "l"s -->
+   <pre>&lt;figure <strong>role="img" aria-labelledby="fish-caption"</strong>&gt; 
  &lt;pre&gt;
  o           .'`/
      '      /  (
@@ -1387,6 +1372,6 @@
 &lt;/figure&gt; 
    </pre>
 
-   <!-- source: http://www.geocities.com/SoHo/7373/aquatic.htm#fish -->
+   
 
   </div></body></html>

Index: states-of-the-type-attribute.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/states-of-the-type-attribute.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- states-of-the-type-attribute.html	25 Feb 2011 07:05:30 -0000	1.7
+++ states-of-the-type-attribute.html	30 Apr 2011 11:35:46 -0000	1.8
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>4.10.7.1 States of the type attribute &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -418,9 +414,7 @@
 
    <p>The <code class="no-backref" title="event-input-input"><a href="common-input-element-attributes.html#event-input-input">input</a></code> and <code class="no-backref" title="event-input-change"><a href="common-input-element-attributes.html#event-input-change">change</a></code> events do not apply.</p>
 
-  </div><h6 id="text-state-and-search-state"><span class="secno">4.10.7.1.2 </span><dfn title="attr-input-type-text">Text</dfn> state and <dfn title="attr-input-type-search">Search</dfn> state</h6><!-- v2 idea: applying input masks to <input>, e.g. for entering
-       data with slashes and dashes (ack Greg Kilwein)
-  --><div class="impl">
+  </div><h6 id="text-state-and-search-state"><span class="secno">4.10.7.1.2 </span><dfn title="attr-input-type-text">Text</dfn> state and <dfn title="attr-input-type-search">Search</dfn> state</h6><div class="impl">
 
   <p>When an <code><a href="the-input-element.html#the-input-element">input</a></code> element's <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute is in the <a href="#text-state-and-search-state" title="attr-input-type-text">Text</a> state or the <a href="#text-state-and-search-state" title="attr-input-type-search">Search</a> state, the rules in
   this section apply.</p>
@@ -438,8 +432,8 @@
   FEED (LF) or U+000D CARRIAGE RETURN (CR) characters into the
   element's <a href="association-of-controls-and-forms.html#concept-fe-value" title="concept-fe-value">value</a>.</p>
 
-  <!-- this next bit is also in the <textarea> section -->
-  <!-- and something similar is in the session history section -->
+  
+  
   <p>If the element is <i title="concept-input-mutable"><a href="the-input-element.html#concept-input-mutable">mutable</a></i>,
   the user agent should allow the user to change the writing direction
   of the element, setting it either to a left-to-right writing
@@ -451,11 +445,9 @@
    selected a left-to-right writing direction, and "<code title="attr-dir-rtl"><a href="elements.html#attr-dir-rtl">rtl</a></code>" if the user selected a
    right-to-left writing direction.</p></li>
 
-   <li><p><a href="webappapis.html#queue-a-task">Queue a task</a> to first <a href="webappapis.html#fire-a-simple-event">fire a simple
-   event</a> that bubbles named <code title="event-input">input</code> at the <code><a href="the-input-element.html#the-input-element">input</a></code> element,
-   and to then <a href="association-of-controls-and-forms.html#broadcast-forminput-events">broadcast <code title="event-forminput">forminput</code> events</a> from the
-   <code><a href="the-input-element.html#the-input-element">input</a></code> element's <a href="association-of-controls-and-forms.html#form-owner">form owner</a>, if
-   any.</p></li>
+   <li><p><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> that bubbles named <code title="event-input">input</code> at the <code><a href="the-input-element.html#the-input-element">input</a></code>
+   element.</p></li>
 
   </ol></div><p>The <code title="attr-input-value"><a href="the-input-element.html#attr-input-value">value</a></code> attribute, if
   specified, must have a value that contains no U+000A LINE FEED (LF)
@@ -749,8 +741,9 @@
     agents must not allow users to insert U+000A LINE FEED (LF) or
     U+000D CARRIAGE RETURN (CR) characters into the <a href="association-of-controls-and-forms.html#concept-fe-value" title="concept-fe-value">value</a>. User agents may transform
     the <a href="association-of-controls-and-forms.html#concept-fe-value" title="concept-fe-value">value</a> for display and
-    editing (e.g. converting punycode in the <a href="association-of-controls-and-forms.html#concept-fe-value" title="concept-fe-value">value</a> to IDN in the display and
-    vice versa).</p>
+    editing; in particular, user agents should convert punycode in the
+    <a href="association-of-controls-and-forms.html#concept-fe-value" title="concept-fe-value">value</a> to IDN in the display
+    and vice versa.</p>
 
     </div>
 
@@ -804,8 +797,9 @@
     characters. User agents should allow the user to remove all the
     addresses in the element's <a href="association-of-controls-and-forms.html#concept-fe-values" title="concept-fe-values">value<em>s</em></a>. User agents may
     transform the <a href="association-of-controls-and-forms.html#concept-fe-values" title="concept-fe-values">value<em>s</em></a> for display and
-    editing (e.g. converting punycode in the <a href="association-of-controls-and-forms.html#concept-fe-values" title="concept-fe-values">value<em>s</em></a> to IDN in the
-    display and vice versa).</p>
+    editing; in particular, user agents should convert punycode in the
+    <a href="association-of-controls-and-forms.html#concept-fe-value" title="concept-fe-value">value</a> to IDN in the display
+    and vice versa.</p>
 
     <p>Whenever the user changes the element's <a href="association-of-controls-and-forms.html#concept-fe-value" title="concept-fe-value">value<em>s</em></a>, the user agent
     must run the following steps:</p>
@@ -813,10 +807,7 @@
     <ol><li><p>Let <var title="">latest values</var> be a copy of the
      element's <a href="association-of-controls-and-forms.html#concept-fe-value" title="concept-fe-value">value<em>s</em></a>.</p></li>
 
-     <!-- It's a copy because /values/ might include leading and
-     trailing spaces that we don't necessarily want to remove from the
-     UI but that we do want to remove before serialising. -->
-
+     
      <li><p><a href="common-microsyntaxes.html#strip-leading-and-trailing-whitespace">Strip leading and trailing whitespace</a> from
      each value in <var title="">latest values</var>.</p></li>
 
@@ -865,8 +856,7 @@
   ABNF production <code title="">1*(&#xA0;atext&#xA0;/&#xA0;"."&#xA0;)&#xA0;"@"&#xA0;ldh-str&#xA0;*(&#xA0;"."&#xA0;ldh-str&#xA0;)</code>
   where <code title="">atext</code> is defined in RFC 5322 section
   3.2.3, and <code title="">ldh-str</code> is defined in RFC 1034
-  section 3.5. <a href="references.html#refsABNF">[ABNF]</a> <a href="references.html#refsRFC5322">[RFC5322]</a> <a href="references.html#refsRFC1034">[RFC1034]</a></p><!-- Domain syntax based on
-  section 3.5 of [RFC1034] and section 2.1 of [RFC1123] --><p class="note">This requirement is a <a href="introduction.html#willful-violation">willful violation</a>
+  section 3.5. <a href="references.html#refsABNF">[ABNF]</a> <a href="references.html#refsRFC5322">[RFC5322]</a> <a href="references.html#refsRFC1034">[RFC1034]</a></p><p class="note">This requirement is a <a href="introduction.html#willful-violation">willful violation</a>
   of RFC 5322, which defines a syntax for e-mail addresses that is
   simultaneously too strict (before the "@" character), too vague
   (after the "@" character), and too lax (allowing comments, white
@@ -1039,8 +1029,7 @@
   interfaces that present dates and times according to the conventions
   of the user's preferred locale.</p><p>The <code title="attr-input-value"><a href="the-input-element.html#attr-input-value">value</a></code> attribute, if
   specified, must have a value that is a <a href="common-microsyntaxes.html#valid-global-date-and-time-string">valid global date and
-  time string</a>.</p><!-- ok to set out-of-range value, we never
-  know when we might have to represent bogus input --><div class="impl">
+  time string</a>.</p><div class="impl">
 
   <p><strong>The <a href="the-input-element.html#value-sanitization-algorithm">value sanitization algorithm</a> is as
   follows</strong>: If the <a href="association-of-controls-and-forms.html#concept-fe-value" title="concept-fe-value">value</a>
@@ -1185,8 +1174,7 @@
   interfaces that present dates according to the conventions of the
   user's preferred locale.</p><p>The <code title="attr-input-value"><a href="the-input-element.html#attr-input-value">value</a></code> attribute, if
   specified, must have a value that is a <a href="common-microsyntaxes.html#valid-date-string">valid date
-  string</a>.</p><!-- ok to set out-of-range value, we never know
-  when we might have to represent bogus input --><div class="impl">
+  string</a>.</p><div class="impl">
 
   <p><strong>The <a href="the-input-element.html#value-sanitization-algorithm">value sanitization algorithm</a> is as
   follows</strong>: If the <a href="association-of-controls-and-forms.html#concept-fe-value" title="concept-fe-value">value</a>
@@ -1313,8 +1301,7 @@
   interfaces that present months according to the conventions of the
   user's preferred locale.</p><p>The <code title="attr-input-value"><a href="the-input-element.html#attr-input-value">value</a></code> attribute, if
   specified, must have a value that is a <a href="common-microsyntaxes.html#valid-month-string">valid month
-  string</a>.</p><!-- ok to set out-of-range value, we never know
-  when we might have to represent bogus input --><div class="impl">
+  string</a>.</p><div class="impl">
 
   <p><strong>The <a href="the-input-element.html#value-sanitization-algorithm">value sanitization algorithm</a> is as
   follows</strong>: If the <a href="association-of-controls-and-forms.html#concept-fe-value" title="concept-fe-value">value</a>
@@ -1349,10 +1336,7 @@
   has <var title="">input</var> months between it and January
   1970.</p>
 
-  <!-- note - it doesn't matter exactly how many months are "between"
-  two months, so long as the UA implements this consistently. The
-  number is never actually exposed. -->
-
+  
   <p><strong>The <a href="the-input-element.html#concept-input-value-string-date" title="concept-input-value-string-date">algorithm to convert a
   string to a <code>Date</code> object</a>, given a string <var title="">input</var>, is as follows</strong>: If <a href="common-microsyntaxes.html#parse-a-month-string" title="parse&#10;  a month string">parsing a month</a> from <var title="">input</var> results in an error, then return an error;
   otherwise, return a <code>Date</code> object representing midnight
@@ -1441,8 +1425,7 @@
   interfaces that present weeks according to the conventions of the
   user's preferred locale.</p><p>The <code title="attr-input-value"><a href="the-input-element.html#attr-input-value">value</a></code> attribute, if
   specified, must have a value that is a <a href="common-microsyntaxes.html#valid-week-string">valid week
-  string</a>.</p><!-- ok to set out-of-range value, we never know
-  when we might have to represent bogus input --><div class="impl">
+  string</a>.</p><div class="impl">
 
   <p><strong>The <a href="the-input-element.html#value-sanitization-algorithm">value sanitization algorithm</a> is as
   follows</strong>: If the <a href="association-of-controls-and-forms.html#concept-fe-value" title="concept-fe-value">value</a>
@@ -1549,9 +1532,7 @@
    <code class="no-backref" title="dom-textarea/input-select"><a href="association-of-controls-and-forms.html#dom-textarea-input-select">select()</a></code> and
    <code class="no-backref" title="dom-textarea/input-setSelectionRange"><a href="association-of-controls-and-forms.html#dom-textarea-input-setselectionrange">setSelectionRange()</a></code> methods.</p>
 
-  </div><h6 id="time-state"><span class="secno">4.10.7.1.11 </span><dfn title="attr-input-type-time">Time</dfn> state</h6><!-- v2: allow min="" and max="" to be set such that the range
-  crosses midnight, as in <input type=time min="23:00" max="02:00">
-  (from http://www.w3.org/Bugs/Public/show_bug.cgi?id=7688) --><div class="impl">
+  </div><h6 id="time-state"><span class="secno">4.10.7.1.11 </span><dfn title="attr-input-type-time">Time</dfn> state</h6><div class="impl">
 
   <p>When an <code><a href="the-input-element.html#the-input-element">input</a></code> element's <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute is in the <a href="#time-state" title="attr-input-type-time">Time</a> state, the rules in this
   section apply.</p>
@@ -1573,8 +1554,7 @@
   interfaces that present times according to the conventions of the
   user's preferred locale.</p><p>The <code title="attr-input-value"><a href="the-input-element.html#attr-input-value">value</a></code> attribute, if
   specified, must have a value that is a <a href="common-microsyntaxes.html#valid-time-string">valid time
-  string</a>.</p><!-- ok to set out-of-range value, we never know
-  when we might have to represent bogus input --><div class="impl">
+  string</a>.</p><div class="impl">
 
   <p><strong>The <a href="the-input-element.html#value-sanitization-algorithm">value sanitization algorithm</a> is as
   follows</strong>: If the <a href="association-of-controls-and-forms.html#concept-fe-value" title="concept-fe-value">value</a>
@@ -1701,8 +1681,7 @@
   interfaces that present dates and times according to the conventions
   of the user's preferred locale.</p><p>The <code title="attr-input-value"><a href="the-input-element.html#attr-input-value">value</a></code> attribute, if
   specified, must have a value that is a <a href="common-microsyntaxes.html#valid-local-date-and-time-string">valid local date and
-  time string</a>.</p><!-- ok to set out-of-range value, we never
-  know when we might have to represent bogus input --><div class="impl">
+  time string</a>.</p><div class="impl">
 
   <p><strong>The <a href="the-input-element.html#value-sanitization-algorithm">value sanitization algorithm</a> is as
   follows</strong>: If the <a href="association-of-controls-and-forms.html#concept-fe-value" title="concept-fe-value">value</a>

Index: apis-in-html-documents.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/apis-in-html-documents.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- apis-in-html-documents.html	25 Feb 2011 07:05:27 -0000	1.8
+++ apis-in-html-documents.html	30 Apr 2011 11:35:43 -0000	1.9
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>3.3 APIs in HTML documents &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -461,8 +457,8 @@
   <h3 id="interactions-with-xpath-and-xslt"><span class="secno">3.4 </span>Interactions with XPath and XSLT</h3>
 
   <p id="xpath-1.0-processors">Implementations of XPath 1.0 that
-  operate on HTML documents parsed or created in the manners described
-  in this specification (e.g. as part of the <code title="">document.evaluate()</code> API) must act as if the
+  operate on <a href="dom.html#html-documents">HTML documents</a> parsed or created in the
+  manners described in this specification (e.g. as part of the <code title="">document.evaluate()</code> API) must act as if the
   following edit was applied to the XPath 1.0 specification.</p>
 
   <p>First, remove this paragraph:</p>
@@ -487,11 +483,9 @@
 
    <p>A QName in the node test is expanded into an expanded-name using
    the namespace declarations from the expression context. If the
-   QName has a prefix, then there must be a<!-- added 2009-10-27 -
-   http://www.w3.org/Bugs/Public/show_bug.cgi?id=8062 --> namespace
+   QName has a prefix, then there must be a namespace
    declaration for this prefix in the expression context, and the
-   corresponding<!-- typo fixed 2009-10-27 -
-   http://www.w3.org/Bugs/Public/show_bug.cgi?id=8063 --> namespace
+   corresponding namespace
    URI is the one that is associated with this prefix.  It is an error
    if the QName has a prefix for which there is no namespace
    declaration in the expression context. </p>
@@ -524,9 +518,7 @@
   the XPath 1.0 specification, motivated by desire to have
   implementations be compatible with legacy content while still
   supporting the changes that this specification introduces to HTML
-  regarding which namespace is used for HTML elements. <a href="references.html#refsXPATH10">[XPATH10]</a></p> <!-- note: version matters for
-  this ref -->
-
+  regarding which namespace is used for HTML elements. <a href="references.html#refsXPATH10">[XPATH10]</a></p> 
   <hr/><p id="dom-based-xslt-1.0-processors">XSLT 1.0 processors outputting
   to a DOM when the output method is "html" (either explicitly or via
   the defaulting rule in XSLT 1.0) are affected as follows:</p>
@@ -543,9 +535,7 @@
   changes the namespaces and case-sensitivity rules of HTML in a
   manner that would otherwise be incompatible with DOM-based XSLT
   transformations. (Processors that serialize the output are
-  unaffected.) <a href="references.html#refsXSLT10">[XSLT10]</a></p> <!-- note:
-  version matters for this ref -->
-
+  unaffected.) <a href="references.html#refsXSLT10">[XSLT10]</a></p> 
   </div><h3 id="dynamic-markup-insertion"><span class="secno">3.5 </span><dfn>Dynamic markup insertion</dfn></h3><p class="note">APIs for dynamically inserting markup into the
   document interact with the parser, and thus their behavior varies
   depending on whether they are used with <a href="dom.html#html-documents">HTML documents</a>
@@ -644,14 +634,9 @@
 
    </li><li><p>Remove any <a href="webappapis.html#concept-task" title="concept-task">tasks</a>
    associated with the <code><a href="infrastructure.html#document">Document</a></code> in any <a href="webappapis.html#task-source">task
-   source</a>.</p></li> <!-- removes callbacks that fired between
-   this algorithm starting and the times and databases being aborted
-   in the "unload" step above -->
-
+   source</a>.</p></li> 
    <li><p>Remove all child nodes of the document, without firing any
-   mutation events.</p></li> <!-- as of 2009-03-30, only WebKit fired
-   mutation events here. -->
-
+   mutation events.</p></li> 
    <li><p>Replace the <code><a href="infrastructure.html#document">Document</a></code>'s singleton objects with
    new instances of those objects. (This includes in particular the
    <code><a href="browsers.html#window">Window</a></code>, <code><a href="history.html#location">Location</a></code>, <code><a href="history.html#history-0">History</a></code>,
@@ -663,8 +648,8 @@
    also includes all the Web IDL prototypes in the JavaScript binding,
    including the <code><a href="infrastructure.html#document">Document</a></code> object's prototype.)</p></li>
 
-   <!-- http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C!DOCTYPE%20html%3E...%3Ciframe%20src%3D%22document%22%3E%3C%2Fiframe%3E%0A%3Cscript%3Eonload%20%3D%20function%20()%20%7B%20f%20%3D%20document.getElementsByTagName('iframe')%5B0%5D%3B%20d%20%3D%20f.contentWindow.document%3B%20%7D%3C%2Fscript%3E%0A%3Cinput%20type%3Dbutton%20onclick%3D%22w(d.documentElement.innerHTML)%22%20value%3D%22dump%22%3E%0A%3Cinput%20type%3Dbutton%20onclick%3D%22d.open()%3B%20d.write('%3Cscript%3Evar%20x%20%3D%20new%20XMLHttpRequest()%3Bx.open(%26quot%3BGET%26quot%3B%2C%20%26quot%3BGET%26quot%3B)%3Bx.onreadystatechange%3Dfunction()%20%7B%20alert(x.readyState)%3B%20%7D%3Bx.send(null)%3B%3C%2Fscript%3E')%3Bd.close()%3B%20setTimeout(function()%20%7B%20d.open()%3B%20d.write('%3Cp%3Etest%3C%2Fp%3E')%3B%20d.close()%20%7D%2C%200)%3B%22%20value%3D%22xhr%22%3E%0A%3Cinput%20type%3Dbutton%20onclick%3D%22d.onclick%20%3D%20function()%20%7B%20w('click')%20%7D%22%20value%3D%22add%20click%20handler%22%3E%0A%3Cinput%20type%3Dbutton%20onclick%3D%22d.open()%3B%20d.write('%3Cp%3Etest%3C%2Fp%3E')%3B%20d.close()%22%20value%3D%22replace%22%3E%0A%3Cinput%20type%3Dbutton%20onclick%3D%22d.open()%3B%20d.write('%3Cp%3E%3Cscript%3Ei%20%3D%200%3B%20setTimeout(%26quot%3Bparent.w(i%2B%2B)%26quot%3B%2C%202000)%3C%2Fscript%3E%3C%2Fp%3E')%3B%20d.close()%22%20value%3D%22replace%20with%20timer%22%3E -->
-   <!-- http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C!DOCTYPE%20html%3E%0D%0A...%3Ciframe%3E%3C%2Fiframe%3E%0D%0A%3Cscript%3E%0D%0Aonload%20%3D%20function%20()%20%7B%0D%0A%20frames%5B0%5D.test%20%3D%201%0D%0A%20w(frames%5B0%5D.test)%3B%0D%0A%20var%20a%20%3D%20frames%5B0%5D.document.location.assign%3B%0D%0A%20w(a)%3B%0D%0A%20w(frames%5B0%5D.document.location.assign%20%3D%3D%3D%20a)%3B%0D%0A%20frames%5B0%5D.document.open()%3B%0D%0A%20frames%5B0%5D.document.write('%3Cscript%3Edocument.write(test)%3C%5C%2Fscript%3E')%3B%0D%0A%20frames%5B0%5D.document.close()%3B%0D%0A%20w(frames%5B0%5D.test)%3B%0D%0A%20w(frames%5B0%5D.document.location.assign%20%3D%3D%3D%20a)%3B%0D%0A%7D%0D%0A%3C%2Fscript%3E -->
+   
+   
 
    <li><p>Change the <a href="dom.html#document-s-character-encoding">document's character encoding</a> to
    UTF-8.</p></li>
@@ -688,7 +673,7 @@
 
    <li>
 
-    <!-- text/plain handling -->
+    
 
     <p>If the <var title="">type</var> string contains a U+003B
     SEMICOLON character (;), remove the first such character and all
@@ -700,19 +685,11 @@
     case-insensitive</a> match for the string
     "<code><a href="iana.html#text-html">text/html</a></code>", then act as if the tokenizer had emitted
     a start tag token with the tag name "pre" followed by a single
-    U+000A LINE FEED (LF) character<!-- to get eaten, so that a
-    leading LF in the written text doesn't get eaten itself-->, then
+    U+000A LINE FEED (LF) character, then
     switch the <a href="parsing.html#html-parser">HTML parser</a>'s tokenizer to the
     <a href="tokenization.html#plaintext-state">PLAINTEXT state</a>.</p>
 
-    <!--
- http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C!DOCTYPE%20html%3E...%3Ciframe%3E%3C%2Fiframe%3E%3Cscript%3Eonload%20%3D%20function%20()%20%7B%20%0D%0A%20%20var%20d%20%3D%20document.getElementsByTagName('iframe')%5B0%5D.contentDocument%3B%0D%0A%20%20d.open('image%2Fsvg%2Bxml')%3B%0D%0A%20%20d.write(%22%3Cinput%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxhtml'%20value%3D'(x)html'%2F%3E%22)%3B%0D%0A%20%20d.close()%3B%0D%0A%7D%3B%3C%2Fscript%3E
- http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C!DOCTYPE%20html%3E...%3Ciframe%3E%3C%2Fiframe%3E%3Cscript%3Eonload%20%3D%20function%20()%20%7B%20%0D%0A%20%20var%20d%20%3D%20document.getElementsByTagName('iframe')%5B0%5D.contentDocument%3B%0D%0A%20%20d.open('image%2Fgif')%3B%0D%0A%20%20var%20a%20%3D%20%5B%200x47%2C%200x49%2C%200x46%2C%200x38%2C%200x39%2C%200x61%2C%200x01%2C%200x00%2C%200x01%2C%200x00%2C%0D%0A%20%20%20%20%20%20%20%20%20%20%20%200x80%2C%200xff%2C%200x00%2C%200xc0%2C%200xc0%2C%200xc0%2C%200x00%2C%200x00%2C%200x00%2C%200x21%2C%0D%0A%20%20%20%20%20%20%20%20%20%20%20%200xf9%2C%200x04%2C%200x01%2C%200x00%2C%200x00%2C%200x00%2C%200x00%2C%200x2c%2C%200x00%2C%200x00%2C%0D%0A%20%20%20%20%20%20%20%20%20%20%20%200x00%2C%200x00%2C%200x01%2C%200x00%2C%200x01%2C%200x00%2C%200x00%2C%200x02%2C%200x02%2C%200x44%2C%0D%0A%20%20%20%20%20%20%20%20%20%20%20%200x01%2C%200x00%2C%200x3b%20%5D%3B%0D%0A%20%20var%20s%20%3D%20%22%22%3B%0D%0A%20%20for%20(var%20i%20%3D%200%3B%20i%20%3C%20a.length%3B%20i%20%2B%3D%201)%0D%0A%20%20%20%20s%20%2B%3D%20String.fromCharCode(a%5Bi%5D)%3B%0D%0A%20%20d.write(s)%3B%0D%0A%20%20d.close()%3B%0D%0A%7D%3B%3C%2Fscript%3E
- http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C!DOCTYPE%20html%3E...%3Ciframe%3E%3C%2Fiframe%3E%3Cscript%3Eonload%20%3D%20function%20()%20{%20%0A%20%20var%20d%20%3D%20document.getElementsByTagName(%27iframe%27)[0].contentDocument%3B%0A%20%20d.open(%27Text%2Fplain%27)%3B%0A%20%20d.write(%27%3Cb%3Etest%27)%3B%0A%20%20d.close()%3B%0A}%3B%3C%2Fscript%3E
- http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C!DOCTYPE%20html%3E...%3Ciframe%3E%3C%2Fiframe%3E%3Cscript%3Eonload%20%3D%20function%20()%20{%20%0A%20%20var%20d%20%3D%20document.getElementsByTagName(%27iframe%27)[0].contentDocument%3B%0A%20%20d.open(%27%20text%2Fplain%27)%3B%0A%20%20d.write(%27%3Cb%3Etest%27)%3B%0A%20%20d.close()%3B%0A}%3B%3C%2Fscript%3E
- http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C!DOCTYPE%20html%3E...%3Ciframe%3E%3C%2Fiframe%3E%3Cscript%3Eonload%20%3D%20function%20()%20{%20%0A%20%20var%20d%20%3D%20document.getElementsByTagName(%27iframe%27)[0].contentDocument%3B%0A%20%20d.open(%27text%2Fplain%3B%27)%3B%0A%20%20d.write(%27%3Cb%3Etest%27)%3B%0A%20%20d.close()%3B%0A}%3B%3C%2Fscript%3E
-    -->
-
+    
    </li>
 
    <li>
@@ -737,9 +714,12 @@
    entry, just before the last entry, and associate with the new entry
    the text that was parsed by the previous parser associated with the
    <code><a href="infrastructure.html#document">Document</a></code> object, as well as the state of the document
-   at the start of these steps. (This allows the user to step
-   backwards in the session history to see the page before it was
-   blown away by the <code title="dom-document-open"><a href="#dom-document-open">document.open()</a></code> call.)</p></li>
+   at the start of these steps. This allows the user to step backwards
+   in the session history to see the page before it was blown away by
+   the <code title="dom-document-open"><a href="#dom-document-open">document.open()</a></code> call.
+   This new entry does not have a <code><a href="infrastructure.html#document">Document</a></code> object, so a
+   new one will be created if the session history is traversed to that
+   entry.</p></li>
 
    <li><p>Finally, set the <a href="parsing.html#insertion-point">insertion point</a> to point at
    just before the end of the <a href="parsing.html#the-input-stream">input stream</a> (which at this
@@ -834,11 +814,7 @@
     document</a>, throw an <code><a href="common-dom-interfaces.html#invalid_state_err">INVALID_STATE_ERR</a></code>
     exception and abort these steps.</p>
 
-    <!--
-    Where would document.write() insert?
-    Consider: data:text/xml,<script xmlns="http://www.w3.org/1999/xhtml"><![CDATA[ document.write('<foo>Test</foo>'); ]]></script>
-    -->
-
+    
    </li>
 
    <li>

Index: obsolete.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/obsolete.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- obsolete.html	25 Feb 2011 07:05:29 -0000	1.7
+++ obsolete.html	30 Apr 2011 11:35:45 -0000	1.8
@@ -1,9 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "">
-<!-- when publishing, change bits marked ZZZ
-     ZZZ: Set PUB to 1 for TR/ drafts, 0 for dev drafts; PUB-Y lines are used if it's 1 and PUB-N lines if it's 0.
-     ZZZ: Set YEAR, SHORTDAY (month/day), and LONGDAY accordingly. They are used by the INSERT FOO bits below.
-  -->
 <html lang="en-US-x-Hixie" class="split chapter"><head><title>11 Obsolete features &#x2014; HTML5 </title><style type="text/css"><![CDATA[
    pre { margin-left: 2em; white-space: pre-wrap; }
    h2 { margin: 3em 0 1em 0; }
@@ -353,9 +349,7 @@
   <ol><li><a href="obsolete.html#obsolete-but-conforming-features"><span class="secno">11.1 </span>Obsolete but conforming features</a>
     <ol><li><a href="obsolete.html#warnings-for-obsolete-but-conforming-features"><span class="secno">11.1.1 </span>Warnings for obsolete but conforming features</a></li></ol></li><li><a href="obsolete.html#non-conforming-features"><span class="secno">11.2 </span>Non-conforming features</a></li><li><a href="obsolete.html#requirements-for-implementations"><span class="secno">11.3 </span>Requirements for implementations</a>
     <ol><li><a href="obsolete.html#the-applet-element"><span class="secno">11.3.1 </span>The <code>applet</code> element</a></li><li><a href="obsolete.html#the-marquee-element"><span class="secno">11.3.2 </span>The <code>marquee</code> element</a></li><li><a href="obsolete.html#frames"><span class="secno">11.3.3 </span>Frames</a></li><li><a href="obsolete.html#other-elements-attributes-and-apis"><span class="secno">11.3.4 </span>Other elements, attributes and APIs</a></li></ol></li></ol></li></ol></div><h2 id="obsolete"><span class="secno">11 </span>Obsolete features</h2><h3 id="obsolete-but-conforming-features"><span class="secno">11.1 </span>Obsolete but conforming features</h3><p>Features listed in this section will trigger warnings in
-  conformance checkers.</p><p>Authors should not specify an <code title="attr-meta-http-equiv"><a href="semantics.html#attr-meta-http-equiv">http-equiv</a></code> attribute in the
-  <a href="semantics.html#attr-meta-http-equiv-content-language" title="attr-meta-http-equiv-content-language">Content
-  Language</a> state on a <code><a href="semantics.html#meta">meta</a></code> element. The <code title="attr-lang"><a href="elements.html#attr-lang">lang</a></code> attribute should be used instead.</p><p>Authors should not specify a <code title="attr-img-border"><a href="#attr-img-border">border</a></code> attribute on an
+  conformance checkers.</p><p>Authors should not specify a <code title="attr-img-border"><a href="#attr-img-border">border</a></code> attribute on an
   <code><a href="embedded-content-1.html#the-img-element">img</a></code> element. If the attribute is present, its value
   must be the string "<code title="">0</code>". CSS should be used
   instead.</p><p>Authors should not specify a <code title="attr-script-language"><a href="#attr-script-language">language</a></code> attribute on a
@@ -378,9 +372,7 @@
   earlier versions of the language, this attribute was intended as a
   way to specify possible targets for fragment identifiers in <a href="urls.html#url" title="URL">URLs</a>. The <code title="attr-id"><a href="elements.html#the-id-attribute">id</a></code>
   attribute should be used instead.</p><p class="note">In <a href="syntax.html#syntax">the HTML syntax</a>, specifying a <a href="syntax.html#syntax-doctype" title="syntax-DOCTYPE">DOCTYPE</a> that is an <a href="syntax.html#obsolete-permitted-doctype">obsolete
-  permitted DOCTYPE</a> will also trigger a warning.</p><p class="note">The <code title="attr-table-summary"><a href="tabular-data.html#attr-table-summary">summary</a></code>
-  attribute, defined in the <code><a href="tabular-data.html#the-table-element">table</a></code> section, will also
-  trigger a warning.</p><div class="impl">
+  permitted DOCTYPE</a> will also trigger a warning.</p><div class="impl">
 
   <h4 id="warnings-for-obsolete-but-conforming-features"><span class="secno">11.1.1 </span>Warnings for obsolete but conforming features</h4>
 
@@ -397,13 +389,9 @@
   <p>The following features must be categorized as described
   above:</p>
 
-  <ul><!-- downplayed list --><li><p>The presence of an <a href="syntax.html#obsolete-permitted-doctype">obsolete permitted DOCTYPE</a>
+  <ul><li><p>The presence of an <a href="syntax.html#obsolete-permitted-doctype">obsolete permitted DOCTYPE</a>
    in an <a href="dom.html#html-documents" title="HTML documents">HTML document</a>.</p></li>
 
-   <li><p>The presence of a <code><a href="semantics.html#meta">meta</a></code> element with an <code title="attr-meta-http-equiv"><a href="semantics.html#attr-meta-http-equiv">http-equiv</a></code> attribute in the
-   <a href="semantics.html#attr-meta-http-equiv-content-language" title="attr-meta-http-equiv-content-language">Content
-   Language</a> state.</p></li>
-
    <li><p>The presence of a <code title="attr-img-border"><a href="#attr-img-border">border</a></code> attribute on an
    <code><a href="embedded-content-1.html#the-img-element">img</a></code> element if its value is the string "<code title="">0</code>".</p></li>
 
@@ -417,9 +405,6 @@
    attribute on an <code><a href="text-level-semantics.html#the-a-element">a</a></code> element, if its value is not the
    empty string.</p></li>
 
-   <li><p>The presence of a <code title="attr-table-summary"><a href="tabular-data.html#attr-table-summary">summary</a></code> attribute on a
-   <code><a href="tabular-data.html#the-table-element">table</a></code> element.</p></li> <!-- 2.65% pages -->
-
   </ul><p>Conformance checkers must distinguish between pages that have no
   conformance errors and have none of these obsolete features, and
   pages that have no conformance errors but do have some of these
@@ -429,7 +414,7 @@
   as "Valid HTML" and others as "Valid HTML with warnings".</p>
 
   </div><h3 id="non-conforming-features"><span class="secno">11.2 </span>Non-conforming features</h3><p>Elements in the following list are entirely obsolete, and must
-  not be used by authors:</p><dl><!-- alphabetical by first element in the group, except CSS goes last --><dt><code><a href="#the-applet-element">applet</a></code></dt>
+  not be used by authors:</p><dl><dt><code><a href="#the-applet-element">applet</a></code></dt>
    <dd><p>Use <code><a href="the-iframe-element.html#the-embed-element">embed</a></code> or <code><a href="the-iframe-element.html#the-object-element">object</a></code> instead.</p></dd>
 
    <dt><dfn id="acronym"><code>acronym</code></dfn></dt>
@@ -478,7 +463,6 @@
    <dt><dfn id="nobr"><code>nobr</code></dfn></dt>
    <dt><dfn id="spacer"><code>spacer</code></dfn></dt>
    <dt><dfn id="tt"><code>tt</code></dfn></dt>
-   <dt><dfn id="u"><code>u</code></dfn></dt>
 
    <dd>
 
@@ -490,12 +474,12 @@
     code, consider the <code><a href="text-level-semantics.html#the-code-element">code</a></code> element; and for computer
     output, consider the <code><a href="text-level-semantics.html#the-samp-element">samp</a></code> element.</p>
 
-    <p>Similarly, if the <code><a href="#u">u</a></code> element is being used to
-    indicate emphasis, consider using the <code><a href="text-level-semantics.html#the-em-element">em</a></code> element; if
-    it is being used for marking up keywords, consider the
-    <code><a href="text-level-semantics.html#the-b-element">b</a></code> element; and if it is being used for highlighting
-    text for reference purposes, consider the <code><a href="text-level-semantics.html#the-mark-element">mark</a></code>
-    element.</p>
+    <p>Similarly, if the <code><a href="#big">big</a></code> element is being used to
+    denote a heading, consider using the <code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h1</a></code> element; if
+    it is being used for marking up important passages, consider the
+    <code><a href="text-level-semantics.html#the-strong-element">strong</a></code> element; and if it is being used for
+    highlighting text for reference purposes, consider the
+    <code><a href="text-level-semantics.html#the-mark-element">mark</a></code> element.</p>
 
     <p>See also the <a href="text-level-semantics.html#usage-summary">text-level semantics
     usage summary</a> for more suggestions with examples.</p>
@@ -503,7 +487,7 @@
    </dd>
 
   </dl><hr/><p>The following attributes are obsolete (though the elements are
-  still part of the language), and must not be used by authors:</p><dl><!-- alphabetical by element then attribute of first item in group, except CSS goes last --><dt><dfn id="attr-a-charset" title="attr-a-charset"><code>charset</code></dfn> on <code><a href="text-level-semantics.html#the-a-element">a</a></code> elements</dt>
+  still part of the language), and must not be used by authors:</p><dl><dt><dfn id="attr-a-charset" title="attr-a-charset"><code>charset</code></dfn> on <code><a href="text-level-semantics.html#the-a-element">a</a></code> elements</dt>
    <dt><dfn id="attr-link-charset" title="attr-link-charset"><code>charset</code></dfn> on <code><a href="semantics.html#the-link-element">link</a></code> elements</dt>
    <dd><p>Use an HTTP Content-Type header on the linked resource instead.</p></dd>
 
@@ -595,6 +579,11 @@
    <dt><dfn id="attr-table-datapagesize" title="attr-table-datapagesize"><code>datapagesize</code></dfn> on <code><a href="tabular-data.html#the-table-element">table</a></code> elements</dt>
    <dd><p>Unnecessary. Omit it altogether.</p></dd>
 
+   <dt><dfn id="attr-table-summary" title="attr-table-summary"><code>summary</code></dfn> on <code><a href="tabular-data.html#the-table-element">table</a></code> elements</dt>
+   <dd><p>Use one of the <a href="tabular-data.html#table-descriptions-techniques">techniques for describing
+   tables</a> given in the <code><a href="tabular-data.html#the-table-element">table</a></code> section
+   instead.</p></dd>
+
    <dt><dfn id="attr-tdth-abbr" title="attr-tdth-abbr"><code>abbr</code></dfn> on <code><a href="tabular-data.html#the-td-element">td</a></code> and <code><a href="tabular-data.html#the-th-element">th</a></code> elements</dt>
    <dd><p>Use text that begins in an unambiguous and terse manner, and include any more elaborate text after that. The <code title="attr-title"><a href="elements.html#the-title-attribute">title</a></code> attribute can also be useful in including more detailed text, so that the cell's contents can be made terse.</p>
 
@@ -662,7 +651,6 @@
    <dt><dfn id="attr-pre-width" title="attr-pre-width"><code>width</code></dfn> on <code><a href="grouping-content.html#the-pre-element">pre</a></code> elements</dt>
    <dt><dfn id="attr-table-align" title="attr-table-align"><code>align</code></dfn> on <code><a href="tabular-data.html#the-table-element">table</a></code> elements</dt>
    <dt><dfn id="attr-table-bgcolor" title="attr-table-bgcolor"><code>bgcolor</code></dfn> on <code><a href="tabular-data.html#the-table-element">table</a></code> elements</dt>
-   <dt><dfn id="attr-table-border" title="attr-table-border"><code>border</code></dfn> on <code><a href="tabular-data.html#the-table-element">table</a></code> elements</dt>
    <dt><dfn id="attr-table-cellpadding" title="attr-table-cellpadding"><code>cellpadding</code></dfn> on <code><a href="tabular-data.html#the-table-element">table</a></code> elements</dt>
    <dt><dfn id="attr-table-cellspacing" title="attr-table-cellspacing"><code>cellspacing</code></dfn> on <code><a href="tabular-data.html#the-table-element">table</a></code> elements</dt>
    <dt><dfn id="attr-table-frame" title="attr-table-frame"><code>frame</code></dfn> on <code><a href="tabular-data.html#the-table-element">table</a></code> elements</dt>
@@ -690,7 +678,15 @@
    <dt><dfn id="attr-background" title="attr-background"><code>background</code></dfn> on <code><a href="sections.html#the-body-element-0">body</a></code>, <code><a href="tabular-data.html#the-table-element">table</a></code>, <code><a href="tabular-data.html#the-thead-element">thead</a></code>, <code><a href="tabular-data.html#the-tbody-element">tbody</a></code>, <code><a href="tabular-data.html#the-tfoot-element">tfoot</a></code>, <code><a href="tabular-data.html#the-tr-element">tr</a></code>, <code><a href="tabular-data.html#the-td-element">td</a></code>, and <code><a href="tabular-data.html#the-th-element">th</a></code> elements</dt>
    <dd><p>Use CSS instead.</p></dd>
 
-  </dl><div class="impl">
+  </dl><hr/><p>The <code title="attr-table-border"><a href="tabular-data.html#attr-table-border">border</a></code> attribute on
+  the <code><a href="tabular-data.html#the-table-element">table</a></code> element can be used to provide basic fallback
+  styling for the purpose of making tables legible in browsing
+  environments where CSS support is limited or absent, such as
+  text-based browsers, WYSIWYG editors, and in situations where CSS
+  support is disabled or the style sheet is lost. Only the empty
+  string and the value "<code title="">1</code>" may be used as <code title="attr-table-border"><a href="tabular-data.html#attr-table-border">border</a></code> values for this purpose.
+  Other values are considered obsolete. To regulate the thickness of
+  such borders, authors should instead use CSS.</p><div class="impl">
 
   <h3 id="requirements-for-implementations"><span class="secno">11.3 </span>Requirements for implementations</h3>
 
@@ -733,10 +729,7 @@
   <code><a href="#the-applet-element">applet</a></code> element <a href="rendering.html#represents">represents</a> the
   <a href="infrastructure.html#plugin">plugin</a>.</p>
 
-  <!-- If we ever make this fetch anything manually, remember to delay
-  the load event, and to include ", from the element's <span>browsing
-  context scope origin</span> if it has one" when fetching -->
-
+  
   <p class="note">The <code><a href="#the-applet-element">applet</a></code> element is unaffected by the
   CSS 'display' property. The Java Language runtime is instantiated
   even if the element is hidden with a 'display:none' CSS style.</p>
@@ -753,7 +746,7 @@
            attribute DOMString <a href="#dom-applet-height" title="dom-applet-height">height</a>;
            attribute unsigned long <a href="#dom-applet-hspace" title="dom-applet-hspace">hspace</a>;
            attribute DOMString <a href="#dom-applet-name" title="dom-applet-name">name</a>;
-           attribute DOMString _<a href="#dom-applet-object" title="dom-applet-object">object</a>; // the underscore is not part of the identifier <!-- it's a Web IDL escaping mechanism -->
+           attribute DOMString _<a href="#dom-applet-object" title="dom-applet-object">object</a>; // the underscore is not part of the identifier 
            attribute unsigned long <a href="#dom-applet-vspace" title="dom-applet-vspace">vspace</a>;
            attribute DOMString <a href="#dom-applet-width" title="dom-applet-width">width</a>;
 };</pre>
@@ -1027,7 +1020,7 @@
   <p>When the browsing context is created, if a <code title="attr-frame-src">src</code> attribute is present, the user
   agent must <a href="urls.html#resolve-a-url" title="resolve a url">resolve</a> the value of
   that attribute, relative to the element, and if that is successful,
-  must then <a href="history.html#navigate">navigate</a><!--DONAV frame--> the element's
+  must then <a href="history.html#navigate">navigate</a> the element's
   browsing context to the resulting <a href="urls.html#absolute-url">absolute URL</a>, with
   <a href="history.html#replacement-enabled">replacement enabled</a>, and with the <code><a href="#frame">frame</a></code>
   element's document's <a href="browsers.html#browsing-context">browsing context</a> as the
@@ -1036,7 +1029,7 @@
   <p>Whenever the <code title="attr-frame-src">src</code> attribute is
   set, the user agent must <a href="urls.html#resolve-a-url" title="resolve a url">resolve</a>
   the value of that attribute, relative to the element, and if that is
-  successful, the nested <a href="browsers.html#browsing-context">browsing context</a> must be <a href="history.html#navigate" title="navigate">navigated</a><!--DONAV frame--> to the resulting
+  successful, the nested <a href="browsers.html#browsing-context">browsing context</a> must be <a href="history.html#navigate" title="navigate">navigated</a> to the resulting
   <a href="urls.html#absolute-url">absolute URL</a>, with the <code><a href="#frame">frame</a></code> element's
   document's <a href="browsers.html#browsing-context">browsing context</a> as the <a href="history.html#source-browsing-context">source
   browsing context</a>.</p>
@@ -1126,7 +1119,7 @@
 
 
 
-  <h4 id="other-elements-attributes-and-apis"><span class="secno">11.3.4 </span>Other elements, attributes and APIs</h4> <!-- alphabetical by name and attribute -->
+  <h4 id="other-elements-attributes-and-apis"><span class="secno">11.3.4 </span>Other elements, attributes and APIs</h4> 
 
   <p>User agents must treat <code><a href="#acronym">acronym</a></code> elements in a manner
   equivalent to <code><a href="text-level-semantics.html#the-abbr-element">abbr</a></code> elements in terms of semantics and
@@ -1161,7 +1154,7 @@
   <pre class="idl">interface <dfn id="htmlbasefontelement">HTMLBaseFontElement</dfn> : <a href="elements.html#htmlelement">HTMLElement</a> {
            attribute DOMString <a href="#dom-basefont-color" title="dom-basefont-color">color</a>;
            attribute DOMString <a href="#dom-basefont-face" title="dom-basefont-face">face</a>;
-           attribute long <a href="#dom-basefont-size" title="dom-basefont-size">size</a>; <!-- yes, long, not DOMString (so says DOM2 HTML) -->
+           attribute long <a href="#dom-basefont-size" title="dom-basefont-size">size</a>; 
 };</pre>
 
   <p>The <dfn id="dom-basefont-color" title="dom-basefont-color"><code>color</code></dfn>,
@@ -1306,7 +1299,7 @@
   <pre class="idl">interface <dfn id="htmlfontelement">HTMLFontElement</dfn> : <a href="elements.html#htmlelement">HTMLElement</a> {
            attribute DOMString <a href="#dom-font-color" title="dom-font-color">color</a>;
            attribute DOMString <a href="#dom-font-face" title="dom-font-face">face</a>;
-           attribute DOMString <a href="#dom-font-size" title="dom-font-size">size</a>; <!-- yes, DOMString, not long (so says DOM2 HTML) -->
+           attribute DOMString <a href="#dom-font-size" title="dom-font-size">size</a>; 
 };</pre>
 
   <p>The <dfn id="dom-font-color" title="dom-font-color"><code>color</code></dfn>,
@@ -1414,7 +1407,7 @@
   content attribute, which for the purposes of reflection is defined
   as containing a <a href="urls.html#url">URL</a>.</p>
 
-  <!-- lowsrc is explicitly not given here, see http://www.w3.org/Bugs/Public/show_bug.cgi?id=10341 -->
+  
 
   <hr/><pre class="idl">[Supplemental]
 interface <a href="the-input-element.html#htmlinputelement">HTMLInputElement</a> {
@@ -1605,15 +1598,15 @@
 interface <a href="tabular-data.html#htmltableelement">HTMLTableElement</a> {
            attribute DOMString <a href="#dom-table-align" title="dom-table-align">align</a>;
            attribute DOMString <a href="#dom-table-bgcolor" title="dom-table-bgColor">bgColor</a>;
-           attribute DOMString <a href="#dom-table-border" title="dom-table-border">border</a>;
            attribute DOMString <a href="#dom-table-cellpadding" title="dom-table-cellPadding">cellPadding</a>;
            attribute DOMString <a href="#dom-table-cellspacing" title="dom-table-cellSpacing">cellSpacing</a>;
            attribute DOMString <a href="#dom-table-frame" title="dom-table-frame">frame</a>;
            attribute DOMString <a href="#dom-table-rules" title="dom-table-rules">rules</a>;
+           attribute DOMString <a href="#dom-table-summary" title="dom-table-summary">summary</a>;
            attribute DOMString <a href="#dom-table-width" title="dom-table-width">width</a>;
 };</pre>
 
-  <p>The <dfn id="dom-table-align" title="dom-table-align"><code>align</code></dfn>, <dfn id="dom-table-border" title="dom-table-border"><code>border</code></dfn>, <dfn id="dom-table-frame" title="dom-table-frame"><code>frame</code></dfn>, <dfn id="dom-table-rules" title="dom-table-rules"><code>rules</code></dfn>, and <dfn id="dom-table-width" title="dom-table-width"><code>width</code></dfn>, IDL attributes of
+  <p>The <dfn id="dom-table-align" title="dom-table-align"><code>align</code></dfn>, <dfn id="dom-table-frame" title="dom-table-frame"><code>frame</code></dfn>, <dfn id="dom-table-summary" title="dom-table-summary"><code>summary</code></dfn>, <dfn id="dom-table-rules" title="dom-table-rules"><code>rules</code></dfn>, and <dfn id="dom-table-width" title="dom-table-width"><code>width</code></dfn>, IDL attributes of
   the <code><a href="tabular-data.html#the-table-element">table</a></code> element must <a href="common-dom-interfaces.html#reflect">reflect</a> the
   respective content attributes of the same name.</p>
 
@@ -1750,11 +1743,7 @@
   <hr/><p>The <code><a href="#bgsound">bgsound</a></code>, <code><a href="#isindex-0">isindex</a></code>,
   <code><a href="#multicol">multicol</a></code>, <code><a href="#nextid">nextid</a></code>, <code><a href="#rb">rb</a></code>, and
   <code><a href="#spacer">spacer</a></code> elements must use the
-  <code><a href="elements.html#htmlunknownelement">HTMLUnknownElement</a></code> interface.</p> <!-- has to be
-  explicitly listed because technically we define the elements in the
-  spec, albeit as obsolete, and then we say that only elements not
-  defined in this spec use HTMLUnknownElement. -->
-
+  <code><a href="elements.html#htmlunknownelement">HTMLUnknownElement</a></code> interface.</p> 
   <hr/><pre class="idl">[Supplemental]
 interface <a href="dom.html#htmldocument">HTMLDocument</a> {
            attribute DOMString <a href="#dom-document-fgcolor" title="dom-document-fgColor">fgColor</a>;

Index: toc-status.html
===================================================================
RCS file: /sources/public/html5/markup/html5-spec/toc-status.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- toc-status.html	25 Feb 2011 07:05:30 -0000	1.7
+++ toc-status.html	30 Apr 2011 11:35:46 -0000	1.8
@@ -86,9 +86,11 @@
 Character encodings</a> <span class="id">(character-encodings)</span></li>
 </ol></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=conformance-requirements" class="status LC">LC</a> <a href="../spec/#conformance-requirements">2.2 Conformance requirements</a> <span class="id">(conformance-requirements)</span>
-<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=dependencies" class="status LC">LC</a> <a href="../spec/#dependencies">2.2.1
+<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=conformance-classes" class="status ADD">ADD</a> <a href="../spec/#conformance-classes">2.2.1
+Conformance classes</a> <span class="id">(conformance-classes)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=dependencies" class="status LC">LC</a> <a href="../spec/#dependencies">2.2.2
 Dependencies</a> <span class="id">(dependencies)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=extensibility" class="status LC">LC</a> <a href="../spec/#extensibility">2.2.2
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=extensibility" class="status LC">LC</a> <a href="../spec/#extensibility">2.2.3
 Extensibility</a> <span class="id">(extensibility)</span></li>
 </ol></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=case-sensitivity-and-string-comparison" class="status LC">LC</a> <a href="../spec/#case-sensitivity-and-string-comparison">2.3 Case-sensitivity and string comparison</a> <span class="id">(case-sensitivity-and-string-comparison)</span></li>
@@ -136,8 +138,12 @@
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=urls" class="status LC">LC</a> <a href="../spec/#urls">2.6 URLs</a> <span class="id">(urls)</span>
 <ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=terminology-0" class="status LC">LC</a> <a href="../spec/#terminology-0">2.6.1
 Terminology</a> <span class="id">(terminology-0)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=dynamic-changes-to-base-urls" class="status LC">LC</a> <a href="../spec/#dynamic-changes-to-base-urls">2.6.2 Dynamic changes to base URLs</a> <span class="id">(dynamic-changes-to-base-urls)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=interfaces-for-url-manipulation" class="status LC">LC</a> <a href="../spec/#interfaces-for-url-manipulation">2.6.3 Interfaces for URL manipulation</a> <span class="id">(interfaces-for-url-manipulation)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-urls" class="status LC">LC</a> <a href="../spec/#parsing-urls">2.6.2
+Parsing URLs</a> <span class="id">(parsing-urls)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=resolving-urls" class="status LC">LC</a> <a href="../spec/#resolving-urls">2.6.3
+Resolving URLs</a> <span class="id">(resolving-urls)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=dynamic-changes-to-base-urls" class="status LC">LC</a> <a href="../spec/#dynamic-changes-to-base-urls">2.6.4 Dynamic changes to base URLs</a> <span class="id">(dynamic-changes-to-base-urls)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=interfaces-for-url-manipulation" class="status LC">LC</a> <a href="../spec/#interfaces-for-url-manipulation">2.6.5 Interfaces for URL manipulation</a> <span class="id">(interfaces-for-url-manipulation)</span></li>
 </ol></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=fetching-resources" class="status LC">LC</a> <a href="../spec/#fetching-resources">2.7
 Fetching resources</a> <span class="id">(fetching-resources)</span>
@@ -145,6 +151,8 @@
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=encrypted-http-and-related-security-concerns" class="status LC">LC</a> <a href="../spec/#encrypted-http-and-related-security-concerns">2.7.2 Encrypted HTTP and related security
 concerns</a> <span class="id">(encrypted-http-and-related-security-concerns)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=content-type-sniffing" class="status LC">LC</a> <a href="../spec/#content-type-sniffing">2.7.3 Determining the type of a resource</a> <span class="id">(content-type-sniffing)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=extracting-encodings-from-meta-elements" class="status ADD">ADD</a> <a href="../spec/#extracting-encodings-from-meta-elements">2.7.4 Extracting encodings from meta
+elements</a> <span class="id">(extracting-encodings-from-meta-elements)</span></li>
 </ol></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=common-dom-interfaces" class="status LC">LC</a> <a href="../spec/#common-dom-interfaces">2.8
 Common DOM interfaces</a> <span class="id">(common-dom-interfaces)</span>
@@ -179,7 +187,7 @@
 <ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=documents" class="status LC">LC</a> <a href="../spec/#documents">3.1
 Documents</a> <span class="id">(documents)</span>
 <ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=documents-in-the-dom" class="status LC">LC</a> <a href="../spec/#documents-in-the-dom">3.1.1 Documents in the DOM</a> <span class="id">(documents-in-the-dom)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=security-document" class="status ADD">ADD</a> <a href="../spec/#security-document">3.1.2
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=security-document" class="status LC">LC</a> <a href="../spec/#security-document">3.1.2
 Security</a> <span class="id">(security-document)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=resource-metadata-management" class="status LC">LC</a> <a href="../spec/#resource-metadata-management">3.1.3 Resource metadata management</a> <span class="id">(resource-metadata-management)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=dom-tree-accessors" class="status LC">LC</a> <a href="../spec/#dom-tree-accessors">3.1.4
@@ -236,8 +244,8 @@
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=requirements-relating-to-bidirectional-algorithm-formatting-characters" class="status ADD">ADD</a> <a href="../spec/#requirements-relating-to-bidirectional-algorithm-formatting-characters">
 3.2.6 Requirements relating to
 bidirectional-algorithm formatting characters</a> <span class="id">(requirements-relating-to-bidirectional-algorithm-formatting-characters)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=annotations-for-assistive-technology-products-aria" class="status ADD">ADD</a> <a href="../spec/#annotations-for-assistive-technology-products-aria">3.2.7 Annotations for assistive technology products
-(ARIA)</a> <span class="id">(annotations-for-assistive-technology-products-aria)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=wai-aria" class="status ADD">ADD</a> <a href="../spec/#wai-aria">3.2.7
+WAI-ARIA</a> <span class="id">(wai-aria)</span></li>
 </ol></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=apis-in-html-documents" class="status LC">LC</a> <a href="../spec/#apis-in-html-documents">3.3 APIs in HTML documents</a> <span class="id">(apis-in-html-documents)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=interactions-with-xpath-and-xslt" class="status LC">LC</a> <a href="../spec/#interactions-with-xpath-and-xslt">3.4 Interactions with XPath and XSLT</a> <span class="id">(interactions-with-xpath-and-xslt)</span></li>
@@ -265,7 +273,7 @@
 </ol></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=document-metadata" class="status LC">LC</a> <a href="../spec/#document-metadata">4.2
 Document metadata</a> <span class="id">(document-metadata)</span>
-<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-head-element-0" class="status LC">LC</a> <a href="../spec/#the-head-element-0">4.2.1
+<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-head-element-0" class="status REC">REC</a> <a href="../spec/#the-head-element-0">4.2.1
 The head element</a> <span class="id">(the-head-element-0)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-title-element-0" class="status LC">LC</a> <a href="../spec/#the-title-element-0">4.2.2
 The title element</a> <span class="id">(the-title-element-0)</span></li>
@@ -320,7 +328,7 @@
 The header element</a> <span class="id">(the-header-element)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-footer-element" class="status LC">LC</a> <a href="../spec/#the-footer-element">4.4.9
 The footer element</a> <span class="id">(the-footer-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-address-element" class="status LC">LC</a> <a href="../spec/#the-address-element">4.4.10 The address element</a> <span class="id">(the-address-element)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-address-element" class="status REC">REC</a> <a href="../spec/#the-address-element">4.4.10 The address element</a> <span class="id">(the-address-element)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=headings-and-sections" class="status LC">LC</a> <a href="../spec/#headings-and-sections">4.4.11 Headings and sections</a> <span class="id">(headings-and-sections)</span>
 <ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=outlines" class="status LC">LC</a> <a href="../spec/#outlines">4.4.11.1
 Creating an outline</a> <span class="id">(outlines)</span></li>
@@ -328,86 +336,88 @@
 </ol></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=grouping-content" class="status LC">LC</a> <a href="../spec/#grouping-content">4.5
 Grouping content</a> <span class="id">(grouping-content)</span>
-<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-p-element" class="status LC">LC</a> <a href="../spec/#the-p-element">4.5.1 The
+<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-p-element" class="status REC">REC</a> <a href="../spec/#the-p-element">4.5.1 The
 p element</a> <span class="id">(the-p-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-hr-element" class="status LC">LC</a> <a href="../spec/#the-hr-element">4.5.2 The
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-hr-element" class="status REC">REC</a> <a href="../spec/#the-hr-element">4.5.2 The
 hr element</a> <span class="id">(the-hr-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-pre-element" class="status LC">LC</a> <a href="../spec/#the-pre-element">4.5.3 The
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-pre-element" class="status REC">REC</a> <a href="../spec/#the-pre-element">4.5.3 The
 pre element</a> <span class="id">(the-pre-element)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-blockquote-element" class="status LC">LC</a> <a href="../spec/#the-blockquote-element">4.5.4 The blockquote element</a> <span class="id">(the-blockquote-element)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-ol-element" class="status LC">LC</a> <a href="../spec/#the-ol-element">4.5.5 The
 ol element</a> <span class="id">(the-ol-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-ul-element" class="status LC">LC</a> <a href="../spec/#the-ul-element">4.5.6 The
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-ul-element" class="status REC">REC</a> <a href="../spec/#the-ul-element">4.5.6 The
 ul element</a> <span class="id">(the-ul-element)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-li-element" class="status LC">LC</a> <a href="../spec/#the-li-element">4.5.7 The
 li element</a> <span class="id">(the-li-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-dl-element" class="status LC">LC</a> <a href="../spec/#the-dl-element">4.5.8 The
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-dl-element" class="status REC">REC</a> <a href="../spec/#the-dl-element">4.5.8 The
 dl element</a> <span class="id">(the-dl-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-dt-element" class="status LC">LC</a> <a href="../spec/#the-dt-element">4.5.9 The
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-dt-element" class="status REC">REC</a> <a href="../spec/#the-dt-element">4.5.9 The
 dt element</a> <span class="id">(the-dt-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-dd-element" class="status LC">LC</a> <a href="../spec/#the-dd-element">4.5.10 The
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-dd-element" class="status REC">REC</a> <a href="../spec/#the-dd-element">4.5.10 The
 dd element</a> <span class="id">(the-dd-element)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-figure-element" class="status LC">LC</a> <a href="../spec/#the-figure-element">4.5.11
 The figure element</a> <span class="id">(the-figure-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=the-figcaption-element" class="status ADD">ADD</a> <a href="../spec/#the-figcaption-element">4.5.12 The figcaption element</a> <span class="id">(the-figcaption-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-div-element" class="status LC">LC</a> <a href="../spec/#the-div-element">4.5.13
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-figcaption-element" class="status LC">LC</a> <a href="../spec/#the-figcaption-element">4.5.12 The figcaption element</a> <span class="id">(the-figcaption-element)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-div-element" class="status REC">REC</a> <a href="../spec/#the-div-element">4.5.13
 The div element</a> <span class="id">(the-div-element)</span></li>
 </ol></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=text-level-semantics" class="status LC">LC</a> <a href="../spec/#text-level-semantics">4.6
 Text-level semantics</a> <span class="id">(text-level-semantics)</span>
 <ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-a-element" class="status LC">LC</a> <a href="../spec/#the-a-element">4.6.1 The
 a element</a> <span class="id">(the-a-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-em-element" class="status LC">LC</a> <a href="../spec/#the-em-element">4.6.2 The
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-em-element" class="status REC">REC</a> <a href="../spec/#the-em-element">4.6.2 The
 em element</a> <span class="id">(the-em-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-strong-element" class="status LC">LC</a> <a href="../spec/#the-strong-element">4.6.3
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-strong-element" class="status REC">REC</a> <a href="../spec/#the-strong-element">4.6.3
 The strong element</a> <span class="id">(the-strong-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-small-element" class="status LC">LC</a> <a href="../spec/#the-small-element">4.6.4
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-small-element" class="status REC">REC</a> <a href="../spec/#the-small-element">4.6.4
 The small element</a> <span class="id">(the-small-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=the-s-element" class="status ADD">ADD</a> <a href="../spec/#the-s-element">4.6.5 The
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-s-element" class="status REC">REC</a> <a href="../spec/#the-s-element">4.6.5 The
 s element</a> <span class="id">(the-s-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-cite-element" class="status LC">LC</a> <a href="../spec/#the-cite-element">4.6.6
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-cite-element" class="status REC">REC</a> <a href="../spec/#the-cite-element">4.6.6
 The cite element</a> <span class="id">(the-cite-element)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-q-element" class="status LC">LC</a> <a href="../spec/#the-q-element">4.6.7 The
 q element</a> <span class="id">(the-q-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-dfn-element" class="status LC">LC</a> <a href="../spec/#the-dfn-element">4.6.8 The
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-dfn-element" class="status REC">REC</a> <a href="../spec/#the-dfn-element">4.6.8 The
 dfn element</a> <span class="id">(the-dfn-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-abbr-element" class="status LC">LC</a> <a href="../spec/#the-abbr-element">4.6.9
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-abbr-element" class="status REC">REC</a> <a href="../spec/#the-abbr-element">4.6.9
 The abbr element</a> <span class="id">(the-abbr-element)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-time-element" class="status LC">LC</a> <a href="../spec/#the-time-element">4.6.10
 The time element</a> <span class="id">(the-time-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-code-element" class="status LC">LC</a> <a href="../spec/#the-code-element">4.6.11
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-code-element" class="status REC">REC</a> <a href="../spec/#the-code-element">4.6.11
 The code element</a> <span class="id">(the-code-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-var-element" class="status LC">LC</a> <a href="../spec/#the-var-element">4.6.12
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-var-element" class="status REC">REC</a> <a href="../spec/#the-var-element">4.6.12
 The var element</a> <span class="id">(the-var-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-samp-element" class="status LC">LC</a> <a href="../spec/#the-samp-element">4.6.13
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-samp-element" class="status REC">REC</a> <a href="../spec/#the-samp-element">4.6.13
 The samp element</a> <span class="id">(the-samp-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-kbd-element" class="status LC">LC</a> <a href="../spec/#the-kbd-element">4.6.14
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-kbd-element" class="status REC">REC</a> <a href="../spec/#the-kbd-element">4.6.14
 The kbd element</a> <span class="id">(the-kbd-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-sub-and-sup-elements" class="status LC">LC</a> <a href="../spec/#the-sub-and-sup-elements">4.6.15 The sub and sup
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-sub-and-sup-elements" class="status REC">REC</a> <a href="../spec/#the-sub-and-sup-elements">4.6.15 The sub and sup
 elements</a> <span class="id">(the-sub-and-sup-elements)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-i-element" class="status LC">LC</a> <a href="../spec/#the-i-element">4.6.16 The
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-i-element" class="status REC">REC</a> <a href="../spec/#the-i-element">4.6.16 The
 i element</a> <span class="id">(the-i-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-b-element" class="status LC">LC</a> <a href="../spec/#the-b-element">4.6.17 The
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-b-element" class="status REC">REC</a> <a href="../spec/#the-b-element">4.6.17 The
 b element</a> <span class="id">(the-b-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-mark-element" class="status LC">LC</a> <a href="../spec/#the-mark-element">4.6.18
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=the-u-element" class="status ADD">ADD</a> <a href="../spec/#the-u-element">4.6.18 The
+u element</a> <span class="id">(the-u-element)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-mark-element" class="status LC">LC</a> <a href="../spec/#the-mark-element">4.6.19
 The mark element</a> <span class="id">(the-mark-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-ruby-element" class="status LC">LC</a> <a href="../spec/#the-ruby-element">4.6.19
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-ruby-element" class="status LC">LC</a> <a href="../spec/#the-ruby-element">4.6.20
 The ruby element</a> <span class="id">(the-ruby-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-rt-element" class="status LC">LC</a> <a href="../spec/#the-rt-element">4.6.20 The
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-rt-element" class="status LC">LC</a> <a href="../spec/#the-rt-element">4.6.21 The
 rt element</a> <span class="id">(the-rt-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-rp-element" class="status LC">LC</a> <a href="../spec/#the-rp-element">4.6.21 The
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-rp-element" class="status LC">LC</a> <a href="../spec/#the-rp-element">4.6.22 The
 rp element</a> <span class="id">(the-rp-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=the-bdi-element" class="status ADD">ADD</a> <a href="../spec/#the-bdi-element">4.6.22
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-bdi-element" class="status WD">WD</a> <a href="../spec/#the-bdi-element">4.6.23
 The bdi element</a> <span class="id">(the-bdi-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-bdo-element" class="status LC">LC</a> <a href="../spec/#the-bdo-element">4.6.23
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-bdo-element" class="status REC">REC</a> <a href="../spec/#the-bdo-element">4.6.24
 The bdo element</a> <span class="id">(the-bdo-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-span-element" class="status LC">LC</a> <a href="../spec/#the-span-element">4.6.24
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-span-element" class="status REC">REC</a> <a href="../spec/#the-span-element">4.6.25
 The span element</a> <span class="id">(the-span-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-br-element" class="status LC">LC</a> <a href="../spec/#the-br-element">4.6.25 The
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-br-element" class="status REC">REC</a> <a href="../spec/#the-br-element">4.6.26 The
 br element</a> <span class="id">(the-br-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-wbr-element" class="status REC">REC</a> <a href="../spec/#the-wbr-element">4.6.26
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-wbr-element" class="status LC">LC</a> <a href="../spec/#the-wbr-element">4.6.27
 The wbr element</a> <span class="id">(the-wbr-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=usage-summary" class="status LC">LC</a> <a href="../spec/#usage-summary">4.6.27
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=usage-summary" class="status LC">LC</a> <a href="../spec/#usage-summary">4.6.28
 Usage summary</a> <span class="id">(usage-summary)</span></li>
 </ol></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=edits" class="status LC">LC</a> <a href="../spec/#edits">4.7 Edits</a> <span class="id">(edits)</span>
@@ -455,12 +465,8 @@
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=a-key-part-of-the-content" class="status LC">LC</a> <a href="../spec/#a-key-part-of-the-content">4.8.1.1.10 A key part of the content</a> <span class="id">(a-key-part-of-the-content)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=an-image-not-intended-for-the-user" class="status LC">LC</a> <a href="../spec/#an-image-not-intended-for-the-user">4.8.1.1.11 An image not intended for the
 user</a> <span class="id">(an-image-not-intended-for-the-user)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=an-image-in-an-e-mail-or-private-document-intended-for-a-specific-person-who-is-known-to-be-able-to-view-images" class="status LC">LC</a> <a href="../spec/#an-image-in-an-e-mail-or-private-document-intended-for-a-specific-person-who-is-known-to-be-able-to-view-images">
-4.8.1.1.12 An image in an e-mail or
-private document intended for a specific person who is known to be
-able to view images</a> <span class="id">(an-image-in-an-e-mail-or-private-document-intended-for-a-specific-person-who-is-known-to-be-able-to-view-images)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=guidance-for-markup-generators" class="status LC">LC</a> <a href="../spec/#guidance-for-markup-generators">4.8.1.1.13 Guidance for markup generators</a> <span class="id">(guidance-for-markup-generators)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=guidance-for-conformance-checkers" class="status LC">LC</a> <a href="../spec/#guidance-for-conformance-checkers">4.8.1.1.14 Guidance for conformance
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=guidance-for-markup-generators" class="status LC">LC</a> <a href="../spec/#guidance-for-markup-generators">4.8.1.1.12 Guidance for markup generators</a> <span class="id">(guidance-for-markup-generators)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=guidance-for-conformance-checkers" class="status LC">LC</a> <a href="../spec/#guidance-for-conformance-checkers">4.8.1.1.13 Guidance for conformance
 checkers</a> <span class="id">(guidance-for-conformance-checkers)</span></li>
 </ol></li>
 </ol></li>
@@ -470,7 +476,7 @@
 The embed element</a> <span class="id">(the-embed-element)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-object-element" class="status LC">LC</a> <a href="../spec/#the-object-element">4.8.4
 The object element</a> <span class="id">(the-object-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-param-element" class="status LC">LC</a> <a href="../spec/#the-param-element">4.8.5
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-param-element" class="status REC">REC</a> <a href="../spec/#the-param-element">4.8.5
 The param element</a> <span class="id">(the-param-element)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=video" class="status LC">LC</a> <a href="../spec/#video">4.8.6 The
 video element</a> <span class="id">(video)</span></li>
@@ -478,7 +484,7 @@
 audio element</a> <span class="id">(audio)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-source-element" class="status LC">LC</a> <a href="../spec/#the-source-element">4.8.8
 The source element</a> <span class="id">(the-source-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=the-track-element" class="status ADD">ADD</a> <a href="../spec/#the-track-element">4.8.9
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-track-element" class="status WD">WD</a> <a href="../spec/#the-track-element">4.8.9
 The track element</a> <span class="id">(the-track-element)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=media-elements" class="status LC">LC</a> <a href="../spec/#media-elements">4.8.10
 Media elements</a> <span class="id">(media-elements)</span>
@@ -496,26 +502,39 @@
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=playing-the-media-resource" class="status LC">LC</a> <a href="../spec/#playing-the-media-resource">4.8.10.8 Playing the media resource</a> <span class="id">(playing-the-media-resource)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=seeking" class="status LC">LC</a> <a href="../spec/#seeking">4.8.10.9
 Seeking</a> <span class="id">(seeking)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=timed-text-tracks" class="status ADD">ADD</a> <a href="../spec/#timed-text-tracks">4.8.10.10 Timed text tracks</a> <span class="id">(timed-text-tracks)</span>
-<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=text-track-model" class="status ADD">ADD</a> <a href="../spec/#text-track-model">4.8.10.10.1 Text track model</a> <span class="id">(text-track-model)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=sourcing-in-band-text-tracks" class="status ADD">ADD</a> <a href="../spec/#sourcing-in-band-text-tracks">4.8.10.10.2 Sourcing in-band text tracks</a> <span class="id">(sourcing-in-band-text-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-text-tracks" class="status ADD">ADD</a> <a href="../spec/#sourcing-out-of-band-text-tracks">4.8.10.10.3 Sourcing out-of-band text
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=media-resources-with-multiple-media-tracks" class="status FD">FD</a> <a href="../spec/#media-resources-with-multiple-media-tracks">4.8.10.10 Media resources with multiple media
+tracks</a> <span class="id">(media-resources-with-multiple-media-tracks)</span>
+<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=tracklist-objects" class="status ADD">ADD</a> <a href="../spec/#tracklist-objects">4.8.10.10.1 TrackList objects</a> <span class="id">(tracklist-objects)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=selecting-specific-audio-and-video-tracks-declaratively" class="status ADD">ADD</a> <a href="../spec/#selecting-specific-audio-and-video-tracks-declaratively">
+4.8.10.10.2 Selecting specific audio and video tracks
+declaratively</a> <span class="id">(selecting-specific-audio-and-video-tracks-declaratively)</span></li>
+</ol></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=synchronising-multiple-media-elements" class="status FD">FD</a> <a href="../spec/#synchronising-multiple-media-elements">4.8.10.11 Synchronising multiple media elements</a> <span class="id">(synchronising-multiple-media-elements)</span>
+<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=introduction-0" class="status FD">FD</a> <a href="../spec/#introduction-0">4.8.10.11.1 Introduction</a> <span class="id">(introduction-0)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=media-controllers" class="status ADD">ADD</a> <a href="../spec/#media-controllers">4.8.10.11.2 Media controllers</a> <span class="id">(media-controllers)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=assigning-a-media-controller-declaratively" class="status ADD">ADD</a> <a href="../spec/#assigning-a-media-controller-declaratively">4.8.10.11.3 Assigning a media controller
+declaratively</a> <span class="id">(assigning-a-media-controller-declaratively)</span></li>
+</ol></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=timed-text-tracks" class="status WD">WD</a> <a href="../spec/#timed-text-tracks">4.8.10.12 Timed text tracks</a> <span class="id">(timed-text-tracks)</span>
+<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=text-track-model" class="status ADD">ADD</a> <a href="../spec/#text-track-model">4.8.10.12.1 Text track model</a> <span class="id">(text-track-model)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=sourcing-in-band-text-tracks" class="status WD">WD</a> <a href="../spec/#sourcing-in-band-text-tracks">4.8.10.12.2 Sourcing in-band text tracks</a> <span class="id">(sourcing-in-band-text-tracks)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=sourcing-out-of-band-text-tracks" class="status WD">WD</a> <a href="../spec/#sourcing-out-of-band-text-tracks">4.8.10.12.3 Sourcing out-of-band text
 tracks</a> <span class="id">(sourcing-out-of-band-text-tracks)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=text-track-api" class="status ADD">ADD</a> <a href="../spec/#text-track-api">4.8.10.10.4 Text track API</a> <span class="id">(text-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
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=text-track-api" class="status WD">WD</a> <a href="../spec/#text-track-api">4.8.10.12.4 Text track API</a> <span class="id">(text-track-api)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=cue-events" class="status WD">WD</a> <a href="../spec/#cue-events">4.8.10.12.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
+<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.13
 User interface</a> <span class="id">(user-interface)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=time-ranges" class="status LC">LC</a> <a href="../spec/#time-ranges">4.8.10.12
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=time-ranges" class="status LC">LC</a> <a href="../spec/#time-ranges">4.8.10.14
 Time ranges</a> <span class="id">(time-ranges)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=mediaevents" class="status LC">LC</a> <a href="../spec/#mediaevents">4.8.10.13
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=mediaevents" class="status LC">LC</a> <a href="../spec/#mediaevents">4.8.10.15
 Event summary</a> <span class="id">(mediaevents)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=security-and-privacy-considerations" class="status LC">LC</a> <a href="../spec/#security-and-privacy-considerations">4.8.10.14 Security and privacy
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=security-and-privacy-considerations" class="status LC">LC</a> <a href="../spec/#security-and-privacy-considerations">4.8.10.16 Security and privacy
 considerations</a> <span class="id">(security-and-privacy-considerations)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=best-practices-for-authors-using-media-elements" class="status WD">WD</a> <a href="../spec/#best-practices-for-authors-using-media-elements">4.8.10.15 Best practices for authors using media
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=best-practices-for-authors-using-media-elements" class="status WD">WD</a> <a href="../spec/#best-practices-for-authors-using-media-elements">4.8.10.17 Best practices for authors using media
 elements</a> <span class="id">(best-practices-for-authors-using-media-elements)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=best-practices-for-implementors-of-media-elements" class="status WD">WD</a> <a href="../spec/#best-practices-for-implementors-of-media-elements">4.8.10.16 Best practices for implementors of media
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=best-practices-for-implementors-of-media-elements" class="status WD">WD</a> <a href="../spec/#best-practices-for-implementors-of-media-elements">4.8.10.18 Best practices for implementors of media
 elements</a> <span class="id">(best-practices-for-implementors-of-media-elements)</span></li>
 </ol></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-canvas-element" class="status REC">REC</a> <a href="../spec/#the-canvas-element">4.8.11
@@ -543,8 +562,11 @@
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=tabular-data" class="status LC">LC</a> <a href="../spec/#tabular-data">4.9 Tabular
 data</a> <span class="id">(tabular-data)</span>
 <ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-table-element" class="status LC">LC</a> <a href="../spec/#the-table-element">4.9.1
-The table element</a> <span class="id">(the-table-element)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-caption-element" class="status LC">LC</a> <a href="../spec/#the-caption-element">4.9.2
+The table element</a> <span class="id">(the-table-element)</span>
+<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=table-descriptions-techniques" class="status ADD">ADD</a> <a href="../spec/#table-descriptions-techniques">4.9.1.1 Techniques for describing tables</a> <span class="id">(table-descriptions-techniques)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=table-layout-techniques" class="status ADD">ADD</a> <a href="../spec/#table-layout-techniques">4.9.1.2 Techniques for table layout</a> <span class="id">(table-layout-techniques)</span></li>
+</ol></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-caption-element" class="status REC">REC</a> <a href="../spec/#the-caption-element">4.9.2
 The caption element</a> <span class="id">(the-caption-element)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-colgroup-element" class="status LC">LC</a> <a href="../spec/#the-colgroup-element">4.9.3 The colgroup element</a> <span class="id">(the-colgroup-element)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-col-element" class="status LC">LC</a> <a href="../spec/#the-col-element">4.9.4 The
@@ -574,8 +596,8 @@
 Examples</a> <span class="id">(examples)</span></li>
 </ol></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=forms" class="status LC">LC</a> <a href="../spec/#forms">4.10 Forms</a> <span class="id">(forms)</span>
-<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=introduction-0" class="status LC">LC</a> <a href="../spec/#introduction-0">4.10.1
-Introduction</a> <span class="id">(introduction-0)</span>
+<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=introduction-1" class="status LC">LC</a> <a href="../spec/#introduction-1">4.10.1
+Introduction</a> <span class="id">(introduction-1)</span>
 <ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=writing-a-form-s-user-interface" class="status ADD">ADD</a> <a href="../spec/#writing-a-form-s-user-interface">4.10.1.1 Writing a form's user interface</a> <span class="id">(writing-a-form-s-user-interface)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=implementing-the-server-side-processing-for-a-form" class="status ADD">ADD</a> <a href="../spec/#implementing-the-server-side-processing-for-a-form">4.10.1.2 Implementing the server-side processing for
 a form</a> <span class="id">(implementing-the-server-side-processing-for-a-form)</span></li>
@@ -685,18 +707,17 @@
 </ol></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=form-submission" class="status LC">LC</a> <a href="../spec/#form-submission">4.10.22
 Form submission</a> <span class="id">(form-submission)</span>
-<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=introduction-1" class="status LC">LC</a> <a href="../spec/#introduction-1">4.10.22.1
-Introduction</a> <span class="id">(introduction-1)</span></li>
+<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=introduction-2" class="status LC">LC</a> <a href="../spec/#introduction-2">4.10.22.1
+Introduction</a> <span class="id">(introduction-2)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=implicit-submission" class="status LC">LC</a> <a href="../spec/#implicit-submission">4.10.22.2 Implicit submission</a> <span class="id">(implicit-submission)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=form-submission-algorithm" class="status LC">LC</a> <a href="../spec/#form-submission-algorithm">4.10.22.3 Form submission algorithm</a> <span class="id">(form-submission-algorithm)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=url-encoded-form-data" class="status LC">LC</a> <a href="../spec/#url-encoded-form-data">4.10.22.4 URL-encoded form data</a> <span class="id">(url-encoded-form-data)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=multipart-form-data" class="status LC">LC</a> <a href="../spec/#multipart-form-data">4.10.22.5 Multipart form data</a> <span class="id">(multipart-form-data)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=plain-text-form-data" class="status LC">LC</a> <a href="../spec/#plain-text-form-data">4.10.22.6 Plain text form data</a> <span class="id">(plain-text-form-data)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=constructing-form-data-set" class="status ADD">ADD</a> <a href="../spec/#constructing-form-data-set">4.10.22.4 Constructing the form data set</a> <span class="id">(constructing-form-data-set)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=url-encoded-form-data" class="status LC">LC</a> <a href="../spec/#url-encoded-form-data">4.10.22.5 URL-encoded form data</a> <span class="id">(url-encoded-form-data)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=multipart-form-data" class="status LC">LC</a> <a href="../spec/#multipart-form-data">4.10.22.6 Multipart form data</a> <span class="id">(multipart-form-data)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=plain-text-form-data" class="status LC">LC</a> <a href="../spec/#plain-text-form-data">4.10.22.7 Plain text form data</a> <span class="id">(plain-text-form-data)</span></li>
 </ol></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=resetting-a-form" class="status LC">LC</a> <a href="../spec/#resetting-a-form">4.10.23
 Resetting a form</a> <span class="id">(resetting-a-form)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=event-dispatch" class="status LC">LC</a> <a href="../spec/#event-dispatch">4.10.24
-Event dispatch</a> <span class="id">(event-dispatch)</span></li>
 </ol></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=interactive-elements" class="status LC">LC</a> <a href="../spec/#interactive-elements">4.11
 Interactive elements</a> <span class="id">(interactive-elements)</span>
@@ -738,8 +759,8 @@
 </ol></li>
 </ol></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=links" class="status LC">LC</a> <a href="../spec/#links">4.12 Links</a> <span class="id">(links)</span>
-<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=introduction-2" class="status LC">LC</a> <a href="../spec/#introduction-2">4.12.1
-Introduction</a> <span class="id">(introduction-2)</span></li>
+<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=introduction-3" class="status LC">LC</a> <a href="../spec/#introduction-3">4.12.1
+Introduction</a> <span class="id">(introduction-3)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=links-created-by-a-and-area-elements" class="status ADD">ADD</a> <a href="../spec/#links-created-by-a-and-area-elements">4.12.2 Links created by a and
 area elements</a> <span class="id">(links-created-by-a-and-area-elements)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=following-hyperlinks" class="status LC">LC</a> <a href="../spec/#following-hyperlinks">4.12.3 Following hyperlinks</a> <span class="id">(following-hyperlinks)</span></li>
@@ -747,50 +768,43 @@
 types</a> <span class="id">(linkTypes)</span>
 <ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=rel-alternate" class="status ADD">ADD</a> <a href="../spec/#rel-alternate">4.12.4.1
 Link type "alternate"</a> <span class="id">(rel-alternate)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=rel-archives" class="status ADD">ADD</a> <a href="../spec/#rel-archives">4.12.4.2
-Link type "archives"</a> <span class="id">(rel-archives)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-author" class="status LC">LC</a> <a href="../spec/#link-type-author">4.12.4.3
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-author" class="status LC">LC</a> <a href="../spec/#link-type-author">4.12.4.2
 Link type "author"</a> <span class="id">(link-type-author)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-bookmark" class="status LC">LC</a> <a href="../spec/#link-type-bookmark">4.12.4.4 Link type "bookmark"</a> <span class="id">(link-type-bookmark)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-external" class="status LC">LC</a> <a href="../spec/#link-type-external">4.12.4.5 Link type "external"</a> <span class="id">(link-type-external)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-help" class="status LC">LC</a> <a href="../spec/#link-type-help">4.12.4.6
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-bookmark" class="status LC">LC</a> <a href="../spec/#link-type-bookmark">4.12.4.3 Link type "bookmark"</a> <span class="id">(link-type-bookmark)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-external" class="status LC">LC</a> <a href="../spec/#link-type-external">4.12.4.4 Link type "external"</a> <span class="id">(link-type-external)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-help" class="status LC">LC</a> <a href="../spec/#link-type-help">4.12.4.5
 Link type "help"</a> <span class="id">(link-type-help)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=rel-icon" class="status LC">LC</a> <a href="../spec/#rel-icon">4.12.4.7 Link
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=rel-icon" class="status LC">LC</a> <a href="../spec/#rel-icon">4.12.4.6 Link
 type "icon"</a> <span class="id">(rel-icon)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-license" class="status LC">LC</a> <a href="../spec/#link-type-license">4.12.4.8 Link type "license"</a> <span class="id">(link-type-license)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-nofollow" class="status LC">LC</a> <a href="../spec/#link-type-nofollow">4.12.4.9 Link type "nofollow"</a> <span class="id">(link-type-nofollow)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-noreferrer" class="status LC">LC</a> <a href="../spec/#link-type-noreferrer">4.12.4.10 Link type
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-license" class="status LC">LC</a> <a href="../spec/#link-type-license">4.12.4.7 Link type "license"</a> <span class="id">(link-type-license)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-nofollow" class="status LC">LC</a> <a href="../spec/#link-type-nofollow">4.12.4.8 Link type "nofollow"</a> <span class="id">(link-type-nofollow)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-noreferrer" class="status LC">LC</a> <a href="../spec/#link-type-noreferrer">4.12.4.9 Link type
 "noreferrer"</a> <span class="id">(link-type-noreferrer)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-pingback" class="status LC">LC</a> <a href="../spec/#link-type-pingback">4.12.4.11 Link type "pingback"</a> <span class="id">(link-type-pingback)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-prefetch" class="status LC">LC</a> <a href="../spec/#link-type-prefetch">4.12.4.12 Link type "prefetch"</a> <span class="id">(link-type-prefetch)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-search" class="status LC">LC</a> <a href="../spec/#link-type-search">4.12.4.13 Link type "search"</a> <span class="id">(link-type-search)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-pingback" class="status LC">LC</a> <a href="../spec/#link-type-pingback">4.12.4.10 Link type "pingback"</a> <span class="id">(link-type-pingback)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-prefetch" class="status LC">LC</a> <a href="../spec/#link-type-prefetch">4.12.4.11 Link type "prefetch"</a> <span class="id">(link-type-prefetch)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-search" class="status LC">LC</a> <a href="../spec/#link-type-search">4.12.4.12 Link type "search"</a> <span class="id">(link-type-search)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-sidebar" class="status LC">LC</a> <a href="../spec/#link-type-sidebar">4.12.4.13 Link type "sidebar"</a> <span class="id">(link-type-sidebar)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-stylesheet" class="status LC">LC</a> <a href="../spec/#link-type-stylesheet">4.12.4.14 Link type
 "stylesheet"</a> <span class="id">(link-type-stylesheet)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-sidebar" class="status LC">LC</a> <a href="../spec/#link-type-sidebar">4.12.4.15 Link type "sidebar"</a> <span class="id">(link-type-sidebar)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-tag" class="status LC">LC</a> <a href="../spec/#link-type-tag">4.12.4.16
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-tag" class="status LC">LC</a> <a href="../spec/#link-type-tag">4.12.4.15
 Link type "tag"</a> <span class="id">(link-type-tag)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=hierarchical-link-types" class="status LC">LC</a> <a href="../spec/#hierarchical-link-types">4.12.4.17 Hierarchical link types</a> <span class="id">(hierarchical-link-types)</span>
-<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-index" class="status LC">LC</a> <a href="../spec/#link-type-index">4.12.4.17.1 Link type "index"</a> <span class="id">(link-type-index)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-up" class="status LC">LC</a> <a href="../spec/#link-type-up">4.12.4.17.2
-Link type "up"</a> <span class="id">(link-type-up)</span></li>
-</ol></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=sequential-link-types" class="status LC">LC</a> <a href="../spec/#sequential-link-types">4.12.4.18 Sequential link types</a> <span class="id">(sequential-link-types)</span>
-<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-first" class="status LC">LC</a> <a href="../spec/#link-type-first">4.12.4.18.1 Link type "first"</a> <span class="id">(link-type-first)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-last" class="status LC">LC</a> <a href="../spec/#link-type-last">4.12.4.18.2 Link type "last"</a> <span class="id">(link-type-last)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-next" class="status LC">LC</a> <a href="../spec/#link-type-next">4.12.4.18.3 Link type "next"</a> <span class="id">(link-type-next)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-prev" class="status LC">LC</a> <a href="../spec/#link-type-prev">4.12.4.18.4 Link type "prev"</a> <span class="id">(link-type-prev)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=sequential-link-types" class="status LC">LC</a> <a href="../spec/#sequential-link-types">4.12.4.16 Sequential link types</a> <span class="id">(sequential-link-types)</span>
+<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-next" class="status LC">LC</a> <a href="../spec/#link-type-next">4.12.4.16.1 Link type "next"</a> <span class="id">(link-type-next)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=link-type-prev" class="status LC">LC</a> <a href="../spec/#link-type-prev">4.12.4.16.2 Link type "prev"</a> <span class="id">(link-type-prev)</span></li>
 </ol></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=other-link-types" class="status LC">LC</a> <a href="../spec/#other-link-types">4.12.4.19 Other link types</a> <span class="id">(other-link-types)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=other-link-types" class="status LC">LC</a> <a href="../spec/#other-link-types">4.12.4.17 Other link types</a> <span class="id">(other-link-types)</span></li>
 </ol></li>
 </ol></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=common-idioms-without-dedicated-elements" class="status LC">LC</a> <a href="../spec/#common-idioms-without-dedicated-elements">4.13
 Common idioms without dedicated elements</a> <span class="id">(common-idioms-without-dedicated-elements)</span>
 <ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=the-main-part-of-the-content" class="status ADD">ADD</a> <a href="../spec/#the-main-part-of-the-content">4.13.1 The main part of the content</a> <span class="id">(the-main-part-of-the-content)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=tag-clouds" class="status LC">LC</a> <a href="../spec/#tag-clouds">4.13.2 Tag
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=rel-up" class="status ADD">ADD</a> <a href="../spec/#rel-up">4.13.2 Bread crumb
+navigation</a> <span class="id">(rel-up)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=tag-clouds" class="status LC">LC</a> <a href="../spec/#tag-clouds">4.13.3 Tag
 clouds</a> <span class="id">(tag-clouds)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=conversations" class="status LC">LC</a> <a href="../spec/#conversations">4.13.3
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=conversations" class="status LC">LC</a> <a href="../spec/#conversations">4.13.4
 Conversations</a> <span class="id">(conversations)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=footnotes" class="status LC">LC</a> <a href="../spec/#footnotes">4.13.4
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=footnotes" class="status LC">LC</a> <a href="../spec/#footnotes">4.13.5
 Footnotes</a> <span class="id">(footnotes)</span></li>
 </ol></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=matching-html-elements-using-selectors" class="status LC">LC</a> <a href="../spec/#matching-html-elements-using-selectors">4.14 Matching HTML elements using selectors</a> <span class="id">(matching-html-elements-using-selectors)</span>
@@ -879,8 +893,8 @@
 </ol></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=offline" class="status LC">LC</a> <a href="../spec/#offline">5.6 Offline Web
 applications</a> <span class="id">(offline)</span>
-<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=introduction-3" class="status LC">LC</a> <a href="../spec/#introduction-3">5.6.1
-Introduction</a> <span class="id">(introduction-3)</span>
+<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=introduction-4" class="status LC">LC</a> <a href="../spec/#introduction-4">5.6.1
+Introduction</a> <span class="id">(introduction-4)</span>
 <ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=appcacheevents" class="status LC">LC</a> <a href="../spec/#appcacheevents">5.6.1.1
 Event summary</a> <span class="id">(appcacheevents)</span></li>
 </ol></li>
@@ -909,8 +923,8 @@
 application APIs</a> <span class="id">(webappapis)</span>
 <ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=scripting" class="status LC">LC</a> <a href="../spec/#scripting">6.1
 Scripting</a> <span class="id">(scripting)</span>
-<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=introduction-4" class="status LC">LC</a> <a href="../spec/#introduction-4">6.1.1
-Introduction</a> <span class="id">(introduction-4)</span></li>
+<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=introduction-5" class="status WD">WD</a> <a href="../spec/#introduction-5">6.1.1
+Introduction</a> <span class="id">(introduction-5)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=enabling-and-disabling-scripting" class="status LC">LC</a> <a href="../spec/#enabling-and-disabling-scripting">6.1.2 Enabling and disabling scripting</a> <span class="id">(enabling-and-disabling-scripting)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=processing-model-1" class="status LC">LC</a> <a href="../spec/#processing-model-1">6.1.3
 Processing model</a> <span class="id">(processing-model-1)</span>
@@ -983,8 +997,8 @@
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=element-level-focus-apis" class="status LC">LC</a> <a href="../spec/#element-level-focus-apis">7.3.4 Element-level focus APIs</a> <span class="id">(element-level-focus-apis)</span></li>
 </ol></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=assigning-keyboard-shortcuts" class="status ADD">ADD</a> <a href="../spec/#assigning-keyboard-shortcuts">7.4 Assigning keyboard shortcuts</a> <span class="id">(assigning-keyboard-shortcuts)</span>
-<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=introduction-5" class="status WD">WD</a> <a href="../spec/#introduction-5">7.4.1
-Introduction</a> <span class="id">(introduction-5)</span></li>
+<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=introduction-6" class="status LC">LC</a> <a href="../spec/#introduction-6">7.4.1
+Introduction</a> <span class="id">(introduction-6)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-accesskey-attribute" class="status LC">LC</a> <a href="../spec/#the-accesskey-attribute">7.4.2 The accesskey attribute</a> <span class="id">(the-accesskey-attribute)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=processing-model-3" class="status WD">WD</a> <a href="../spec/#processing-model-3">7.4.3
 Processing model</a> <span class="id">(processing-model-3)</span></li>
@@ -997,8 +1011,8 @@
 </ol></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=spelling-and-grammar-checking" class="status LC">LC</a> <a href="../spec/#spelling-and-grammar-checking">7.6 Spelling and grammar checking</a> <span class="id">(spelling-and-grammar-checking)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=dnd" class="status LC">LC</a> <a href="../spec/#dnd">7.7 Drag and drop</a> <span class="id">(dnd)</span>
-<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=introduction-6" class="status LC">LC</a> <a href="../spec/#introduction-6">7.7.1
-Introduction</a> <span class="id">(introduction-6)</span></li>
+<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=introduction-7" class="status LC">LC</a> <a href="../spec/#introduction-7">7.7.1
+Introduction</a> <span class="id">(introduction-7)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=the-drag-data-store" class="status ADD">ADD</a> <a href="../spec/#the-drag-data-store">7.7.2
 The drag data store</a> <span class="id">(the-drag-data-store)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=the-datatransfer-interface" class="status ADD">ADD</a> <a href="../spec/#the-datatransfer-interface">7.7.3 The DataTransfer interface</a> <span class="id">(the-datatransfer-interface)</span>
@@ -1016,7 +1030,7 @@
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=security-risks-in-the-drag-and-drop-model" class="status LC">LC</a> <a href="../spec/#security-risks-in-the-drag-and-drop-model">7.7.9 Security risks in the drag-and-drop
 model</a> <span class="id">(security-risks-in-the-drag-and-drop-model)</span></li>
 </ol></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=editing-apis" class="status LC">LC</a> <a href="../spec/#editing-apis">7.8 Editing
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=editing-apis" class="status FD">FD</a> <a href="../spec/#editing-apis">7.8 Editing
 APIs</a> <span class="id">(editing-apis)</span></li>
 </ol></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=syntax" class="status ADD">ADD</a> <a href="../spec/#syntax">8 The HTML
@@ -1179,37 +1193,42 @@
 tags</a> <span class="id">(closing-elements-that-have-implied-end-tags)</span></li>
 <li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=foster-parenting" class="status LC">LC</a> <a href="../spec/#foster-parenting">8.2.5.3
 Foster parenting</a> <span class="id">(foster-parenting)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-initial-insertion-mode" class="status LC">LC</a> <a href="../spec/#the-initial-insertion-mode">8.2.5.4 The "initial" insertion mode</a> <span class="id">(the-initial-insertion-mode)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-before-html-insertion-mode" class="status LC">LC</a> <a href="../spec/#the-before-html-insertion-mode">8.2.5.5 The "before html" insertion mode</a> <span class="id">(the-before-html-insertion-mode)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-before-head-insertion-mode" class="status LC">LC</a> <a href="../spec/#the-before-head-insertion-mode">8.2.5.6 The "before head" insertion mode</a> <span class="id">(the-before-head-insertion-mode)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-inhead" class="status LC">LC</a> <a href="../spec/#parsing-main-inhead">8.2.5.7 The "in head" insertion mode</a> <span class="id">(parsing-main-inhead)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-inheadnoscript" class="status LC">LC</a> <a href="../spec/#parsing-main-inheadnoscript">8.2.5.8 The "in head noscript" insertion
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/add-section.html?section=parsing-main-inhtml" class="status ADD">ADD</a> <a href="../spec/#parsing-main-inhtml">8.2.5.4 The rules for parsing tokens in HTML
+content</a> <span class="id">(parsing-main-inhtml)</span>
+<ol><li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-initial-insertion-mode" class="status LC">LC</a> <a href="../spec/#the-initial-insertion-mode">8.2.5.4.1 The "initial" insertion mode</a> <span class="id">(the-initial-insertion-mode)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-before-html-insertion-mode" class="status LC">LC</a> <a href="../spec/#the-before-html-insertion-mode">8.2.5.4.2 The "before html" insertion mode</a> <span class="id">(the-before-html-insertion-mode)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-before-head-insertion-mode" class="status LC">LC</a> <a href="../spec/#the-before-head-insertion-mode">8.2.5.4.3 The "before head" insertion mode</a> <span class="id">(the-before-head-insertion-mode)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-inhead" class="status LC">LC</a> <a href="../spec/#parsing-main-inhead">8.2.5.4.4 The "in head" insertion mode</a> <span class="id">(parsing-main-inhead)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-inheadnoscript" class="status LC">LC</a> <a href="../spec/#parsing-main-inheadnoscript">8.2.5.4.5 The "in head noscript" insertion
 mode</a> <span class="id">(parsing-main-inheadnoscript)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-after-head-insertion-mode" class="status LC">LC</a> <a href="../spec/#the-after-head-insertion-mode">8.2.5.9 The "after head" insertion mode</a> <span class="id">(the-after-head-insertion-mode)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-inbody" class="status LC">LC</a> <a href="../spec/#parsing-main-inbody">8.2.5.10 The "in body" insertion mode</a> <span class="id">(parsing-main-inbody)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-incdata" class="status LC">LC</a> <a href="../spec/#parsing-main-incdata">8.2.5.11 The "text" insertion mode</a> <span class="id">(parsing-main-incdata)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-intable" class="status LC">LC</a> <a href="../spec/#parsing-main-intable">8.2.5.12 The "in table" insertion mode</a> <span class="id">(parsing-main-intable)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-intabletext" class="status LC">LC</a> <a href="../spec/#parsing-main-intabletext">8.2.5.13 The "in table text" insertion mode</a> <span class="id">(parsing-main-intabletext)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-incaption" class="status LC">LC</a> <a href="../spec/#parsing-main-incaption">8.2.5.14 The "in caption" insertion mode</a> <span class="id">(parsing-main-incaption)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-incolgroup" class="status LC">LC</a> <a href="../spec/#parsing-main-incolgroup">8.2.5.15 The "in column group" insertion
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-after-head-insertion-mode" class="status LC">LC</a> <a href="../spec/#the-after-head-insertion-mode">8.2.5.4.6 The "after head" insertion mode</a> <span class="id">(the-after-head-insertion-mode)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-inbody" class="status LC">LC</a> <a href="../spec/#parsing-main-inbody">8.2.5.4.7 The "in body" insertion mode</a> <span class="id">(parsing-main-inbody)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-incdata" class="status LC">LC</a> <a href="../spec/#parsing-main-incdata">8.2.5.4.8 The "text" insertion mode</a> <span class="id">(parsing-main-incdata)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-intable" class="status LC">LC</a> <a href="../spec/#parsing-main-intable">8.2.5.4.9 The "in table" insertion mode</a> <span class="id">(parsing-main-intable)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-intabletext" class="status LC">LC</a> <a href="../spec/#parsing-main-intabletext">8.2.5.4.10 The "in table text" insertion
+mode</a> <span class="id">(parsing-main-intabletext)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-incaption" class="status LC">LC</a> <a href="../spec/#parsing-main-incaption">8.2.5.4.11 The "in caption" insertion mode</a> <span class="id">(parsing-main-incaption)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-incolgroup" class="status LC">LC</a> <a href="../spec/#parsing-main-incolgroup">8.2.5.4.12 The "in column group" insertion
 mode</a> <span class="id">(parsing-main-incolgroup)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-intbody" class="status LC">LC</a> <a href="../spec/#parsing-main-intbody">8.2.5.16 The "in table body" insertion mode</a> <span class="id">(parsing-main-intbody)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-intr" class="status LC">LC</a> <a href="../spec/#parsing-main-intr">8.2.5.17 The "in row" insertion mode</a> <span class="id">(parsing-main-intr)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-intd" class="status LC">LC</a> <a href="../spec/#parsing-main-intd">8.2.5.18 The "in cell" insertion mode</a> <span class="id">(parsing-main-intd)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-inselect" class="status LC">LC</a> <a href="../spec/#parsing-main-inselect">8.2.5.19 The "in select" insertion mode</a> <span class="id">(parsing-main-inselect)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-inselectintable" class="status LC">LC</a> <a href="../spec/#parsing-main-inselectintable">8.2.5.20 The "in select in table" insertion
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-intbody" class="status LC">LC</a> <a href="../spec/#parsing-main-intbody">8.2.5.4.13 The "in table body" insertion
+mode</a> <span class="id">(parsing-main-intbody)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-intr" class="status LC">LC</a> <a href="../spec/#parsing-main-intr">8.2.5.4.14 The "in row" insertion mode</a> <span class="id">(parsing-main-intr)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-intd" class="status LC">LC</a> <a href="../spec/#parsing-main-intd">8.2.5.4.15 The "in cell" insertion mode</a> <span class="id">(parsing-main-intd)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-inselect" class="status LC">LC</a> <a href="../spec/#parsing-main-inselect">8.2.5.4.16 The "in select" insertion mode</a> <span class="id">(parsing-main-inselect)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-inselectintable" class="status LC">LC</a> <a href="../spec/#parsing-main-inselectintable">8.2.5.4.17 The "in select in table" insertion
 mode</a> <span class="id">(parsing-main-inselectintable)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-inforeign" class="status LC">LC</a> <a href="../spec/#parsing-main-inforeign">8.2.5.21 The "in foreign content" insertion
-mode</a> <span class="id">(parsing-main-inforeign)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-afterbody" class="status LC">LC</a> <a href="../spec/#parsing-main-afterbody">8.2.5.22 The "after body" insertion mode</a> <span class="id">(parsing-main-afterbody)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-inframeset" class="status LC">LC</a> <a href="../spec/#parsing-main-inframeset">8.2.5.23 The "in frameset" insertion mode</a> <span class="id">(parsing-main-inframeset)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-afterframeset" class="status LC">LC</a> <a href="../spec/#parsing-main-afterframeset">8.2.5.24 The "after frameset" insertion
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-afterbody" class="status LC">LC</a> <a href="../spec/#parsing-main-afterbody">8.2.5.4.18 The "after body" insertion mode</a> <span class="id">(parsing-main-afterbody)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-inframeset" class="status LC">LC</a> <a href="../spec/#parsing-main-inframeset">8.2.5.4.19 The "in frameset" insertion mode</a> <span class="id">(parsing-main-inframeset)</span></li>
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=parsing-main-afterframeset" class="status LC">LC</a> <a href="../spec/#parsing-main-afterframeset">8.2.5.4.20 The "after frameset" insertion
 mode</a> <span class="id">(parsing-main-afterframeset)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-after-after-body-insertion-mode" class="status LC">LC</a> <a href="../spec/#the-after-after-body-insertion-mode">8.2.5.25 The "after after body" insertion
+<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-after-after-body-insertion-mode" class="status LC">LC</a> <a href="../spec/#the-after-after-body-insertion-mode">8.2.5.4.21 The "after after body" insertion
 mode</a> <span class="id">(the-after-after-body-insertion-mode)</span></li>
-<li><a target="_blank" href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=the-after-after-frameset-insertion-mode" class="status LC">LC</a> <a href="../spec/#the-after-after-frameset-insertion-mode">8.2.5.26 The "after after frameset" insertion
+<li><a target="_blank" href="