html5/markup Overview.html,1.354,1.355 command.checkbox.html,1.15,1.16 command.command.html,1.15,1.16 command.radio.html,1.15,1.16 common-attributes.html,1.24,1.25 common-models.html,1.18,1.19 datalist.html,1.17,1.18 datatypes.html,1.28,1.29 documents.html,1.11,1.12 elements.html,1.20,1.21 intro.html,1.12,1.13 link.html,1.15,1.16 meta.charset.html,1.16,1.17 meta.http-equiv.content-language.html,1.9,1.10 meta.http-equiv.content-type.html,1.16,1.17 meta.http-equiv.default-style.html,1.15,1.16 meta.http-equiv.refresh.html,1.13,1.14 meta.name.html,1.15,1.16 noscript.html,1.17,1.18 p.html,1.16,1.17 patch-schema,1.77,1.78 script.html,1.20,1.21 spec.html,1.100,1.101 style.html,1.19,1.20 syntax.html,1.28,1.29 terminology.html,1.18,1.19 datagrid.html,1.20,NONE

Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv18169

Modified Files:
	Overview.html command.checkbox.html command.command.html 
	command.radio.html common-attributes.html common-models.html 
	datalist.html datatypes.html documents.html elements.html 
	intro.html link.html meta.charset.html 
	meta.http-equiv.content-language.html 
	meta.http-equiv.content-type.html 
	meta.http-equiv.default-style.html 
	meta.http-equiv.refresh.html meta.name.html noscript.html 
	p.html patch-schema script.html spec.html style.html 
	syntax.html terminology.html 
Removed Files:
	datagrid.html 
Log Message:
removed <datagrid> and made assorted refinements to prose


Index: Overview.html
===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -d -r1.354 -r1.355
--- Overview.html	21 Aug 2009 16:02:18 -0000	1.354
+++ Overview.html	3 Sep 2009 02:39:01 -0000	1.355
@@ -9,7 +9,7 @@
 <body>
 <div class="head">
 <h1>HTML 5: The Markup Language</h1>
-<h2>Editor&#8217;s Draft <em>22 August 2009</em>
+<h2>Editor&#8217;s Draft <em>3 September 2009</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -30,7 +30,7 @@
       <h2>Abstract <a class="hash" href="#abstract">#</a>
 </h2>
       <p>This specification describes the fifth major version of
-      the HTML language and provides the details necessary for
+      the HTML language and provides details necessary for
       producers of HTML content to create documents that conform
       to the language. By design, it does not define related APIs
       nor attempt to specify how consumers of HTML content are
@@ -42,43 +42,40 @@
     
     
     <p>
-        This document is the 22 August 2009 Editor&#8217;s Draft of 
+        This document is the 3 September 2009 Editor&#8217;s Draft of 
         <cite>HTML 5: The Markup Language</cite>.
       </p>
-    <p>
-      You can find the source for the current version of this document
-      <a href="http://dev.w3.org/html5/markup/">online</a>.
-    </p>
+    
     <div>
   <p>This document does not represent consensus in the HTML
   Working Group. In particular, some members of the group do not
-  support normative status for this document, and thus do not
-  support its advance on the Recommendation track.  Discussions
-  about the normative status of this document are ongoing, and no
-  decision has been taken yet. Like all documents produced by the
-  HTML Working Group, this document will use the design approach
-  described in <a href="http://www.w3.org/TR/html-design-principles/">HTML Design Principles</a>.</p>
+  support normative status for it, and thus do not support its
+  advance on the W3C Recommendation track. Discussions about the
+  normative status of this document are ongoing, and no decision
+  has been reached yet. As with other documents produced by the
+  HTML Working Group, this document uses the design approach
+  described in
+  <a href="http://www.w3.org/TR/html-design-principles/">HTML Design Principles</a>.</p>
   <div>
     <h2>Instability and incompleteness of this document</h2>
-    <p>This document should not be considered stable. All
-    parts of it remain subject to significant change or complete
-    removal. Also, this document should in no way be considered
-    complete. In particular, many elements in the 
-    <a href="#html-elements">HTML elements</a>
-    section of this document currently lack the following
-    subsections:</p>
+    <p>This document is a working draft &#8212; all parts of it remain
+    subject to significant change or removal, and some parts are
+    currently incomplete; in particular, many elements currently
+    lack complete documentation in the following subsections:</p>
     <dl class="status-missing">
 <dt><span class="section-title-ref">Examples</span></dt>
-      <dd>The plan is to have one of these subsections for every
-        element, with each giving at least one conformant example
-        and at least one non-conformant example.</dd>
+      <dd>The documentation for each element will eventually have
+        at least one conformant example and at least one
+        non-conformant example.</dd>
       <dt><span class="section-title-ref">Details</span></dt>
-      <dd>Where needed, this subsection provides additional details
-        about the semantics of the element and its attributes.</dd>
+      <dd>The purpose of this subsection is to provide, where
+        needed, additional details about the semantics of the
+        element and its attributes.</dd>
       <dt><span class="section-title-ref">Additional constraints</span></dt>
-      <dd>Where needed, this subsection provides additional
-        document-conformance constraints for the element and its
-        attributes (in addition to those already document in the
+      <dd>This purpose of this subsection is to provide, where
+        needed, additional document-conformance constraints for
+        the element and its attributes (in addition to those
+        already documented in the
         <i>Content model</i>,
         <i>Attribute model</i>,
         <i>Assertions</i>,
@@ -294,9 +291,6 @@
 <li id="command.checkbox-toc">
 <span class="toc-section-number"></span><a href="command.checkbox.html#command.checkbox"><span class="toc-section-number"></span> <span class="element">command</span> <span class="elem-qualifier"><span class="attribute-name">type</span>=<span class="equals-value">checkbox</span></span> &#8211; <span class="shortdesc">state or option that can be toggled</span></a>
 </li>
-<li id="datagrid-toc">
-<span class="toc-section-number"></span><a href="datagrid.html#datagrid"><span class="toc-section-number"></span> <span class="element">datagrid</span> &#8211; <span class="shortdesc">datagrid</span></a>
-</li>
 <li id="datalist-toc">
 <span class="toc-section-number"></span><a href="datalist.html#datalist"><span class="toc-section-number"></span> <span class="element">datalist</span> &#8211; <span class="shortdesc">predefined options for other controls</span></a>
 </li>

--- datagrid.html DELETED ---

Index: meta.name.html
===================================================================
RCS file: /sources/public/html5/markup/meta.name.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- meta.name.html	20 Aug 2009 09:22:39 -0000	1.15
+++ meta.name.html	3 Sep 2009 02:39:03 -0000	1.16
@@ -94,11 +94,11 @@
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>)</li></ul>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="command.html#command">command</a></li></ul>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: meta.http-equiv.content-type.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.content-type.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- meta.http-equiv.content-type.html	20 Aug 2009 09:22:39 -0000	1.16
+++ meta.http-equiv.content-type.html	3 Sep 2009 02:39:03 -0000	1.17
@@ -82,11 +82,11 @@
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>)</li></ul>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="command.html#command">command</a></li></ul>
       </div>
       
         <div class="no-number no-toc" id="meta.http-equiv.content-type-details">

Index: meta.http-equiv.content-language.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.content-language.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- meta.http-equiv.content-language.html	20 Aug 2009 09:22:39 -0000	1.9
+++ meta.http-equiv.content-language.html	3 Sep 2009 02:39:03 -0000	1.10
@@ -68,11 +68,11 @@
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>)</li></ul>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="command.html#command">command</a></li></ul>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: script.html
===================================================================
RCS file: /sources/public/html5/markup/script.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- script.html	20 Aug 2009 09:22:40 -0000	1.20
+++ script.html	3 Sep 2009 02:39:03 -0000	1.21
@@ -115,11 +115,11 @@
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>)</li>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="command.html#command">command</a></li>
         <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
       </div>
       

Index: meta.http-equiv.default-style.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.default-style.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- meta.http-equiv.default-style.html	20 Aug 2009 09:22:39 -0000	1.15
+++ meta.http-equiv.default-style.html	3 Sep 2009 02:39:03 -0000	1.16
@@ -77,11 +77,11 @@
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>)</li>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="command.html#command">command</a></li>
         <li class="context-mdl"><a href="noscript.html#noscript.elem.head">noscript.elem.head</a> = (<a class="ref" href="link.html#link">link</a>
    <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
    <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>

Index: command.command.html
===================================================================
RCS file: /sources/public/html5/markup/command.command.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- command.command.html	20 Aug 2009 09:22:36 -0000	1.15
+++ command.command.html	3 Sep 2009 02:39:02 -0000	1.16
@@ -77,11 +77,11 @@
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>)</li>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="command.html#command">command</a></li>
         <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
       </div>
       </div>

Index: intro.html
===================================================================
RCS file: /sources/public/html5/markup/intro.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- intro.html	20 Aug 2009 09:22:39 -0000	1.12
+++ intro.html	3 Sep 2009 02:39:03 -0000	1.13
@@ -20,8 +20,12 @@
   and for others to check the conformance of existing documents.
   It is designed:</p>
   <ul>
-    <li>to describe the syntax, structure, and semantics of the
+    <li>to describe the syntax and structure of the
     <a href="documents.html#html-language">HTML language</a></li>
+    <li>to describe the semantics of
+    <a href="elements.html#html-elements">HTML elements</a>
+    and their attributes (that is, to describe what the elements
+    and attributes represent)</li>
     <li>to be clear and unambiguous</li>
     <li>to be as concise and readable as possible</li>
   </ul>

Index: syntax.html
===================================================================
RCS file: /sources/public/html5/markup/syntax.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- syntax.html	20 Aug 2009 09:22:41 -0000	1.28
+++ syntax.html	3 Sep 2009 02:39:04 -0000	1.29
@@ -325,9 +325,8 @@
       all have names that only use characters in the range
       <code title="U+0030 DIGIT ZERO&#8211;U+0039 DIGIT NINE">0&#8211;9</code>,
       <code title="U+0061 LATIN SMALL LETTER A&#8211;U+007A LATIN SMALL LETTER Z">a&#8211;z</code>,
-      <code title="U+0041 LATIN CAPITAL LETTER A&#8211;U+005A LATIN CAPITAL LETTER Z">A&#8211;Z</code>,
-      and the character
-      "<code title="U+002D HYPHEN-MINUS">-</code>".</li>
+      and
+      <code title="U+0041 LATIN CAPITAL LETTER A&#8211;U+005A LATIN CAPITAL LETTER Z">A&#8211;Z</code>.</li>
       <li>
       <dfn id="syntax-start-tags">Start tags</dfn>
       consist of the following parts, in exactly the following

Index: link.html
===================================================================
RCS file: /sources/public/html5/markup/link.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- link.html	20 Aug 2009 09:22:39 -0000	1.15
+++ link.html	3 Sep 2009 02:39:03 -0000	1.16
@@ -100,11 +100,11 @@
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>)</li>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="command.html#command">command</a></li>
         <li class="context-mdl"><a href="noscript.html#noscript.elem.head">noscript.elem.head</a> = (<a class="ref" href="link.html#link">link</a>
    <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
    <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>

Index: meta.http-equiv.refresh.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.refresh.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- meta.http-equiv.refresh.html	20 Aug 2009 09:22:39 -0000	1.13
+++ meta.http-equiv.refresh.html	3 Sep 2009 02:39:03 -0000	1.14
@@ -81,11 +81,11 @@
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>)</li>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="command.html#command">command</a></li>
         <li class="context-mdl"><a href="noscript.html#noscript.elem.head">noscript.elem.head</a> = (<a class="ref" href="link.html#link">link</a>
    <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
    <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>

Index: terminology.html
===================================================================
RCS file: /sources/public/html5/markup/terminology.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- terminology.html	21 Aug 2009 13:10:59 -0000	1.18
+++ terminology.html	3 Sep 2009 02:39:04 -0000	1.19
@@ -27,10 +27,10 @@
     <p>The following is a list of terms that are common to various
     other sections in this specification.</p>
   <dl>
-    <dt><dfn id="context">browsing context</dfn></dt>
+    <dt><dfn id="context" title="context">browsing context</dfn></dt>
     <dd>A <a href="terminology.html#context">browsing context</a> is a collection
       of one or more documents and one or more <a href="terminology.html#view">views</a>.</dd>
-    <dt><dfn id="case-insensitive">case-insensitive match</dfn></dt>
+    <dt><dfn id="case-insensitive" title="case-insensitive">case-insensitive match</dfn></dt>
     <dd>For the purposes of this specification,
       performing a
       <a href="terminology.html#case-insensitive">case-insensitive match</a>
@@ -41,22 +41,10 @@
       and the corresponding characters in the range
       <code title="U+0061 LATIN SMALL LETTER A&#8211;U+007A LATIN SMALL LETTER Z">a-z</code>
       are considered to also match.</dd>
-    <dt><dfn id="fallback">fallback content</dfn></dt>
+    <dt><dfn id="fallback" title="fallback">fallback content</dfn></dt>
     <dd>Some embedded content elements can have fallback content:
       content that is to be used when the embedded content cannot
       be used (for example, when it is of an unsupported format).</dd>
-    <dt><dfn id="group" title="group">group</dfn></dt>
-    <dd>A
-      <a href="terminology.html#group">group</a>
-      is any combination of names and symbols in definitions in the
-    <a href="elements.html">HTML elements</a>,
-    <a href="common-models.html">Common content models</a>,
-    <a href="common-attributes.html">Common attributes</a>,
-    or 
-    <a href="forms-attributes.html">Forms attributes</a>
-    that are delimited by a set of matching
-    "<code>(</code>" and "<code>)</code>"
-    (parentheses) symbols.</dd>
     <dt><dfn id="html-producer" title="html-producer">HTML producers</dfn></dt>
     <dd>HTML authors (that is, people) and applications
     (such as editors and content management systems)
@@ -64,7 +52,7 @@
     <dt><dfn id="html-consumer" title="html-consumer">HTML consumers</dfn></dt>
     <dd>HTML user agents; that is, applications (such as
     Web browsers) which consume HTML content</dd>
-    <dt><dfn id="newlines">newline</dfn></dt>
+    <dt><dfn id="newlines" title="newlines">newline</dfn></dt>
     <dd>A <a href="terminology.html#newlines">newline</a> may be represented as any
       of the following:
       <ul>
@@ -74,18 +62,7 @@
         LINE FEED (LF) character</li>
       </ul>
     </dd>
-    <dt><dfn id="pattern-name" title="pattern-name">pattern name</dfn></dt>
-    <dd>A
-      <a href="terminology.html#pattern-name">pattern name</a>
-      is any name used in definitions in the
-    <a href="elements.html">HTML elements</a>,
-    <a href="common-models.html">Common content models</a>,
-    <a href="common-attributes.html">Common attributes</a>,
-    or 
-    <a href="forms-attributes.html">Forms attributes</a>
-    sections of this specification that is not an element name or
-    an attribute name.</dd>
-    <dt><dfn id="space">space</dfn></dt>
+    <dt><dfn id="space" title="space">space</dfn></dt>
     <dd>A <a href="terminology.html#space">space character</a> is any of the
       following:
       <ul>
@@ -96,7 +73,7 @@
         <li>U+000D CARRIAGE RETURN (CR)</li>
       </ul>
     </dd>
-    <dt><dfn id="view">view</dfn></dt>
+    <dt><dfn id="view" title="view">view</dfn></dt>
     <dd>A <a href="terminology.html#view">view</a> is as defined in <cite>Document
         Object Model (DOM) Level 2 Views</cite> <a href="references.html#refsDOM2VIEWS">[DOM2VIEWS]</a>.</dd>
   </dl>
@@ -113,6 +90,16 @@
     and
     <a href="forms-attributes.html">Forms attributes</a>
     sections.</p>
+
+    <p>The explanations use the term 
+    <dfn id="group" title="group">group</dfn>
+    to mean any combination of names and symbols that are
+    delimited by a pair of matching
+    "<code>(</code>" and "<code>)</code>"
+    (parentheses) symbols, and the term
+    <dfn id="pattern-name" title="pattern-name">pattern name</dfn>
+    to mean any hyperlinked name used in a definition that is not
+    an element name or an attribute name.</p>
     <dl id="rnc-symbol-list">
       <dt id="optional"><span class="rnc-symbol">?</span> (optional)</dt>
       <dd>The "<code>?</code>" (question mark) symbol after an
@@ -164,10 +151,6 @@
         <a href="terminology.html#group">groups</a>
         indicates that the two items it separates can occur in any
         order.</dd>
-      <dt id="parentheses"><span class="rnc-symbol">(</span> and <span class="rnc-symbol">)</span> (grouping)</dt>
-      <dd>The "<code>(</code>" and "<code>)</code>" (parentheses)
-        symbols are used to delimit multiple items such that they
-        are treated as a group.</dd>
     </dl>
   </div>
 </div>

Index: datatypes.html
===================================================================
RCS file: /sources/public/html5/markup/datatypes.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- datatypes.html	20 Aug 2009 09:22:37 -0000	1.28
+++ datatypes.html	3 Sep 2009 02:39:03 -0000	1.29
@@ -28,9 +28,7 @@
     datatype, a
     <dfn id="data-string" title="string">string</dfn>
     is defined as
-    <a href="syntax.html#normal-character-data">normal character data</a>
-    that does not contain any
-    <a href="syntax.html#syntax-ambiguous-ampersand">ambiguous ampersands</a>.</p>
+    <a href="syntax.html#normal-character-data">normal character data</a>.</p>
     <p>The <a href="syntax.html#syntax-attributes">Attributes</a> section of
     this document describes additional restrictions on strings in
     attribute values &#8212; in particular, restrictions for the

Index: command.radio.html
===================================================================
RCS file: /sources/public/html5/markup/command.radio.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- command.radio.html	20 Aug 2009 09:22:36 -0000	1.15
+++ command.radio.html	3 Sep 2009 02:39:03 -0000	1.16
@@ -89,11 +89,11 @@
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>)</li>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="command.html#command">command</a></li>
         <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
       </div>
       </div>

Index: common-models.html
===================================================================
RCS file: /sources/public/html5/markup/common-models.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- common-models.html	21 Aug 2009 16:02:19 -0000	1.18
+++ common-models.html	3 Sep 2009 02:39:03 -0000	1.19
@@ -59,7 +59,6 @@
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="table.html#table">table</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="form.html#form">form</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="fieldset.html#fieldset">fieldset</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="datagrid.html#datagrid">datagrid</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="menu.html#menu">menu</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="canvas.html#canvas.elem.flow">canvas.elem.flow</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="details.html#details">details</a>
@@ -76,11 +75,11 @@
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="command.html#command">command</a>
           </dd>
         </dl>
       </div>

Index: style.html
===================================================================
RCS file: /sources/public/html5/markup/style.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- style.html	20 Aug 2009 09:22:40 -0000	1.19
+++ style.html	3 Sep 2009 02:39:04 -0000	1.20
@@ -87,11 +87,11 @@
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>)</li>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="command.html#command">command</a></li>
         <li class="context-mdl"><a href="div.html#div-mdl">div</a> = <a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)</li>

Index: documents.html
===================================================================
RCS file: /sources/public/html5/markup/documents.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- documents.html	20 Aug 2009 09:22:37 -0000	1.11
+++ documents.html	3 Sep 2009 02:39:03 -0000	1.12
@@ -13,7 +13,10 @@
 </div>
 <div id="documents" class="section">
   <h2>3. Documents <a class="hash" href="#documents">#</a> <a class="toc-bak" href="Overview.html#documents-toc">T</a></h2>
-  <p>This section introduces the following:</p>
+  <p>This section defines the term
+  <a href="documents.html#document">document</a>,
+  and provides additional details related to the definition of
+  that term. It is divided into the following parts:</p>
   <div class="toc">
 <ul>
 <li id="language-and-syntax-toc"><span class="toc-section-number"></span><a href="documents.html#language-and-syntax"><span class="toc-section-number">1.</span> The HTML language and HTML and XML syntaxes</a>
@@ -30,7 +33,9 @@
       <h2>3.01. The HTML language and HTML and XML syntaxes <a class="hash" href="#language-and-syntax">#</a> <a class="toc-bak" href="Overview.html#language-and-syntax-toc">T</a></h2>
   <p>The term
   <dfn id="document" title="document">document</dfn> is used in this specification
-  to mean an instance of the HTML language. The
+  to mean an instance of the
+  <a href="documents.html#html-language">HTML language</a>.</p>
+  <p>The
   <dfn id="html-language" title="html-language">HTML language</dfn> is the language
   described in this specification; it is an abstract language that
   applications can potentially represent in memory in any number
@@ -38,7 +43,8 @@
   of possible concrete syntaxes.</p>
   <p>This specification makes
   reference to two particular concrete syntaxes for the 
-  <a href="documents.html#html-language">HTML language</a>: One syntax which
+  <a href="documents.html#html-language">HTML language</a>:
+  One syntax which
   is referred to throughout this specification as
   <a href="documents.html#html-syntax">the HTML syntax</a>,
   and another syntax, which is referred to throughout this
@@ -170,7 +176,7 @@
       <a href="terminology.html#case-insensitive">case-insensitive match</a>
       for the names of the elements given in the
       <a href="elements.html">HTML elements</a>
-      section of this document; tag names are
+      section of this document; that is, tag names are
       case-insensitive.</li>
       <li><a href="syntax.html#attribute-name">Attribute names</a>
       for
@@ -180,7 +186,7 @@
       <a href="terminology.html#case-insensitive">case-insensitive match</a>
       for the names of the attributes given in the
       <a href="elements.html">HTML elements</a>
-      section of this document; attribute names are
+      section of this document; that is, attribute names are
       case-insensitive.</li>
     </ul>
     <p>In
@@ -191,14 +197,14 @@
       <a href="elements.html#html-elements">HTML elements</a>
       must exactly match the names of the elements given in the
       <a href="elements.html">HTML elements</a>
-      section of this document; tag names are
+      section of this document; that is, tag names are
       case-sensitive.</li>
       <li><a href="syntax.html#attribute-name">Attribute names</a>
       for
       <a href="elements.html#html-elements">HTML elements</a>
       must exactly match the names of the attributes given in the
       <a href="elements.html">HTML elements</a>
-      section of this document; attribute names are
+      section of this document; that is, attribute names are
       case-sensitive.</li>
     </ul>
   </div>

Index: p.html
===================================================================
RCS file: /sources/public/html5/markup/p.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- p.html	20 Aug 2009 09:22:39 -0000	1.16
+++ p.html	3 Sep 2009 02:39:03 -0000	1.17
@@ -43,7 +43,6 @@
     <code><a href="article.html#article">article</a></code>,
     <code><a href="aside.html#aside">aside</a></code>,
     <code><a href="blockquote.html#blockquote">blockquote</a></code>,
-    <code><a href="datagrid.html#datagrid">datagrid</a></code>,
     <code><a href="dialog.html#dialog">dialog</a></code>,
     <code>dir</code>,
     <code><a href="div.html#div">div</a></code>,

Index: command.checkbox.html
===================================================================
RCS file: /sources/public/html5/markup/command.checkbox.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- command.checkbox.html	20 Aug 2009 09:22:36 -0000	1.15
+++ command.checkbox.html	3 Sep 2009 02:39:02 -0000	1.16
@@ -9,7 +9,7 @@
 <h2 class="chunkpagetitle"><a href="Overview.html">HTML 5: The Markup Language</a></h2>
 <div class="nav">
 <span class="nav-prev"><a href="command.radio.html">&#171; command.radio</a></span>
-<span class="nav-next"><a href="datagrid.html">datagrid &#187;</a></span>
+<span class="nav-next"><a href="datalist.html">datalist &#187;</a></span>
 </div>
 <div id="command.checkbox" class="section">
       <h2 class="element-head"><span class="element">command</span> <span class="elem-qualifier"><span class="attribute-name">type</span>=<span class="equals-value">checkbox</span></span> &#8211; <span class="shortdesc">state or option that can be toggled</span> <a class="hash" href="#command.checkbox">#</a> <a class="toc-bak" href="Overview.html#command.checkbox-toc">T</a></h2>
@@ -84,18 +84,18 @@
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>)</li>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="command.html#command">command</a></li>
         <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
       </div>
       </div>
 <hr class="footerbreak"></hr>
 <div class="nav">
 <span class="nav-prev"><a href="command.radio.html">&#171; command.radio</a></span>
-<span class="nav-next"><a href="datagrid.html">datagrid &#187;</a></span>
+<span class="nav-next"><a href="datalist.html">datalist &#187;</a></span>
 </div>
 </body>
 </html>

Index: common-attributes.html
===================================================================
RCS file: /sources/public/html5/markup/common-attributes.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- common-attributes.html	21 Aug 2009 13:10:58 -0000	1.24
+++ common-attributes.html	3 Sep 2009 02:39:03 -0000	1.25
@@ -144,60 +144,60 @@
         <h2 class="common-subhead">7.02. Event-handler attributes <a class="hash" href="#event-handler-attrs">#</a> <a class="toc-bak" href="Overview.html#event-handler-attrs-toc">T</a></h2><div id="common.attrs.event-handler-mdl">
         
           <div class="content-models">
-            <p><span class="common-pattern-name"><a href="common-attributes.html#common.attrs.event-handler" id="common.attrs.event-handler">common.attrs.event-handler</a></span> = (<a class="ref" href="common-attributes.html#scripting.attr.onabort" title="scripting.attr.onabort">onabort</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onblur" title="scripting.attr.onblur">onblur</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.oncanplay" title="scripting.attr.oncanplay">oncanplay</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.oncanplaythrough" title="scripting.attr.oncanplaythrough">oncanplaythrough</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onchange" title="scripting.attr.onchange">onchange</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onclick" title="scripting.attr.onclick">onclick</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.oncontextmenu" title="scripting.attr.oncontextmenu">oncontextmenu</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ondblclick" title="scripting.attr.ondblclick">ondblclick</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ondrag" title="scripting.attr.ondrag">ondrag</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ondragend" title="scripting.attr.ondragend">ondragend</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ondragenter" title="scripting.attr.ondragenter">ondragenter</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ondragleave" title="scripting.attr.ondragleave">ondragleave</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ondragover" title="scripting.attr.ondragover">ondragover</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ondragstart" title="scripting.attr.ondragstart">ondragstart</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ondrop" title="scripting.attr.ondrop">ondrop</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ondurationchange" title="scripting.attr.ondurationchange">ondurationchange</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onemptied" title="scripting.attr.onemptied">onemptied</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onended" title="scripting.attr.onended">onended</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onerror" title="scripting.attr.onerror">onerror</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onfocus" title="scripting.attr.onfocus">onfocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onformchange" title="scripting.attr.onformchange">onformchange</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onforminput" title="scripting.attr.onforminput">onforminput</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.oninput" title="scripting.attr.oninput">oninput</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.oninvalid" title="scripting.attr.oninvalid">oninvalid</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onkeydown" title="scripting.attr.onkeydown">onkeydown</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onkeypress" title="scripting.attr.onkeypress">onkeypress</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onkeyup" title="scripting.attr.onkeyup">onkeyup</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onload" title="scripting.attr.onload">onload</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onloadeddata" title="scripting.attr.onloadeddata">onloadeddata</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onloadedmetadata" title="scripting.attr.onloadedmetadata">onloadedmetadata</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onloadstart" title="scripting.attr.onloadstart">onloadstart</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onmousedown" title="scripting.attr.onmousedown">onmousedown</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onmousemove" title="scripting.attr.onmousemove">onmousemove</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onmouseout" title="scripting.attr.onmouseout">onmouseout</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onmouseover" title="scripting.attr.onmouseover">onmouseover</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onmouseup" title="scripting.attr.onmouseup">onmouseup</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onmousewheel" title="scripting.attr.onmousewheel">onmousewheel</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onpause" title="scripting.attr.onpause">onpause</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onplay" title="scripting.attr.onplay">onplay</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onplaying" title="scripting.attr.onplaying">onplaying</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onprogress" title="scripting.attr.onprogress">onprogress</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onratechange" title="scripting.attr.onratechange">onratechange</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onreadystatechange" title="scripting.attr.onreadystatechange">onreadystatechange</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onscroll" title="scripting.attr.onscroll">onscroll</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onseeked" title="scripting.attr.onseeked">onseeked</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onseeking" title="scripting.attr.onseeking">onseeking</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onselect" title="scripting.attr.onselect">onselect</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onshow" title="scripting.attr.onshow">onshow</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onstalled" title="scripting.attr.onstalled">onstalled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onsubmit" title="scripting.attr.onsubmit">onsubmit</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onsuspend" title="scripting.attr.onsuspend">onsuspend</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ontimeupdate" title="scripting.attr.ontimeupdate">ontimeupdate</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onvolumechange" title="scripting.attr.onvolumechange">onvolumechange</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onwaiting" title="scripting.attr.onwaiting">onwaiting</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)</p>
+            <p><span class="common-pattern-name"><a href="common-attributes.html#common.attrs.event-handler" id="common.attrs.event-handler">common.attrs.event-handler</a></span> = <a class="ref" href="common-attributes.html#scripting.attr.onabort" title="scripting.attr.onabort">onabort</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onblur" title="scripting.attr.onblur">onblur</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.oncanplay" title="scripting.attr.oncanplay">oncanplay</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.oncanplaythrough" title="scripting.attr.oncanplaythrough">oncanplaythrough</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onchange" title="scripting.attr.onchange">onchange</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onclick" title="scripting.attr.onclick">onclick</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.oncontextmenu" title="scripting.attr.oncontextmenu">oncontextmenu</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ondblclick" title="scripting.attr.ondblclick">ondblclick</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ondrag" title="scripting.attr.ondrag">ondrag</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ondragend" title="scripting.attr.ondragend">ondragend</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ondragenter" title="scripting.attr.ondragenter">ondragenter</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ondragleave" title="scripting.attr.ondragleave">ondragleave</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ondragover" title="scripting.attr.ondragover">ondragover</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ondragstart" title="scripting.attr.ondragstart">ondragstart</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ondrop" title="scripting.attr.ondrop">ondrop</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ondurationchange" title="scripting.attr.ondurationchange">ondurationchange</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onemptied" title="scripting.attr.onemptied">onemptied</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onended" title="scripting.attr.onended">onended</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onerror" title="scripting.attr.onerror">onerror</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onfocus" title="scripting.attr.onfocus">onfocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onformchange" title="scripting.attr.onformchange">onformchange</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onforminput" title="scripting.attr.onforminput">onforminput</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.oninput" title="scripting.attr.oninput">oninput</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.oninvalid" title="scripting.attr.oninvalid">oninvalid</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onkeydown" title="scripting.attr.onkeydown">onkeydown</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onkeypress" title="scripting.attr.onkeypress">onkeypress</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onkeyup" title="scripting.attr.onkeyup">onkeyup</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onload" title="scripting.attr.onload">onload</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onloadeddata" title="scripting.attr.onloadeddata">onloadeddata</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onloadedmetadata" title="scripting.attr.onloadedmetadata">onloadedmetadata</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onloadstart" title="scripting.attr.onloadstart">onloadstart</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onmousedown" title="scripting.attr.onmousedown">onmousedown</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onmousemove" title="scripting.attr.onmousemove">onmousemove</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onmouseout" title="scripting.attr.onmouseout">onmouseout</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onmouseover" title="scripting.attr.onmouseover">onmouseover</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onmouseup" title="scripting.attr.onmouseup">onmouseup</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onmousewheel" title="scripting.attr.onmousewheel">onmousewheel</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onpause" title="scripting.attr.onpause">onpause</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onplay" title="scripting.attr.onplay">onplay</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onplaying" title="scripting.attr.onplaying">onplaying</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onprogress" title="scripting.attr.onprogress">onprogress</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onratechange" title="scripting.attr.onratechange">onratechange</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onreadystatechange" title="scripting.attr.onreadystatechange">onreadystatechange</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onscroll" title="scripting.attr.onscroll">onscroll</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onseeked" title="scripting.attr.onseeked">onseeked</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onseeking" title="scripting.attr.onseeking">onseeking</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onselect" title="scripting.attr.onselect">onselect</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onshow" title="scripting.attr.onshow">onshow</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onstalled" title="scripting.attr.onstalled">onstalled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onsubmit" title="scripting.attr.onsubmit">onsubmit</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onsuspend" title="scripting.attr.onsuspend">onsuspend</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ontimeupdate" title="scripting.attr.ontimeupdate">ontimeupdate</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onvolumechange" title="scripting.attr.onvolumechange">onvolumechange</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onwaiting" title="scripting.attr.onwaiting">onwaiting</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></p>
           </div>
         </div>
         <div class="no-number no-toc">

Index: noscript.html
===================================================================
RCS file: /sources/public/html5/markup/noscript.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- noscript.html	20 Aug 2009 09:22:39 -0000	1.17
+++ noscript.html	3 Sep 2009 02:39:03 -0000	1.18
@@ -81,11 +81,11 @@
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>)</li>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="command.html#command">command</a></li>
         <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li>
         <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
       </div>

Index: patch-schema
===================================================================
RCS file: /sources/public/html5/markup/patch-schema,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- patch-schema	9 Aug 2009 15:15:19 -0000	1.77
+++ patch-schema	3 Sep 2009 02:39:03 -0000	1.78
@@ -1,6 +1,6 @@
 Index: schema/revision.rnc
 ===================================================================
---- schema/revision.rnc	(revision 454)
+--- schema/revision.rnc	(revision 461)
 +++ schema/revision.rnc	(working copy)
 @@ -2,17 +2,6 @@
  ##  RELAX NG Schema for HTML 5: Revision Annotations                  #
@@ -62,7 +62,7 @@
  	del.inner.phrasing =
 Index: schema/web-forms.rnc
 ===================================================================
---- schema/web-forms.rnc	(revision 454)
+--- schema/web-forms.rnc	(revision 461)
 +++ schema/web-forms.rnc	(working copy)
 @@ -9,6 +9,7 @@
  	common-form.attrs =
@@ -170,7 +170,7 @@
  
 Index: schema/tables.rnc
 ===================================================================
---- schema/tables.rnc	(revision 454)
+--- schema/tables.rnc	(revision 461)
 +++ schema/tables.rnc	(working copy)
 @@ -157,38 +157,6 @@
  	tr.inner =
@@ -276,7 +276,7 @@
  		( common.inner.flow )
 Index: schema/embed.rnc
 ===================================================================
---- schema/embed.rnc	(revision 454)
+--- schema/embed.rnc	(revision 461)
 +++ schema/embed.rnc	(working copy)
 @@ -256,7 +256,7 @@
  			}
@@ -378,7 +378,7 @@
  			|	( area.attrs.shape.circle & area.attrs.coords.circle )
 Index: schema/media.rnc
 ===================================================================
---- schema/media.rnc	(revision 454)
+--- schema/media.rnc	(revision 461)
 +++ schema/media.rnc	(working copy)
 @@ -4,32 +4,6 @@
  ##  RELAX NG Schema for HTML 5: Advanced Embedded Content             #
@@ -498,7 +498,7 @@
  
 Index: schema/phrase.rnc
 ===================================================================
---- schema/phrase.rnc	(revision 454)
+--- schema/phrase.rnc	(revision 461)
 +++ schema/phrase.rnc	(working copy)
 @@ -13,13 +13,13 @@
  	a.attrs =
@@ -597,7 +597,7 @@
  	em.elem =
 Index: schema/web-forms2.rnc
 ===================================================================
---- schema/web-forms2.rnc	(revision 455)
+--- schema/web-forms2.rnc	(revision 461)
 +++ schema/web-forms2.rnc	(working copy)
 @@ -6,9 +6,6 @@
  
@@ -640,7 +640,7 @@
  			attribute autocomplete {
 Index: schema/meta.rnc
 ===================================================================
---- schema/meta.rnc	(revision 454)
+--- schema/meta.rnc	(revision 461)
 +++ schema/meta.rnc	(working copy)
 @@ -100,7 +100,7 @@
  	title.attrs =
@@ -728,9 +728,16 @@
  
  ## Inline Character Encoding Statement for HTML: <meta http-equiv='content-type'>
  
+@@ -306,4 +324,5 @@
+ 				common.data.meta-charset
+ 			}
+ 
+-	common.elem.metadata |= ( meta.charset.elem | meta.http-equiv.content-type.elem )
++	common.elem.metadata |= meta.charset.elem
++	common.elem.metadata |= meta.http-equiv.content-type.elem
 Index: schema/applications.rnc
 ===================================================================
---- schema/applications.rnc	(revision 454)
+--- schema/applications.rnc	(revision 461)
 +++ schema/applications.rnc	(working copy)
 @@ -4,18 +4,6 @@
  ##  RELAX NG Schema for HTML 5: Web Application Features              #
@@ -751,7 +758,7 @@
  ## Context Menu: contextmenu
  
  	common.attrs.contextmenu =
-@@ -111,12 +99,26 @@
+@@ -89,12 +77,26 @@
  	command.command.attrs =
  		(	common.attrs
  		&	command.command.attrs.type?
@@ -779,7 +786,7 @@
  	command.elem = command.command.elem
  
  ## Selection of one item from a list of items: <command type='radio'>
-@@ -129,7 +131,9 @@
+@@ -107,7 +109,9 @@
  				&	command.radio.attrs.radiogroup #REVISIT taking liberties here
  				&	command.radio.attrs.checked?
  				)
@@ -790,7 +797,7 @@
  		)
  		command.radio.attrs.type =
  			attribute type {
-@@ -143,6 +147,18 @@
+@@ -121,6 +125,18 @@
  			attribute checked {
  				w:string "checked" | w:string ""
  			}
@@ -809,7 +816,7 @@
  	command.elem |= command.radio.elem
  
  ## State or option that can be toggled: <command type='checkbox'>
-@@ -154,7 +170,9 @@
+@@ -132,7 +148,9 @@
  			&	(	command.checkbox.attrs.type
  				&	command.checkbox.attrs.checked?
  				)
@@ -820,7 +827,7 @@
  			)
  		command.checkbox.attrs.type =
  			attribute type {
-@@ -164,25 +182,20 @@
+@@ -142,30 +160,25 @@
  			attribute checked {
  				w:string "checked" | w:string ""
  			}
@@ -851,9 +858,15 @@
  	command.inner =
  		( empty )
  	
+ 	common.elem.metadata |=
+-		( command.elem & nonHTMLizable )
++		command.elem
+ 	common.elem.phrasing |= command.elem
+ 
+ ## Menu: <menu>
 Index: schema/core-scripting.rnc
 ===================================================================
---- schema/core-scripting.rnc	(revision 454)
+--- schema/core-scripting.rnc	(revision 461)
 +++ schema/core-scripting.rnc	(working copy)
 @@ -49,10 +49,13 @@
  			}
@@ -871,26 +884,31 @@
  	script.inner.imported =
  		( empty )
  		
-@@ -95,7 +98,7 @@
+@@ -95,8 +98,8 @@
  # #####################################################################
  ## Event Handler Attribute Definitions
  
 -	common.attrs.scripting &=
-+	common.attrs.event-handler &=
- 		(	scripting.attr.onabort?
+-		(	scripting.attr.onabort?
++	common.attrs.event-handler =
++			scripting.attr.onabort?
  		&	scripting.attr.onblur?
  		&	scripting.attr.oncanplay?
-@@ -152,7 +155,6 @@
+ 		&	scripting.attr.oncanplaythrough?
+@@ -150,9 +153,8 @@
+ 		&	scripting.attr.ontimeupdate?
+ 		&	scripting.attr.onvolumechange?
  		&	scripting.attr.onwaiting?
- 		)
+-		)
  		
 -	common.attrs.other &= common.attrs.scripting
++		
  
  	scripting.attr.onabort =
  		attribute onabort { string }
 Index: schema/common.rnc
 ===================================================================
---- schema/common.rnc	(revision 454)
+--- schema/common.rnc	(revision 461)
 +++ schema/common.rnc	(working copy)
 @@ -38,16 +38,16 @@
  	common.attr.anything =

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- spec.html	21 Aug 2009 16:02:20 -0000	1.100
+++ spec.html	3 Sep 2009 02:39:03 -0000	1.101
@@ -9,7 +9,7 @@
 <body>
 <div class="head">
 <h1>HTML 5: The Markup Language</h1>
-<h2>Editor&#8217;s Draft <em>22 August 2009</em>
+<h2>Editor&#8217;s Draft <em>3 September 2009</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -29,7 +29,7 @@
       <h2>Abstract <a class="hash" href="#abstract">#</a>
 </h2>
       <p>This specification describes the fifth major version of
-      the HTML language and provides the details necessary for
+      the HTML language and provides details necessary for
       producers of HTML content to create documents that conform
       to the language. By design, it does not define related APIs
       nor attempt to specify how consumers of HTML content are
@@ -41,43 +41,40 @@
     
     
     <p>
-        This document is the 22 August 2009 Editor&#8217;s Draft of 
+        This document is the 3 September 2009 Editor&#8217;s Draft of 
         <cite>HTML 5: The Markup Language</cite>.
       </p>
-    <p>
-      You can find the source for the current version of this document
-      <a href="http://dev.w3.org/html5/markup/">online</a>.
-    </p>
+    
     <div>
   <p>This document does not represent consensus in the HTML
   Working Group. In particular, some members of the group do not
-  support normative status for this document, and thus do not
-  support its advance on the Recommendation track.  Discussions
-  about the normative status of this document are ongoing, and no
-  decision has been taken yet. Like all documents produced by the
-  HTML Working Group, this document will use the design approach
-  described in <a href="http://www.w3.org/TR/html-design-principles/">HTML Design Principles</a>.</p>
+  support normative status for it, and thus do not support its
+  advance on the W3C Recommendation track. Discussions about the
+  normative status of this document are ongoing, and no decision
+  has been reached yet. As with other documents produced by the
+  HTML Working Group, this document uses the design approach
+  described in
+  <a href="http://www.w3.org/TR/html-design-principles/">HTML Design Principles</a>.</p>
   <div>
     <h2>Instability and incompleteness of this document</h2>
-    <p>This document should not be considered stable. All
-    parts of it remain subject to significant change or complete
-    removal. Also, this document should in no way be considered
-    complete. In particular, many elements in the 
-    <a href="#html-elements">HTML elements</a>
-    section of this document currently lack the following
-    subsections:</p>
+    <p>This document is a working draft &#8212; all parts of it remain
+    subject to significant change or removal, and some parts are
+    currently incomplete; in particular, many elements currently
+    lack complete documentation in the following subsections:</p>
     <dl class="status-missing">
 <dt><span class="section-title-ref">Examples</span></dt>
-      <dd>The plan is to have one of these subsections for every
-        element, with each giving at least one conformant example
-        and at least one non-conformant example.</dd>
+      <dd>The documentation for each element will eventually have
+        at least one conformant example and at least one
+        non-conformant example.</dd>
       <dt><span class="section-title-ref">Details</span></dt>
-      <dd>Where needed, this subsection provides additional details
-        about the semantics of the element and its attributes.</dd>
+      <dd>The purpose of this subsection is to provide, where
+        needed, additional details about the semantics of the
+        element and its attributes.</dd>
       <dt><span class="section-title-ref">Additional constraints</span></dt>
-      <dd>Where needed, this subsection provides additional
-        document-conformance constraints for the element and its
-        attributes (in addition to those already document in the
+      <dd>This purpose of this subsection is to provide, where
+        needed, additional document-conformance constraints for
+        the element and its attributes (in addition to those
+        already documented in the
         <i>Content model</i>,
         <i>Attribute model</i>,
         <i>Assertions</i>,
@@ -293,9 +290,6 @@
 <li id="command.checkbox-toc">
 <span class="toc-section-number"></span><a href="#command.checkbox"><span class="toc-section-number"></span> <span class="element">command</span> <span class="elem-qualifier"><span class="attribute-name">type</span>=<span class="equals-value">checkbox</span></span> &#8211; <span class="shortdesc">state or option that can be toggled</span></a>
 </li>
-<li id="datagrid-toc">
-<span class="toc-section-number"></span><a href="#datagrid"><span class="toc-section-number"></span> <span class="element">datagrid</span> &#8211; <span class="shortdesc">datagrid</span></a>
-</li>
 <li id="datalist-toc">
 <span class="toc-section-number"></span><a href="#datalist"><span class="toc-section-number"></span> <span class="element">datalist</span> &#8211; <span class="shortdesc">predefined options for other controls</span></a>
 </li>
@@ -683,9 +677,13 @@
   and for others to check the conformance of existing documents.
   It is designed:</p>
   <ul>
-<li>to describe the syntax, structure, and semantics of the
+<li>to describe the syntax and structure of the
     <a href="#html-language">HTML language</a>
 </li>
+    <li>to describe the semantics of
+    <a href="#html-elements">HTML elements</a>
+    and their attributes (that is, to describe what the elements
+    and attributes represent)</li>
     <li>to be clear and unambiguous</li>
     <li>to be as concise and readable as possible</li>
   </ul>
@@ -723,10 +721,10 @@
     <p>The following is a list of terms that are common to various
     other sections in this specification.</p>
   <dl>
-<dt><dfn id="context">browsing context</dfn></dt>
+<dt><dfn id="context" title="context">browsing context</dfn></dt>
     <dd>A <a href="#context">browsing context</a> is a collection
       of one or more documents and one or more <a href="#view">views</a>.</dd>
-    <dt><dfn id="case-insensitive">case-insensitive match</dfn></dt>
+    <dt><dfn id="case-insensitive" title="case-insensitive">case-insensitive match</dfn></dt>
     <dd>For the purposes of this specification,
       performing a
       <a href="#case-insensitive">case-insensitive match</a>
@@ -737,22 +735,10 @@
       and the corresponding characters in the range
       <code title="U+0061 LATIN SMALL LETTER A&#8211;U+007A LATIN SMALL LETTER Z">a-z</code>
       are considered to also match.</dd>
-    <dt><dfn id="fallback">fallback content</dfn></dt>
+    <dt><dfn id="fallback" title="fallback">fallback content</dfn></dt>
     <dd>Some embedded content elements can have fallback content:
       content that is to be used when the embedded content cannot
       be used (for example, when it is of an unsupported format).</dd>
-    <dt><dfn id="group" title="group">group</dfn></dt>
-    <dd>A
-      <a href="#group">group</a>
-      is any combination of names and symbols in definitions in the
-    <a href="#elements">HTML elements</a>,
-    <a href="#common-models">Common content models</a>,
-    <a href="#common-attributes">Common attributes</a>,
-    or 
-    <a href="#forms-attributes">Forms attributes</a>
-    that are delimited by a set of matching
-    "<code>(</code>" and "<code>)</code>"
-    (parentheses) symbols.</dd>
     <dt><dfn id="html-producer" title="html-producer">HTML producers</dfn></dt>
     <dd>HTML authors (that is, people) and applications
     (such as editors and content management systems)
@@ -760,7 +746,7 @@
     <dt><dfn id="html-consumer" title="html-consumer">HTML consumers</dfn></dt>
     <dd>HTML user agents; that is, applications (such as
     Web browsers) which consume HTML content</dd>
-    <dt><dfn id="newlines">newline</dfn></dt>
+    <dt><dfn id="newlines" title="newlines">newline</dfn></dt>
     <dd>A <a href="#newlines">newline</a> may be represented as any
       of the following:
       <ul>
@@ -770,18 +756,7 @@
         LINE FEED (LF) character</li>
       </ul>
 </dd>
-    <dt><dfn id="pattern-name" title="pattern-name">pattern name</dfn></dt>
-    <dd>A
-      <a href="#pattern-name">pattern name</a>
-      is any name used in definitions in the
-    <a href="#elements">HTML elements</a>,
-    <a href="#common-models">Common content models</a>,
-    <a href="#common-attributes">Common attributes</a>,
-    or 
-    <a href="#forms-attributes">Forms attributes</a>
-    sections of this specification that is not an element name or
-    an attribute name.</dd>
-    <dt><dfn id="space">space</dfn></dt>
+    <dt><dfn id="space" title="space">space</dfn></dt>
     <dd>A <a href="#space">space character</a> is any of the
       following:
       <ul>
@@ -792,7 +767,7 @@
         <li>U+000D CARRIAGE RETURN (CR)</li>
       </ul>
 </dd>
-    <dt><dfn id="view">view</dfn></dt>
+    <dt><dfn id="view" title="view">view</dfn></dt>
     <dd>A <a href="#view">view</a> is as defined in <cite>Document
         Object Model (DOM) Level 2 Views</cite> <a href="#refsDOM2VIEWS">[DOM2VIEWS]</a>.</dd>
   </dl>
@@ -810,6 +785,16 @@
     and
     <a href="#forms-attributes">Forms attributes</a>
     sections.</p>
+
+    <p>The explanations use the term 
+    <dfn id="group" title="group">group</dfn>
+    to mean any combination of names and symbols that are
+    delimited by a pair of matching
+    "<code>(</code>" and "<code>)</code>"
+    (parentheses) symbols, and the term
+    <dfn id="pattern-name" title="pattern-name">pattern name</dfn>
+    to mean any hyperlinked name used in a definition that is not
+    an element name or an attribute name.</p>
     <dl id="rnc-symbol-list">
 <dt id="optional">
 <span class="rnc-symbol">?</span> (optional)</dt>
@@ -867,18 +852,16 @@
         <a href="#group">groups</a>
         indicates that the two items it separates can occur in any
         order.</dd>
-      <dt id="parentheses">
-<span class="rnc-symbol">(</span> and <span class="rnc-symbol">)</span> (grouping)</dt>
-      <dd>The "<code>(</code>" and "<code>)</code>" (parentheses)
-        symbols are used to delimit multiple items such that they
-        are treated as a group.</dd>
     </dl>
 </div>
 </div>
     <div id="documents" class="section">
   <h2>3. Documents <a class="hash" href="#documents">#</a> <a class="toc-bak" href="#documents-toc">T</a>
 </h2>
-  <p>This section introduces the following:</p>
+  <p>This section defines the term
+  <a href="#document">document</a>,
+  and provides additional details related to the definition of
+  that term. It is divided into the following parts:</p>
   <div class="toc">
 <ul>
 <li id="language-and-syntax-toc">
@@ -900,7 +883,9 @@
 </h2>
   <p>The term
   <dfn id="document" title="document">document</dfn> is used in this specification
-  to mean an instance of the HTML language. The
+  to mean an instance of the
+  <a href="#html-language">HTML language</a>.</p>
+  <p>The
   <dfn id="html-language" title="html-language">HTML language</dfn> is the language
   described in this specification; it is an abstract language that
   applications can potentially represent in memory in any number
@@ -908,7 +893,8 @@
   of possible concrete syntaxes.</p>
   <p>This specification makes
   reference to two particular concrete syntaxes for the 
-  <a href="#html-language">HTML language</a>: One syntax which
+  <a href="#html-language">HTML language</a>:
+  One syntax which
   is referred to throughout this specification as
   <a href="#html-syntax">the HTML syntax</a>,
   and another syntax, which is referred to throughout this
@@ -1044,7 +1030,7 @@
       <a href="#case-insensitive">case-insensitive match</a>
       for the names of the elements given in the
       <a href="#elements">HTML elements</a>
-      section of this document; tag names are
+      section of this document; that is, tag names are
       case-insensitive.</li>
       <li>
 <a href="#attribute-name">Attribute names</a>
@@ -1055,7 +1041,7 @@
       <a href="#case-insensitive">case-insensitive match</a>
       for the names of the attributes given in the
       <a href="#elements">HTML elements</a>
-      section of this document; attribute names are
+      section of this document; that is, attribute names are
       case-insensitive.</li>
     </ul>
 <p>In
@@ -1067,7 +1053,7 @@
       <a href="#html-elements">HTML elements</a>
       must exactly match the names of the elements given in the
       <a href="#elements">HTML elements</a>
-      section of this document; tag names are
+      section of this document; that is, tag names are
       case-sensitive.</li>
       <li>
 <a href="#attribute-name">Attribute names</a>
@@ -1075,7 +1061,7 @@
       <a href="#html-elements">HTML elements</a>
       must exactly match the names of the attributes given in the
       <a href="#elements">HTML elements</a>
-      section of this document; attribute names are
+      section of this document; that is, attribute names are
       case-sensitive.</li>
     </ul>
 </div>
@@ -1412,9 +1398,8 @@
       all have names that only use characters in the range
       <code title="U+0030 DIGIT ZERO&#8211;U+0039 DIGIT NINE">0&#8211;9</code>,
       <code title="U+0061 LATIN SMALL LETTER A&#8211;U+007A LATIN SMALL LETTER Z">a&#8211;z</code>,
-      <code title="U+0041 LATIN CAPITAL LETTER A&#8211;U+005A LATIN CAPITAL LETTER Z">A&#8211;Z</code>,
-      and the character
-      "<code title="U+002D HYPHEN-MINUS">-</code>".</li>
+      and
+      <code title="U+0041 LATIN CAPITAL LETTER A&#8211;U+005A LATIN CAPITAL LETTER Z">A&#8211;Z</code>.</li>
       <li>
       <dfn id="syntax-start-tags">Start tags</dfn>
       consist of the following parts, in exactly the following
@@ -2340,9 +2325,6 @@
 <li id="command.checkbox-toc">
 <span class="toc-section-number"></span><a href="#command.checkbox"><span class="toc-section-number"></span> <span class="element">command</span> <span class="elem-qualifier"><span class="attribute-name">type</span>=<span class="equals-value">checkbox</span></span> &#8211; <span class="shortdesc">state or option that can be toggled</span></a>
 </li>
-<li id="datagrid-toc">
-<span class="toc-section-number"></span><a href="#datagrid"><span class="toc-section-number"></span> <span class="element">datagrid</span> &#8211; <span class="shortdesc">datagrid</span></a>
-</li>
 <li id="datalist-toc">
 <span class="toc-section-number"></span><a href="#datalist"><span class="toc-section-number"></span> <span class="element">datalist</span> &#8211; <span class="shortdesc">predefined options for other controls</span></a>
 </li>
@@ -4665,11 +4647,12 @@
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#meta.charset">meta.charset</a>
-                                                                       <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.charset">meta.charset</a>
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>)</li>
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#command">command</a>
+</li>
         <li class="context-mdl"><a href="#common.elem.phrasing">common.elem.phrasing</a></li>
 </ul>
 </div>
@@ -4770,11 +4753,12 @@
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#meta.charset">meta.charset</a>
-                                                                       <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.charset">meta.charset</a>
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>)</li>
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#command">command</a>
+</li>
         <li class="context-mdl"><a href="#common.elem.phrasing">common.elem.phrasing</a></li>
 </ul>
 </div>
@@ -4869,153 +4853,16 @@
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#meta.charset">meta.charset</a>
-                                                                       <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.charset">meta.charset</a>
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>)</li>
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#command">command</a>
+</li>
         <li class="context-mdl"><a href="#common.elem.phrasing">common.elem.phrasing</a></li>
 </ul>
 </div>
       </div>
-<div id="datagrid" class="section">
-      <h2 class="element-head">
-<span class="element">datagrid</span> &#8211; <span class="shortdesc">datagrid</span> <a class="hash" href="#datagrid">#</a> <a class="toc-bak" href="#datagrid-toc">T</a>
-</h2>
-      <div id="datagrid-longdesc" class="longdesc">
-    <p>The <a href="#datagrid" class="element">datagrid</a>
-    element represents an interactive representation of tree,
-    list, or tabular data.</p>
-  </div>
-      <div class="no-number no-toc" id="datagrid-content">
-        <h2 class="element-subhead">Content model <a class="hash" href="#datagrid-content">#</a>
-</h2>
-        <div class="content-models" id="datagrid-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="datagrid-mdl" href="#datagrid-mdl" class="element">datagrid</a> = </span><span>
-      (<a class="ref" href="#normal-character-data">normal-character-data</a>
-  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#common.elem.flow">common.elem.flow</a><a href="#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
-      <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#datagrid.attrs">datagrid.attrs</a>
-    </span></p>
-        </div>
-      </div>
-<div class="no-number no-toc" id="datagrid-attr-mdl">
-        <h2 class="element-subhead">Attribute model <a class="hash" href="#datagrid-attr-mdl">#</a>
-</h2>
-        <div class="attr-content-models">
-          <p><a href="#datagrid.attrs">datagrid.attrs</a> = <span class="pattern" id="datagrid.attrs"><a class="ref" href="#common.attrs">common.attrs</a>
-  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#datagrid.attrs.multiple" title="datagrid.attrs.multiple">multiple</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#datagrid.attrs.disabled" title="datagrid.attrs.disabled">disabled</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p>
-</div>
-</div>
-      <div class="no-number no-toc" id="datagrid-attributes">
-        <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#datagrid-attributes">#</a>
-</h2>
-        <dl class="attr-defs">
-<dt>
-<a class="attribute-name" id="datagrid.attrs.multiple" title="datagrid.attrs.multiple" href="#datagrid.attrs.multiple">multiple</a> = <span class="attr-values">
-       "multiple"
-      <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
-    </span> </dt>
-            <dd>Specifies that the user must be able to select any
-        number of rows (zero or more).</dd>
-          
-            <dt>
-<a class="attribute-name" id="datagrid.attrs.disabled" title="datagrid.attrs.disabled" href="#datagrid.attrs.disabled">disabled</a> = <span class="attr-values">
-       "disabled"
-      <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
-    </span> </dt>
-            <dd>Instructs the UA to disable the <a href="#datagrid">datagrid</a>, preventing the user from
-      interacting with it.</dd>
-          
-        </dl>
-</div>
-      
-      <div class="no-number no-toc" id="datagrid-assertions">
-        <h2 class="element-subhead">Assertions <a class="hash" href="#datagrid-assertions">#</a>
-</h2>
-        <ul class="assertions">
-<li><span>
-				The interactive element &#8220;datagrid&#8221; must not 
-				appear as a descendant of the &#8220;a&#8221; element.
-			</span></li>
-<li><span>
-				The interactive element &#8220;datagrid&#8221; must not 
-				appear as a descendant of the &#8220;button&#8221; element.
-			</span></li>
-        </ul>
-</div>
-      <div class="no-number no-toc" id="datagrid-tags">
-        <h2 class="element-subhead">Tag omission <a class="hash" href="#datagrid-tags">#</a>
-</h2>
-        <p>A <a href="#datagrid">datagrid</a>
-            element must have both a
-            <span title="syntax-start-tag">start tag</span>
-            and an
-            <span title="syntax-end-tag">end tag</span>.</p>
-      </div>
-      
-      <div class="no-number no-toc" id="datagrid-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#datagrid-context">#</a>
-</h2>
-        <ul><li class="context-mdl"><a href="#common.elem.flow">common.elem.flow</a></li></ul>
-</div>
-      
-      <div class="no-number no-toc" id="datagrid-display">
-        <h2 class="element-subhead">Typical default display properties <a class="hash" href="#datagrid-display">#</a>
-</h2>
-        <div class="css-props" id="datagrid-css">
-<div class="selectors">
-<span class="selector">datagrid</span> {
-</div>
-<div class="properties">
-<div class="css-property">
-<span class="prop-name">margin</span>: <span class="prop-value">0em</span>;</div>
-<div class="css-property">
-<span class="prop-name">font</span>: <span class="prop-value">small</span>;</div>
-<div class="css-property">
-<span class="prop-name">color</span>: <span class="prop-value"><i class="vendor-value">(internal value)</i></span>;</div>
-<div class="css-property">
-<span class="prop-name">letter-spacing</span>: <span class="prop-value">normal</span>;</div>
-<div class="css-property">
-<span class="prop-name">word-spacing</span>: <span class="prop-value">normal</span>;</div>
-<div class="css-property">
-<span class="prop-name">line-height</span>: <span class="prop-value">normal</span>;</div>
-<div class="css-property">
-<span class="prop-name">text-transform</span>: <span class="prop-value">none</span>;</div>
-<div class="css-property">
-<span class="prop-name">text-indent</span>: <span class="prop-value">0</span>;</div>
-<div class="css-property">
-<span class="prop-name">text-shadow</span>: <span class="prop-value">none</span>;</div>
-<div class="css-property">
-<span class="prop-name">display</span>: <span class="prop-value">inline-block</span>;</div>
-<div class="css-property">
-<span class="prop-name">text-align</span>: <span class="prop-value"><i class="vendor-value">(internal value)</i></span>; }</div>
-</div>
-<div class="selectors">
-<span class="selector">datagrid<span class="pseudo">:disabled</span></span> {
-</div>
-<div class="properties"><div class="css-property">
-<span class="prop-name">color</span>: <span class="prop-value"><i class="vendor-value">(internal value)</i></span>; }</div></div>
-<div class="selectors">
-<span class="selector">datagrid</span> {
-</div>
-<div class="properties">
-<div class="css-property">
-<span class="prop-name">height</span>: <span class="prop-value">150px</span>;</div>
-<div class="css-property">
-<span class="prop-name">color</span>: <span class="prop-value">black</span>;</div>
-<div class="css-property">
-<span class="prop-name">background-color</span>: <span class="prop-value">white</span>;</div>
-<div class="css-property">
-<span class="prop-name">cursor</span>: <span class="prop-value">default</span>;</div>
-<div class="css-property">
-<span class="prop-name">border</span>: <span class="prop-value">1px inset gray</span>;</div>
-<div class="css-property">
-<span class="prop-name">white-space</span>: <span class="prop-value"><i class="vendor-value">(internal value)</i></span>; }</div>
-</div>
-</div>
-</div>
-</div>
 <div id="datalist" class="section">
       <h2 class="element-head">
 <span class="element">datalist</span> &#8211; <span class="shortdesc">predefined options for other controls</span> <a class="hash" href="#datalist">#</a> <a class="toc-bak" href="#datalist-toc">T</a>
@@ -10371,11 +10218,12 @@
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#meta.charset">meta.charset</a>
-                                                                       <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.charset">meta.charset</a>
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>)</li>
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#command">command</a>
+</li>
         <li class="context-mdl">
 <a href="#noscript.elem.head">noscript.elem.head</a> = (<a class="ref" href="#link">link</a>
    <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
@@ -10763,11 +10611,12 @@
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#meta.charset">meta.charset</a>
-                                                                       <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.charset">meta.charset</a>
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>)</li></ul>
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#command">command</a>
+</li></ul>
 </div>
       </div>
 <div id="meta.http-equiv.refresh" class="section">
@@ -10854,11 +10703,12 @@
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#meta.charset">meta.charset</a>
-                                                                       <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.charset">meta.charset</a>
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>)</li>
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#command">command</a>
+</li>
         <li class="context-mdl">
 <a href="#noscript.elem.head">noscript.elem.head</a> = (<a class="ref" href="#link">link</a>
    <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
@@ -10948,11 +10798,12 @@
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#meta.charset">meta.charset</a>
-                                                                       <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.charset">meta.charset</a>
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>)</li>
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#command">command</a>
+</li>
         <li class="context-mdl">
 <a href="#noscript.elem.head">noscript.elem.head</a> = (<a class="ref" href="#link">link</a>
    <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
@@ -11032,11 +10883,12 @@
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#meta.charset">meta.charset</a>
-                                                                       <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.charset">meta.charset</a>
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>)</li></ul>
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#command">command</a>
+</li></ul>
 </div>
       </div>
 <div id="meta.charset" class="section">
@@ -11111,11 +10963,12 @@
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#meta.charset">meta.charset</a>
-                                                                       <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.charset">meta.charset</a>
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>)</li></ul>
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#command">command</a>
+</li></ul>
 </div>
       </div>
 <div id="meta.http-equiv.content-type" class="section">
@@ -11203,11 +11056,12 @@
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#meta.charset">meta.charset</a>
-                                                                       <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.charset">meta.charset</a>
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>)</li></ul>
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#command">command</a>
+</li></ul>
 </div>
       
         <div class="no-number no-toc" id="meta.http-equiv.content-type-details">
@@ -11569,11 +11423,12 @@
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#meta.charset">meta.charset</a>
-                                                                       <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.charset">meta.charset</a>
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>)</li>
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#command">command</a>
+</li>
         <li class="context-mdl"><a href="#common.elem.phrasing">common.elem.phrasing</a></li>
         <li class="context-mdl"><a href="#common.elem.flow">common.elem.flow</a></li>
 </ul>
@@ -12034,7 +11889,6 @@
     <code><a href="#article">article</a></code>,
     <code><a href="#aside">aside</a></code>,
     <code><a href="#blockquote">blockquote</a></code>,
-    <code><a href="#datagrid">datagrid</a></code>,
     <code><a href="#dialog">dialog</a></code>,
     <code>dir</code>,
     <code><a href="#div">div</a></code>,
@@ -12732,11 +12586,12 @@
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#meta.charset">meta.charset</a>
-                                                                       <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.charset">meta.charset</a>
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>)</li>
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#command">command</a>
+</li>
         <li class="context-mdl"><a href="#common.elem.phrasing">common.elem.phrasing</a></li>
 </ul>
 </div>
@@ -13287,11 +13142,12 @@
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#meta.charset">meta.charset</a>
-                                                                       <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.charset">meta.charset</a>
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>)</li>
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#command">command</a>
+</li>
         <li class="context-mdl">
 <a href="#div-mdl">div</a> = <a class="ref" href="#style.elem.scoped">style.elem.scoped</a><a href="#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a><a href="#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   (<a class="ref" href="#normal-character-data">normal-character-data</a>
@@ -14626,7 +14482,6 @@
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#table">table</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#form">form</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#fieldset">fieldset</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#datagrid">datagrid</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#menu">menu</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#canvas.elem.flow">canvas.elem.flow</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#details">details</a>
@@ -14647,11 +14502,11 @@
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#meta.charset">meta.charset</a>
-                                                                       <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.charset">meta.charset</a>
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#script">script</a>
   <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#noscript.elem.head">noscript.elem.head</a>
-  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="#command">command</a>)
+  <a href="#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="#command">command</a>
           </dd>
         </dl>
 </div>
@@ -14871,60 +14726,60 @@
 <div id="common.attrs.event-handler-mdl">
         
           <div class="content-models">
-            <p><span class="common-pattern-name"><a href="#common.attrs.event-handler" id="common.attrs.event-handler">common.attrs.event-handler</a></span> = (<a class="ref" href="#scripting.attr.onabort" title="scripting.attr.onabort">onabort</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onblur" title="scripting.attr.onblur">onblur</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.oncanplay" title="scripting.attr.oncanplay">oncanplay</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.oncanplaythrough" title="scripting.attr.oncanplaythrough">oncanplaythrough</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onchange" title="scripting.attr.onchange">onchange</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onclick" title="scripting.attr.onclick">onclick</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.oncontextmenu" title="scripting.attr.oncontextmenu">oncontextmenu</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.ondblclick" title="scripting.attr.ondblclick">ondblclick</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.ondrag" title="scripting.attr.ondrag">ondrag</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.ondragend" title="scripting.attr.ondragend">ondragend</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.ondragenter" title="scripting.attr.ondragenter">ondragenter</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.ondragleave" title="scripting.attr.ondragleave">ondragleave</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.ondragover" title="scripting.attr.ondragover">ondragover</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.ondragstart" title="scripting.attr.ondragstart">ondragstart</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.ondrop" title="scripting.attr.ondrop">ondrop</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.ondurationchange" title="scripting.attr.ondurationchange">ondurationchange</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onemptied" title="scripting.attr.onemptied">onemptied</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onended" title="scripting.attr.onended">onended</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onerror" title="scripting.attr.onerror">onerror</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onfocus" title="scripting.attr.onfocus">onfocus</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onformchange" title="scripting.attr.onformchange">onformchange</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onforminput" title="scripting.attr.onforminput">onforminput</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.oninput" title="scripting.attr.oninput">oninput</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.oninvalid" title="scripting.attr.oninvalid">oninvalid</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onkeydown" title="scripting.attr.onkeydown">onkeydown</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onkeypress" title="scripting.attr.onkeypress">onkeypress</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onkeyup" title="scripting.attr.onkeyup">onkeyup</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onload" title="scripting.attr.onload">onload</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onloadeddata" title="scripting.attr.onloadeddata">onloadeddata</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onloadedmetadata" title="scripting.attr.onloadedmetadata">onloadedmetadata</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onloadstart" title="scripting.attr.onloadstart">onloadstart</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onmousedown" title="scripting.attr.onmousedown">onmousedown</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onmousemove" title="scripting.attr.onmousemove">onmousemove</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onmouseout" title="scripting.attr.onmouseout">onmouseout</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onmouseover" title="scripting.attr.onmouseover">onmouseover</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onmouseup" title="scripting.attr.onmouseup">onmouseup</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onmousewheel" title="scripting.attr.onmousewheel">onmousewheel</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onpause" title="scripting.attr.onpause">onpause</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onplay" title="scripting.attr.onplay">onplay</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onplaying" title="scripting.attr.onplaying">onplaying</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onprogress" title="scripting.attr.onprogress">onprogress</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onratechange" title="scripting.attr.onratechange">onratechange</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onreadystatechange" title="scripting.attr.onreadystatechange">onreadystatechange</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onscroll" title="scripting.attr.onscroll">onscroll</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onseeked" title="scripting.attr.onseeked">onseeked</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onseeking" title="scripting.attr.onseeking">onseeking</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onselect" title="scripting.attr.onselect">onselect</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onshow" title="scripting.attr.onshow">onshow</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onstalled" title="scripting.attr.onstalled">onstalled</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onsubmit" title="scripting.attr.onsubmit">onsubmit</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onsuspend" title="scripting.attr.onsuspend">onsuspend</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.ontimeupdate" title="scripting.attr.ontimeupdate">ontimeupdate</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onvolumechange" title="scripting.attr.onvolumechange">onvolumechange</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
-   <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onwaiting" title="scripting.attr.onwaiting">onwaiting</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)</p>
+            <p><span class="common-pattern-name"><a href="#common.attrs.event-handler" id="common.attrs.event-handler">common.attrs.event-handler</a></span> = <a class="ref" href="#scripting.attr.onabort" title="scripting.attr.onabort">onabort</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onblur" title="scripting.attr.onblur">onblur</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.oncanplay" title="scripting.attr.oncanplay">oncanplay</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.oncanplaythrough" title="scripting.attr.oncanplaythrough">oncanplaythrough</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onchange" title="scripting.attr.onchange">onchange</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onclick" title="scripting.attr.onclick">onclick</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.oncontextmenu" title="scripting.attr.oncontextmenu">oncontextmenu</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.ondblclick" title="scripting.attr.ondblclick">ondblclick</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.ondrag" title="scripting.attr.ondrag">ondrag</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.ondragend" title="scripting.attr.ondragend">ondragend</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.ondragenter" title="scripting.attr.ondragenter">ondragenter</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.ondragleave" title="scripting.attr.ondragleave">ondragleave</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.ondragover" title="scripting.attr.ondragover">ondragover</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.ondragstart" title="scripting.attr.ondragstart">ondragstart</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.ondrop" title="scripting.attr.ondrop">ondrop</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.ondurationchange" title="scripting.attr.ondurationchange">ondurationchange</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onemptied" title="scripting.attr.onemptied">onemptied</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onended" title="scripting.attr.onended">onended</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onerror" title="scripting.attr.onerror">onerror</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onfocus" title="scripting.attr.onfocus">onfocus</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onformchange" title="scripting.attr.onformchange">onformchange</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onforminput" title="scripting.attr.onforminput">onforminput</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.oninput" title="scripting.attr.oninput">oninput</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.oninvalid" title="scripting.attr.oninvalid">oninvalid</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onkeydown" title="scripting.attr.onkeydown">onkeydown</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onkeypress" title="scripting.attr.onkeypress">onkeypress</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onkeyup" title="scripting.attr.onkeyup">onkeyup</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onload" title="scripting.attr.onload">onload</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onloadeddata" title="scripting.attr.onloadeddata">onloadeddata</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onloadedmetadata" title="scripting.attr.onloadedmetadata">onloadedmetadata</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onloadstart" title="scripting.attr.onloadstart">onloadstart</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onmousedown" title="scripting.attr.onmousedown">onmousedown</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onmousemove" title="scripting.attr.onmousemove">onmousemove</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onmouseout" title="scripting.attr.onmouseout">onmouseout</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onmouseover" title="scripting.attr.onmouseover">onmouseover</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onmouseup" title="scripting.attr.onmouseup">onmouseup</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onmousewheel" title="scripting.attr.onmousewheel">onmousewheel</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onpause" title="scripting.attr.onpause">onpause</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onplay" title="scripting.attr.onplay">onplay</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onplaying" title="scripting.attr.onplaying">onplaying</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onprogress" title="scripting.attr.onprogress">onprogress</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onratechange" title="scripting.attr.onratechange">onratechange</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onreadystatechange" title="scripting.attr.onreadystatechange">onreadystatechange</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onscroll" title="scripting.attr.onscroll">onscroll</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onseeked" title="scripting.attr.onseeked">onseeked</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onseeking" title="scripting.attr.onseeking">onseeking</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onselect" title="scripting.attr.onselect">onselect</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onshow" title="scripting.attr.onshow">onshow</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onstalled" title="scripting.attr.onstalled">onstalled</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onsubmit" title="scripting.attr.onsubmit">onsubmit</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onsuspend" title="scripting.attr.onsuspend">onsuspend</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.ontimeupdate" title="scripting.attr.ontimeupdate">ontimeupdate</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onvolumechange" title="scripting.attr.onvolumechange">onvolumechange</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#scripting.attr.onwaiting" title="scripting.attr.onwaiting">onwaiting</a><a href="#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></p>
           </div>
         </div>
         <div class="no-number no-toc">
@@ -15384,9 +15239,7 @@
     datatype, a
     <dfn id="data-string" title="string">string</dfn>
     is defined as
-    <a href="#normal-character-data">normal character data</a>
-    that does not contain any
-    <a href="#syntax-ambiguous-ampersand">ambiguous ampersands</a>.</p>
+    <a href="#normal-character-data">normal character data</a>.</p>
     <p>The <a href="#syntax-attributes">Attributes</a> section of
     this document describes additional restrictions on strings in
     attribute values &#8212; in particular, restrictions for the

Index: datalist.html
===================================================================
RCS file: /sources/public/html5/markup/datalist.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- datalist.html	20 Aug 2009 09:22:37 -0000	1.17
+++ datalist.html	3 Sep 2009 02:39:03 -0000	1.18
@@ -8,7 +8,7 @@
 <body>
 <h2 class="chunkpagetitle"><a href="Overview.html">HTML 5: The Markup Language</a></h2>
 <div class="nav">
-<span class="nav-prev"><a href="datagrid.html">&#171; datagrid</a></span>
+<span class="nav-prev"><a href="command.checkbox.html">&#171; command.checkbox</a></span>
 <span class="nav-next"><a href="dd.html">dd &#187;</a></span>
 </div>
 <div id="datalist" class="section">
@@ -66,7 +66,7 @@
   </div></div></div>
 <hr class="footerbreak"></hr>
 <div class="nav">
-<span class="nav-prev"><a href="datagrid.html">&#171; datagrid</a></span>
+<span class="nav-prev"><a href="command.checkbox.html">&#171; command.checkbox</a></span>
 <span class="nav-next"><a href="dd.html">dd &#187;</a></span>
 </div>
 </body>

Index: elements.html
===================================================================
RCS file: /sources/public/html5/markup/elements.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- elements.html	21 Aug 2009 16:02:19 -0000	1.20
+++ elements.html	3 Sep 2009 02:39:03 -0000	1.21
@@ -71,8 +71,6 @@
 </li>
 <li id="command.checkbox-toc"><span class="toc-section-number"></span><a href="command.checkbox.html#command.checkbox"><span class="toc-section-number"></span> <span class="element">command</span> <span class="elem-qualifier"><span class="attribute-name">type</span>=<span class="equals-value">checkbox</span></span> &#8211; <span class="shortdesc">state or option that can be toggled</span></a>
 </li>
-<li id="datagrid-toc"><span class="toc-section-number"></span><a href="datagrid.html#datagrid"><span class="toc-section-number"></span> <span class="element">datagrid</span> &#8211; <span class="shortdesc">datagrid</span></a>
-</li>
 <li id="datalist-toc"><span class="toc-section-number"></span><a href="datalist.html#datalist"><span class="toc-section-number"></span> <span class="element">datalist</span> &#8211; <span class="shortdesc">predefined options for other controls</span></a>
 </li>
 <li id="dd-toc"><span class="toc-section-number"></span><a href="dd.html#dd"><span class="toc-section-number"></span> <span class="element">dd</span> &#8211; <span class="shortdesc">description or span of discourse</span></a>

Index: meta.charset.html
===================================================================
RCS file: /sources/public/html5/markup/meta.charset.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- meta.charset.html	20 Aug 2009 09:22:39 -0000	1.16
+++ meta.charset.html	3 Sep 2009 02:39:03 -0000	1.17
@@ -70,11 +70,11 @@
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>)</li></ul>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="command.html#command">command</a></li></ul>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Received on Thursday, 3 September 2009 02:39:56 UTC