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

html5/markup Overview.html,1.377,1.378 a.html,1.44,1.45 abbr.html,1.30,1.31 address.html,1.32,1.33 area.html,1.36,1.37 article.html,1.36,1.37 aside.html,1.35,1.36 audio.html,1.40,1.41 b.html,1.32,1.33 base.html,1.32,1.33 bdo.html,1.32,1.33 blockquote.html,1.32,1.33 body.html,1.34,1.35 br.html,1.27,1.28 button.button.html,1.37,1.38 button.reset.html,1.37,1.38 button.submit.html,1.37,1.38 canvas.html,1.31,1.32 caption.html,1.31,1.32 cite.html,1.29,1.30 code.html,1.29,1.30 col.html,1.30,1.31 colgroup.html,1.31,1.32 command.checkbox.html,1.33,1.34 command.command.html,1.33,1.34 command.radio.html,1.33,1.34 common-attributes.html,1.30,1.31 datalist.html,1.36,1.37 datatypes.html,1.30,1.31 dd.html,1.33,1.34 del.html,1.35,1.36 details.html,1.20,1.21 dfn.html,1.31,1.32 div.html,1.33,1.34 dl.html,1.32,1.33 dt.html,1.33,1.34 em.html,1.30,1.31 embed.html,1.33,1.34 fieldset.html,1.34,1.35 figcaption.html,1.3,1.4 figure.html,1.18,1.19 footer.html,1.34,1.35 form.html,1.37,1.38 h1.html,1.34,1.35 h2.html,1.35,1.36 h

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Thu, 04 Feb 2010 15:09:24 +0000
To: Message-Id: <E1Nd3Kf-0001Ne-4Q@lionel-hutz.w3.org>
Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv2080

Modified Files:
	Overview.html a.html abbr.html address.html area.html 
	article.html aside.html audio.html b.html base.html bdo.html 
	blockquote.html body.html br.html button.button.html 
	button.reset.html button.submit.html canvas.html caption.html 
	cite.html code.html col.html colgroup.html 
	command.checkbox.html command.command.html command.radio.html 
	common-attributes.html datalist.html datatypes.html dd.html 
	del.html details.html dfn.html div.html dl.html dt.html 
	em.html embed.html fieldset.html figcaption.html figure.html 
	footer.html form.html h1.html h2.html h3.html h4.html h5.html 
	h6.html head.html header.html hgroup.html hr.html html.html 
	i.html iframe.html img.html input.button.html 
	input.checkbox.html input.color.html input.date.html 
	input.datetime-local.html input.datetime.html input.email.html 
	input.file.html input.hidden.html input.image.html 
	input.month.html input.number.html input.password.html 
	input.radio.html input.range.html input.reset.html 
	input.search.html input.submit.html input.tel.html 
	input.text.html input.time.html input.url.html input.week.html 
	ins.html kbd.html keygen.html label.html legend.html li.html 
	link.html map.html mark.html menu.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 meter.html 
	nav.html noscript.html object.html ol.html optgroup.html 
	option.html output.html p.html param.html pre.html 
	progress.html q.html rp.html rt.html ruby.html samp.html 
	schema.html script.html section.html select.html small.html 
	source.html span.html spec.html strong.html style.css 
	style.html sub.html summary.html sup.html table.html 
	tbody.html td.html terminology.html textarea.html tfoot.html 
	th.html thead.html time.html title.html tr.html ul.html 
	var.html video.html 
Log Message:
checkpointing; reverted to generating content models from schema, but with translation of RNC syntax to natural language

Index: body.html
===================================================================
RCS file: /sources/public/html5/markup/body.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- body.html	1 Feb 2010 05:25:00 -0000	1.34
+++ body.html	4 Feb 2010 15:09:18 -0000	1.35
@@ -18,25 +18,32 @@
     represents the body of a document (as opposed to the
     document&#8217;s metadata).</p>
   </div>
-      <div class="no-number no-toc" id="body-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#body-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></div></div><div class="no-number no-toc" id="body-attr-mdl">
+      <div class="no-number no-toc" id="body-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#body-content-model">#</a></h2><div class="content-models">
+        
+      <div id="body-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#flow-content">flow content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="body-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#body-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="body.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="body.html#body.attrs.onafterprint" title="body.attrs.onafterprint">onafterprint</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="body.html#body.attrs.onbeforeprint" title="body.attrs.onbeforeprint">onbeforeprint</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="body.html#body.attrs.onbeforeunload" title="body.attrs.onbeforeunload">onbeforeunload</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="body.html#body.attrs.onhashchange" title="body.attrs.onhashchange">onhashchange</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="body.html#body.attrs.onmessage" title="body.attrs.onmessage">onmessage</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="body.html#body.attrs.onoffline" title="body.attrs.onoffline">onoffline</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="body.html#body.attrs.ononline" title="body.attrs.ononline">ononline</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="body.html#body.attrs.onpopstate" title="body.attrs.onpopstate">onpopstate</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="body.html#body.attrs.onredo" title="body.attrs.onredo">onredo</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="body.html#body.attrs.onresize" title="body.attrs.onresize">onresize</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="body.html#body.attrs.onstorage" title="body.attrs.onstorage">onstorage</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="body.html#body.attrs.onundo" title="body.attrs.onundo">onundo</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="body.html#body.attrs.onunload" title="body.attrs.onunload">onunload</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="body.html#body.attrs.onafterprint" title="body.attrs.onafterprint">onafterprint</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="body.html#body.attrs.onbeforeprint" title="body.attrs.onbeforeprint">onbeforeprint</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="body.html#body.attrs.onbeforeunload" title="body.attrs.onbeforeunload">onbeforeunload</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="body.html#body.attrs.onhashchange" title="body.attrs.onhashchange">onhashchange</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="body.html#body.attrs.onmessage" title="body.attrs.onmessage">onmessage</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="body.html#body.attrs.onoffline" title="body.attrs.onoffline">onoffline</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="body.html#body.attrs.ononline" title="body.attrs.ononline">ononline</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="body.html#body.attrs.onpopstate" title="body.attrs.onpopstate">onpopstate</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="body.html#body.attrs.onredo" title="body.attrs.onredo">onredo</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="body.html#body.attrs.onresize" title="body.attrs.onresize">onresize</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="body.html#body.attrs.onstorage" title="body.attrs.onstorage">onstorage</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="body.html#body.attrs.onundo" title="body.attrs.onundo">onundo</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="body.html#body.attrs.onunload" title="body.attrs.onunload">onunload</a> </span></p></div></div>
       <div class="no-number no-toc" id="body-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#body-attributes">#</a></h2>
         <dl class="attr-defs">

Index: legend.html
===================================================================
RCS file: /sources/public/html5/markup/legend.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- legend.html	1 Feb 2010 05:25:02 -0000	1.30
+++ legend.html	4 Feb 2010 15:09:20 -0000	1.31
@@ -19,9 +19,16 @@
     contents of the <a href="legend.html#legend" class="element">legend</a>
     element&#8217;s parent element.</p>
   </div>
-      <div class="no-number no-toc" id="legend-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#legend-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="legend-attr-mdl">
+      <div class="no-number no-toc" id="legend-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#legend-content-model">#</a></h2><div class="content-models">
+        
+      <div id="legend-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="legend-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#legend-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="legend.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: address.html
===================================================================
RCS file: /sources/public/html5/markup/address.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- address.html	1 Feb 2010 05:24:59 -0000	1.32
+++ address.html	4 Feb 2010 15:09:17 -0000	1.33
@@ -17,9 +17,16 @@
     <p>The <a href="address.html#address" class="element">address</a>
       element represents contact information.</p>
   </div>
-      <div class="no-number no-toc" id="address-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#address-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></div></div><div class="no-number no-toc" id="address-attr-mdl">
+      <div class="no-number no-toc" id="address-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#address-content-model">#</a></h2><div class="content-models">
+        
+      <div id="address-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#flow-content">flow content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="address-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#address-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="address.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: th.html
===================================================================
RCS file: /sources/public/html5/markup/th.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- th.html	3 Feb 2010 14:44:06 -0000	1.37
+++ th.html	4 Feb 2010 15:09:22 -0000	1.38
@@ -17,16 +17,23 @@
     <p>The <a href="th.html#th" class="element">th</a> element represents
     a header cell in a table.</p>
   </div>
-      <div class="no-number no-toc" id="th-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#th-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="th-attr-mdl">
+      <div class="no-number no-toc" id="th-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#th-content-model">#</a></h2><div class="content-models">
+        
+      <div id="th-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#flow-content">flow content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="th-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#th-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="th.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="th.html#th.attrs.scope" title="th.attrs.scope">scope</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="th.html#th.attrs.colspan" title="th.attrs.colspan">colspan</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="th.html#th.attrs.rowspan" title="th.attrs.rowspan">rowspan</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="th.html#th.attrs.headers" title="th.attrs.headers">headers</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="th.html#th.attrs.scope" title="th.attrs.scope">scope</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="th.html#th.attrs.colspan" title="th.attrs.colspan">colspan</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="th.html#th.attrs.rowspan" title="th.attrs.rowspan">rowspan</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="th.html#th.attrs.headers" title="th.attrs.headers">headers</a> </span></p></div></div>
       <div class="no-number no-toc" id="th-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#th-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -124,8 +131,7 @@
       </div>
       <div class="no-number no-toc" id="th-context">
         <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#th-context">#</a></h2>
-        <p class="permitted-parents">
-        <span class="context-mdl"><a href="tr.html#tr">tr</a></span></p>
+        <p class="permitted-parents"></p>
       </div>
       
       <div class="no-number no-toc" id="th-display">

Index: mark.html
===================================================================
RCS file: /sources/public/html5/markup/mark.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- mark.html	3 Feb 2010 14:44:05 -0000	1.31
+++ mark.html	4 Feb 2010 15:09:20 -0000	1.32
@@ -19,9 +19,16 @@
     for reference purposes, due to its relevance in another
     context.</p>
   </div>
-      <div class="no-number no-toc" id="mark-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#mark-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="mark-attr-mdl">
+      <div class="no-number no-toc" id="mark-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#mark-content-model">#</a></h2><div class="content-models">
+        
+      <div id="mark-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="mark-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#mark-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="mark.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -d -r1.377 -r1.378
--- Overview.html	3 Feb 2010 14:44:04 -0000	1.377
+++ Overview.html	4 Feb 2010 15:09:17 -0000	1.378
@@ -10,7 +10,7 @@
 <div class="head">
 <div><a href="http://www.w3.org/"><img src="http://www.w3.org/Icons/w3c_home" width="72" height="48" alt="W3C"></a></div>
 <h1>HTML: The Markup Language</h1>
-<h2>W3C Editor&#8217;s Draft <em>3 February 2010</em>
+<h2>W3C Editor&#8217;s Draft <em>4 February 2010</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -50,7 +50,7 @@
           reports index</a> at http://www.w3.org/TR/.
       </em></p>
     <p>
-        This document is the 3 February 2010 Editor&#8217;s Draft of 
+        This document is the 4 February 2010 Editor&#8217;s Draft of 
         <cite>HTML: The Markup Language</cite>.
       
       If you&#8217;d like to comment on this document, the preferred
@@ -121,7 +121,7 @@
 <span class="toc-section-number"></span><a href="intro.html#intro"><span class="toc-section-number">1.</span> Introduction</a>
 </li>
 <li>
-<span class="toc-section-number"></span><a href="terminology.html#terminology"><span class="toc-section-number">2.</span> Terminology and symbols</a>
+<span class="toc-section-number"></span><a href="terminology.html#terminology"><span class="toc-section-number">2.</span> Terminology</a>
 </li>
 <li>
 <span class="toc-section-number"></span><a href="documents.html#documents"><span class="toc-section-number">3.</span> Documents</a>
@@ -163,7 +163,7 @@
 <span class="toc-section-number"></span><a href="intro.html#intro"><span class="toc-section-number">1.</span> Introduction</a>
 </li>
 <li id="terminology-toc">
-<span class="toc-section-number"></span><a href="terminology.html#terminology"><span class="toc-section-number">2.</span> Terminology and symbols</a>
+<span class="toc-section-number"></span><a href="terminology.html#terminology"><span class="toc-section-number">2.</span> Terminology</a>
 </li>
 <li id="documents-toc">
 <span class="toc-section-number"></span><a href="documents.html#documents"><span class="toc-section-number">3.</span> Documents</a>

Index: br.html
===================================================================
RCS file: /sources/public/html5/markup/br.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- br.html	1 Feb 2010 05:25:00 -0000	1.27
+++ br.html	4 Feb 2010 15:09:18 -0000	1.28
@@ -17,7 +17,14 @@
     <p>The <a href="br.html#br" class="element">br</a> element represents
     a line break.</p>
   </div>
-      <div class="no-number no-toc" id="br-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#br-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="br-attr-mdl">
+      <div class="no-number no-toc" id="br-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#br-content-model">#</a></h2><div class="content-models">
+        
+      <div id="br-mdls">
+        <p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span> 
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="br-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#br-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="br.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: input.email.html
===================================================================
RCS file: /sources/public/html5/markup/input.email.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- input.email.html	3 Feb 2010 14:44:05 -0000	1.32
+++ input.email.html	4 Feb 2010 15:09:19 -0000	1.33
@@ -20,26 +20,34 @@
     a control for editing a list of e-mail addresses given in the
     element&#8217;s value.</p>
   </div>
-      <div class="no-number no-toc" id="input.email-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.email-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.email-attr-mdl">
+      <div class="no-number no-toc" id="input.email-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#input.email-content-model">#</a></h2><div class="content-models">
+        
+      <div id="input.email-mdls">
+        <p class="elem-mdl">
+      <a class="ref" href="input.email.html#input.email.attrs">input.email.attrs</a>
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="input.email-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.email-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="input.email.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.email.html#input.email.attrs.type" title="input.email.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> ((<a class="ref" href="forms-attributes.html#input.attrs.multiple" title="input.attrs.multiple">multiple</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-                                               <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.email.html#input.email.attrs.value.multiple" title="input.email.attrs.value.multiple">value.multiple</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )
-                                              <span class="postfix or">or</span> <a class="ref" href="input.email.html#input.email.attrs.value.single" title="input.email.attrs.value.single">value.single</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )<span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.email.html#input.email.attrs.type" title="input.email.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a> 
+   <span class="postfix intermixed">&amp;</span>   <span class="agroupof"><a class="ref" href="forms-attributes.html#input.attrs.multiple" title="input.attrs.multiple">multiple</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+                                                                                                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.email.html#input.email.attrs.value.multiple" title="input.email.attrs.value.multiple">value.multiple</a> </span>
+                                                                                   <span class="postfix or">or</span> <a class="ref" href="input.email.html#input.email.attrs.value.single" title="input.email.attrs.value.single">value.single</a>  </span></p></div></div>
       <div class="no-number no-toc" id="input.email-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.email-attributes">#</a></h2>
         <dl class="attr-defs">

Index: tr.html
===================================================================
RCS file: /sources/public/html5/markup/tr.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- tr.html	1 Feb 2010 05:25:04 -0000	1.28
+++ tr.html	4 Feb 2010 15:09:22 -0000	1.29
@@ -17,20 +17,17 @@
     <p>The <a href="tr.html#tr" class="element">tr</a> element represents
     a row of cells in a table.</p>
   </div>
-      <div class="no-number no-toc" id="tr-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#tr-contents">#</a></h2><div class="prose-model">
-    <p>When the parent node is a
-    <a href="thead.html#thead" class="element">thead</a>
-    element, zero or more
-    <a href="th.html#th" class="element">th</a>
-    elements</p>
-    <p>When the parent node is not a
-    <a href="thead.html#thead" class="element">thead</a>
-    element, zero or more
-    <a href="th.html#th" class="element">th</a>
-    or
-    <a href="td.html#td" class="element">td</a>
-    elements</p>
-  </div></div><div class="no-number no-toc" id="tr-attr-mdl">
+      <div class="no-number no-toc" id="tr-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#tr-content-model">#</a></h2><div class="content-models">
+        
+      <div id="tr-mdls">
+        <p class="elem-mdl">
+       <span>zero or more of: </span><span class="agroupof"><span>one </span><a class="ref" href="td.html#td">td</a><span> element</span>, 
+                          <span class="postfix or">or</span> <span>one </span><a class="ref" href="th.html#th">th</a><span> element</span></span>  
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="tr-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#tr-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="tr.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>
@@ -73,7 +70,6 @@
       <div class="no-number no-toc" id="tr-context">
         <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#tr-context">#</a></h2>
         <p class="permitted-parents">
-        <span class="context-mdl"><a href="table.html#table">table</a></span>, 
         <span class="context-mdl"><a href="thead.html#thead">thead</a></span>, 
         <span class="context-mdl"><a href="tfoot.html#tfoot">tfoot</a></span>, 
         <span class="context-mdl"><a href="tbody.html#tbody">tbody</a></span></p>

Index: input.month.html
===================================================================
RCS file: /sources/public/html5/markup/input.month.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- input.month.html	3 Feb 2010 14:44:05 -0000	1.33
+++ input.month.html	4 Feb 2010 15:09:19 -0000	1.34
@@ -20,23 +20,31 @@
     a control for setting the element&#8217;s value to a string
     representing a month.</p>
   </div>
-      <div class="no-number no-toc" id="input.month-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.month-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.month-attr-mdl">
+      <div class="no-number no-toc" id="input.month-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#input.month-content-model">#</a></h2><div class="content-models">
+        
+      <div id="input.month-mdls">
+        <p class="elem-mdl">
+      <a class="ref" href="input.month.html#input.month.attrs">input.month.attrs</a>
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="input.month-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.month-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="input.month.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.month.html#input.month.attrs.type" title="input.month.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.month.html#input.month.attrs.min" title="input.month.attrs.min">min</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.month.html#input.month.attrs.max" title="input.month.attrs.max">max</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.step.integer" title="input.attrs.step.integer">step.integer</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.month.html#input.month.attrs.value" title="input.month.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.month.html#input.month.attrs.type" title="input.month.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.month.html#input.month.attrs.min" title="input.month.attrs.min">min</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.month.html#input.month.attrs.max" title="input.month.attrs.max">max</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.step.integer" title="input.attrs.step.integer">step.integer</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.month.html#input.month.attrs.value" title="input.month.attrs.value">value</a> </span></p></div></div>
       <div class="no-number no-toc" id="input.month-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.month-attributes">#</a></h2>
         <dl class="attr-defs">

Index: iframe.html
===================================================================
RCS file: /sources/public/html5/markup/iframe.html,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- iframe.html	3 Feb 2010 14:44:05 -0000	1.41
+++ iframe.html	4 Feb 2010 15:09:19 -0000	1.42
@@ -17,23 +17,25 @@
     <p>The <a href="iframe.html#iframe" class="element">iframe</a> element
     introduces a new nested browsing context.</p>
   </div>
-      <div class="no-number no-toc" id="iframe-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#iframe-contents">#</a></h2><div class="prose-model">
-    <p>In
-      <a href="documents.html#syntax-document-html">documents in the HTML syntax</a>,
-      <a href="syntax.html#normal-character-data">normal character data</a>.</p>
-    <p>In
-      <a href="documents.html#syntax-document-xml">documents in the XML syntax</a>,
-      empty.</p>
-  </div></div><div class="no-number no-toc" id="iframe-attr-mdl">
+      <div class="no-number no-toc" id="iframe-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#iframe-content-model">#</a></h2><div class="content-models">
+        
+      <div id="iframe-mdls">
+        <p class="elem-mdl">
+      <a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="iframe-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#iframe-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="iframe.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="iframe.html#iframe.attrs.src" title="iframe.attrs.src">src</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="iframe.html#iframe.attrs.name" title="iframe.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="iframe.html#iframe.attrs.width" title="iframe.attrs.width">width</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="iframe.html#iframe.attrs.height" title="iframe.attrs.height">height</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="iframe.html#iframe.attrs.sandbox" title="iframe.attrs.sandbox">sandbox</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="iframe.html#iframe.attrs.seamless" title="iframe.attrs.seamless">seamless</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="iframe.html#iframe.attrs.src" title="iframe.attrs.src">src</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="iframe.html#iframe.attrs.name" title="iframe.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="iframe.html#iframe.attrs.width" title="iframe.attrs.width">width</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="iframe.html#iframe.attrs.height" title="iframe.attrs.height">height</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="iframe.html#iframe.attrs.sandbox" title="iframe.attrs.sandbox">sandbox</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="iframe.html#iframe.attrs.seamless" title="iframe.attrs.seamless">seamless</a> </span></p></div></div>
       <div class="no-number no-toc" id="iframe-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#iframe-attributes">#</a></h2>
         <dl class="attr-defs">

Index: ins.html
===================================================================
RCS file: /sources/public/html5/markup/ins.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- ins.html	1 Feb 2010 05:25:02 -0000	1.34
+++ ins.html	4 Feb 2010 15:09:20 -0000	1.35
@@ -18,12 +18,21 @@
     represents a range of text that has been inserted (added) to
     a document.</p>
   </div>
-      <div class="no-number no-toc" id="ins-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#ins-contents">#</a></h2><div class="prose-model"><div id="prose-model"><p><a href="terminology.html#transparent">transparent</a></p></div></div></div><div class="no-number no-toc" id="ins-attr-mdl">
+      <div class="no-number no-toc" id="ins-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#ins-content-model">#</a></h2><div class="content-models">
+        
+      <div id="ins-mdls">
+        
+        <p class="elem-mdl"><span class="transparent"><a href="terminology.html#transparent">transparent</a> (<span class="postfix or">either</span> <a href="terminology.html#phrasing-content">phrasing content</a> <span class="postfix or">or</span> <a href="terminology.html#phrasing-content">flow content</a>)</span></p>
+        
+        
+        </div>
+      </div></div><div class="no-number no-toc" id="ins-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#ins-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="ins.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="ins.html#ins.attrs.cite" title="ins.attrs.cite">cite</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="ins.html#ins.attrs.datetime" title="ins.attrs.datetime">datetime</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="ins.html#ins.attrs.cite" title="ins.attrs.cite">cite</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="ins.html#ins.attrs.datetime" title="ins.attrs.datetime">datetime</a> </span></p></div></div>
       <div class="no-number no-toc" id="ins-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#ins-attributes">#</a></h2>
         <dl class="attr-defs">

Index: abbr.html
===================================================================
RCS file: /sources/public/html5/markup/abbr.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- abbr.html	1 Feb 2010 05:24:59 -0000	1.30
+++ abbr.html	4 Feb 2010 15:09:17 -0000	1.31
@@ -18,9 +18,16 @@
       <a href="abbr.html#abbr" class="element">abbr</a>
       element represents an abbreviation or acronym.</p>
   </div>
-      <div class="no-number no-toc" id="abbr-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#abbr-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="abbr-attr-mdl">
+      <div class="no-number no-toc" id="abbr-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#abbr-content-model">#</a></h2><div class="content-models">
+        
+      <div id="abbr-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="abbr-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#abbr-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="abbr.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: meta.name.html
===================================================================
RCS file: /sources/public/html5/markup/meta.name.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- meta.name.html	1 Feb 2010 05:25:02 -0000	1.32
+++ meta.name.html	4 Feb 2010 15:09:20 -0000	1.33
@@ -18,14 +18,21 @@
     with a <span class="attribute">name</span> attribute
     sets document metadata in the form of name/value pairs.</p>
   </div>
-      <div class="no-number no-toc" id="meta.name-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#meta.name-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="meta.name-attr-mdl">
+      <div class="no-number no-toc" id="meta.name-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#meta.name-content-model">#</a></h2><div class="content-models">
+        
+      <div id="meta.name-mdls">
+        <p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span> 
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="meta.name-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#meta.name-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="meta.name.attrs"><a class="ref" href="common-attributes.html#common.attrs.core" title="common.attrs.core">common.attrs.core</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="meta.name.html#meta.name.attrs.name" title="meta.name.attrs.name">name</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="meta.name.html#meta.name.attrs.content" title="meta.name.attrs.content">content</a><span class="postfix required" title="REQUIRED">&#9733;</span></span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="meta.name.html#meta.name.attrs.name" title="meta.name.attrs.name">name</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="meta.name.html#meta.name.attrs.content" title="meta.name.attrs.content">content</a><span class="postfix required" title="REQUIRED">&#9733;</span></span></p></div></div>
       <div class="no-number no-toc" id="meta.name-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#meta.name-attributes">#</a></h2>
         <dl class="attr-defs">

Index: table.html
===================================================================
RCS file: /sources/public/html5/markup/table.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- table.html	3 Feb 2010 10:27:03 -0000	1.33
+++ table.html	4 Feb 2010 15:09:21 -0000	1.34
@@ -18,35 +18,28 @@
     represents a table; that is, data with more than one
     dimension.</p>
   </div>
-      <div class="no-number no-toc" id="table-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#table-contents">#</a></h2><div class="prose-model">
-    <p>In this order: optionally a
-    <a href="caption.html#caption" class="element">caption</a>
-    element, followed by zero or more
-    <a href="colgroup.html#colgroup" class="element">colgroup</a>
-    elements, optionally followed by a
-    <a href="thead.html#thead" class="element">colgroup</a>
-    element, followed by one of the following:</p>
-    <ul>
-      <li>a
-      <a href="tfoot.html#tfoot" class="element">tfoot</a>
-      element, followed by either zero or more
-      <a href="tbody.html#tbody" class="element">tbody</a>
-      elements or one or more
-      <a href="tr.html#tr" class="element">tr</a>
-      </li>
-      <li>or, either zero or more
-      <a href="tbody.html#tbody" class="element">tbody</a>
-      elements or one or more
-      <a href="tr.html#tr" class="element">tr</a>
-      elements, optionally followed by a
-      <a href="tfoot.html#tfoot" class="element">tfoot</a>
-      element</li>
-    </ul>
-  </div></div><div class="no-number no-toc" id="table-attr-mdl">
+      <div class="no-number no-toc" id="table-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#table-content-model">#</a></h2><div class="content-models">
+        
+      <div id="table-mdls">
+        <p class="elem-mdl">
+      <span>an optional </span><a class="ref" href="caption.html#caption">caption</a><span> element</span>,   <span class="postfix followedby">followed by</span> 
+  <span>zero or more </span><a class="ref" href="colgroup.html#colgroup">colgroup</a><span> elements</span>,   <span class="postfix followedby">followed by</span> 
+  <span>an optional </span><a class="ref" href="thead.html#thead">thead</a><span> element</span>,   <span class="postfix followedby">followed by</span> 
+   <span class="agroupof"> <span class="agroupof"><span>one </span><a class="ref" href="tfoot.html#tfoot">tfoot</a><span> element</span>,  <span class="postfix followedby">followed by</span> 
+                                                 <span class="agroupof"><span>zero or more </span><a class="ref" href="tbody.html#tbody">tbody</a><span> elements</span>,  
+                                                                        <span class="postfix or">or</span> <span>one or more </span><a class="ref" href="tr.html#tr">tr</a><span> elements</span> </span></span>
+                          <span class="postfix or">or</span>  <span class="agroupof"> <span class="agroupof"><span>zero or more </span><a class="ref" href="tbody.html#tbody">tbody</a><span> elements</span>,  
+                                                                                                            <span class="postfix or">or</span> <span>one or more </span><a class="ref" href="tr.html#tr">tr</a><span> elements</span> </span> <span class="postfix followedby">followed by</span> 
+                                                                                    <span>an optional </span><a class="ref" href="tfoot.html#tfoot">tfoot</a><span> element</span> </span></span>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="table-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#table-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="table.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="table.html#table.attrs.summary" title="table.attrs.summary">summary</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="table.html#table.attrs.summary" title="table.attrs.summary">summary</a> </span></p></div></div>
       <div class="no-number no-toc" id="table-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#table-attributes">#</a></h2>
         <dl class="attr-defs">

Index: nav.html
===================================================================
RCS file: /sources/public/html5/markup/nav.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- nav.html	3 Feb 2010 14:44:05 -0000	1.36
+++ nav.html	4 Feb 2010 15:09:20 -0000	1.37
@@ -19,9 +19,16 @@
     documents or to parts within the document itself; that is, a
     section of navigation links.</p>
   </div>
-      <div class="no-number no-toc" id="nav-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#nav-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></div></div><div class="no-number no-toc" id="nav-attr-mdl">
+      <div class="no-number no-toc" id="nav-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#nav-content-model">#</a></h2><div class="content-models">
+        
+      <div id="nav-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#flow-content">flow content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="nav-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#nav-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="nav.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: html.html
===================================================================
RCS file: /sources/public/html5/markup/html.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- html.html	1 Feb 2010 05:25:01 -0000	1.32
+++ html.html	4 Feb 2010 15:09:19 -0000	1.33
@@ -17,17 +17,21 @@
     <p>The <a href="html.html#html" class="element">html</a> element
     represents the root of a document.</p>
   </div>
-      <div class="no-number no-toc" id="html-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#html-contents">#</a></h2><div class="prose-model">
-    <p>A
-    <a href="head.html#head" class="element">head</a>
-    element followed by a
-    <a href="body.html#body" class="element">body</a>
-    element</p>
-  </div></div><div class="no-number no-toc" id="html-attr-mdl">
+      <div class="no-number no-toc" id="html-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#html-content-model">#</a></h2><div class="content-models">
+        
+      <div id="html-mdls">
+        <p class="elem-mdl">
+      <span>one </span><a class="ref" href="head.html#head">head</a><span> element</span>,  <span class="postfix followedby">followed by</span> 
+  <span>one </span><a class="ref" href="body.html#body">body</a><span> element</span>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="html-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#html-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="html.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="html.html#html.attrs.manifest" title="html.attrs.manifest">manifest</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="html.html#html.attrs.manifest" title="html.attrs.manifest">manifest</a> </span></p></div></div>
       <div class="no-number no-toc" id="html-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#html-attributes">#</a></h2>
         <dl class="attr-defs">

Index: meta.http-equiv.content-type.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.content-type.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- meta.http-equiv.content-type.html	1 Feb 2010 05:25:02 -0000	1.35
+++ meta.http-equiv.content-type.html	4 Feb 2010 15:09:20 -0000	1.36
@@ -19,14 +19,21 @@
       value is "<a href="meta.http-equiv.content-type.html#meta.http-equiv.attrs.http-equiv.content-type">content-type</a>" and which has an accompanying <a href="meta.http-equiv.content-type.html#meta.http-equiv.attrs.content.content-type">content</a> attribute and value represents a <a href="syntax.html#encoding-declaration">character encoding
       declaration</a>.</p>
   </div>
-      <div class="no-number no-toc" id="meta.http-equiv.content-type-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#meta.http-equiv.content-type-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="meta.http-equiv.content-type-attr-mdl">
+      <div class="no-number no-toc" id="meta.http-equiv.content-type-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#meta.http-equiv.content-type-content-model">#</a></h2><div class="content-models">
+        
+      <div id="meta.http-equiv.content-type-mdls">
+        <p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span> 
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="meta.http-equiv.content-type-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#meta.http-equiv.content-type-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="meta.http-equiv.content-type.attrs"><a class="ref" href="common-attributes.html#common.attrs.core" title="common.attrs.core">common.attrs.core</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.attrs.http-equiv.content-type" title="meta.http-equiv.attrs.http-equiv.content-type">http-equiv.content-type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.attrs.content.content-type" title="meta.http-equiv.attrs.content.content-type">content.content-type</a><span class="postfix required" title="REQUIRED">&#9733;</span></span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.attrs.http-equiv.content-type" title="meta.http-equiv.attrs.http-equiv.content-type">http-equiv.content-type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.attrs.content.content-type" title="meta.http-equiv.attrs.content.content-type">content.content-type</a><span class="postfix required" title="REQUIRED">&#9733;</span></span></p></div></div>
       <div class="no-number no-toc" id="meta.http-equiv.content-type-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#meta.http-equiv.content-type-attributes">#</a></h2>
         <dl class="attr-defs">

Index: footer.html
===================================================================
RCS file: /sources/public/html5/markup/footer.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- footer.html	2 Feb 2010 05:22:34 -0000	1.34
+++ footer.html	4 Feb 2010 15:09:19 -0000	1.35
@@ -17,9 +17,16 @@
     <p>The <a href="footer.html#footer" class="element">footer</a> element
     represents the footer for the section it applies to.</p>
   </div>
-      <div class="no-number no-toc" id="footer-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#footer-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></div></div><div class="no-number no-toc" id="footer-attr-mdl">
+      <div class="no-number no-toc" id="footer-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#footer-content-model">#</a></h2><div class="content-models">
+        
+      <div id="footer-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#flow-content">flow content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="footer-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#footer-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="footer.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: meta.http-equiv.content-language.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.content-language.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- meta.http-equiv.content-language.html	3 Feb 2010 14:44:05 -0000	1.30
+++ meta.http-equiv.content-language.html	4 Feb 2010 15:09:20 -0000	1.31
@@ -26,14 +26,21 @@
     obsolete. Consider specifying the language on the root element
     instead.</p>
   </div>
-      <div class="no-number no-toc" id="meta.http-equiv.content-language-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#meta.http-equiv.content-language-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="meta.http-equiv.content-language-attr-mdl">
+      <div class="no-number no-toc" id="meta.http-equiv.content-language-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#meta.http-equiv.content-language-content-model">#</a></h2><div class="content-models">
+        
+      <div id="meta.http-equiv.content-language-mdls">
+        <p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span> 
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="meta.http-equiv.content-language-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#meta.http-equiv.content-language-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="meta.http-equiv.content-language.attrs"><a class="ref" href="common-attributes.html#common.attrs.core" title="common.attrs.core">common.attrs.core</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.attrs.http-equiv.content-language" title="meta.http-equiv.attrs.http-equiv.content-language">http-equiv.content-language</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.attrs.content.content-language" title="meta.http-equiv.attrs.content.content-language">content.content-language</a><span class="postfix required" title="REQUIRED">&#9733;</span></span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.attrs.http-equiv.content-language" title="meta.http-equiv.attrs.http-equiv.content-language">http-equiv.content-language</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.attrs.content.content-language" title="meta.http-equiv.attrs.content.content-language">content.content-language</a><span class="postfix required" title="REQUIRED">&#9733;</span></span></p></div></div>
       <div class="no-number no-toc" id="meta.http-equiv.content-language-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#meta.http-equiv.content-language-attributes">#</a></h2>
         <dl class="attr-defs">

Index: script.html
===================================================================
RCS file: /sources/public/html5/markup/script.html,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- script.html	3 Feb 2010 14:44:06 -0000	1.41
+++ script.html	4 Feb 2010 15:09:21 -0000	1.42
@@ -17,23 +17,34 @@
     <p>The <a href="script.html#script" class="element">script</a> element
     enables dynamic script and data blocks to be included in documents.</p>
   </div>
-      <div class="no-number no-toc" id="script-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#script-contents">#</a></h2><div class="prose-model">
-    <p>
-    <a href="syntax.html#non-replaceable-character-data">non-replaceable character data</a>
+      <div class="no-number no-toc" id="script-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#script-content-model">#</a></h2><div class="content-models">
+        
+      <div id="script-mdls">
+        
+        <p class="elem-mdl">
+      <span>one </span><a class="ref" href="syntax.html#non-replaceable-character-data">non-replaceable-character-data</a><span> element</span>
+        
+    </p><div class="postfix or">or</div>
+        
+        <p class="elem-mdl">
+      <span>one </span><a class="ref" href="syntax.html#non-replaceable-character-data">non-replaceable-character-data</a><span> element</span>
+        
     </p>
-  </div></div><div class="no-number no-toc" id="script-attr-mdl">
+        </div>
+      </div></div><div class="no-number no-toc" id="script-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#script-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="script.html#script.attrs.type" title="script.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="script.html#script.attrs.language" title="script.attrs.language">language</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </p>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="script.html#script.attrs.type" title="script.attrs.type">type</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="script.html#script.attrs.language" title="script.attrs.language">language</a> </p>
           <p><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="script.html#script.attrs.src" title="script.attrs.src">src</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="script.html#script.attrs.defer" title="script.attrs.defer">defer</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="script.html#script.attrs.async" title="script.attrs.async">async</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="script.html#script.attrs.type" title="script.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="script.html#script.attrs.charset" title="script.attrs.charset">charset</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="script.html#script.attrs.language" title="script.attrs.language">language</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </p>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="script.html#script.attrs.src" title="script.attrs.src">src</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="script.html#script.attrs.defer" title="script.attrs.defer">defer</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="script.html#script.attrs.async" title="script.attrs.async">async</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="script.html#script.attrs.type" title="script.attrs.type">type</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="script.html#script.attrs.charset" title="script.attrs.charset">charset</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="script.html#script.attrs.language" title="script.attrs.language">language</a> </p>
         </div></div>
       <div class="no-number no-toc" id="script-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#script-attributes">#</a></h2>

Index: input.range.html
===================================================================
RCS file: /sources/public/html5/markup/input.range.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- input.range.html	3 Feb 2010 14:44:05 -0000	1.33
+++ input.range.html	4 Feb 2010 15:09:19 -0000	1.34
@@ -20,21 +20,29 @@
     an imprecise control for setting the element&#8217;s value to a
     string representing a number.</p>
   </div>
-      <div class="no-number no-toc" id="input.range-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.range-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.range-attr-mdl">
+      <div class="no-number no-toc" id="input.range-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#input.range-content-model">#</a></h2><div class="content-models">
+        
+      <div id="input.range-mdls">
+        <p class="elem-mdl">
+      <a class="ref" href="input.range.html#input.range.attrs">input.range.attrs</a>
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="input.range-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.range-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="input.range.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.range.html#input.range.attrs.type" title="input.range.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.range.html#input.range.attrs.min" title="input.range.attrs.min">min</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.range.html#input.range.attrs.max" title="input.range.attrs.max">max</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.range.html#input.range.attrs.value" title="input.range.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.range.html#input.range.attrs.type" title="input.range.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.range.html#input.range.attrs.min" title="input.range.attrs.min">min</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.range.html#input.range.attrs.max" title="input.range.attrs.max">max</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.range.html#input.range.attrs.value" title="input.range.attrs.value">value</a> </span></p></div></div>
       <div class="no-number no-toc" id="input.range-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.range-attributes">#</a></h2>
         <dl class="attr-defs">

Index: audio.html
===================================================================
RCS file: /sources/public/html5/markup/audio.html,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- audio.html	3 Feb 2010 14:44:04 -0000	1.40
+++ audio.html	4 Feb 2010 15:09:17 -0000	1.41
@@ -17,25 +17,33 @@
     <p>An <a href="audio.html#audio" class="element">audio</a> element
       represents an audio stream.</p>
   </div>
-      <div class="no-number no-toc" id="audio-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#audio-contents">#</a></h2><div class="prose-model">
-    <p>If the element does not have a
-    <a href="audio.html#audio.attrs.src" class="attribute">src</a>
-    attribute, one or more 
-    <a href="source.html#source" class="element">source</a>
-    elements, then,
-    <a href="terminology.html#transparent">transparent</a>.</p>
-    <p>If the element has a
-    <a href="audio.html#audio.attrs.src" class="attribute">src</a>
-    attribute,
-    <a href="terminology.html#transparent">transparent</a>.</p>
-  </div></div><div class="no-number no-toc" id="audio-attr-mdl">
+      <div class="no-number no-toc" id="audio-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#audio-content-model">#</a></h2><div class="content-models">
+        
+      <div id="audio-mdls">
+        
+        <p class="elem-mdl">
+       <span class="agroupof"><span>one </span><a class="ref" href="audio.html#audio.attrs.src">audio.attrs.src</a><span> element</span>, 
+                          <span class="postfix or">or</span> <span>zero or more </span><a class="ref" href="source.html#source">source</a><span> elements</span> </span> <span class="postfix followedby">followed by</span> 
+  <a href="terminology.html#flow-content">flow content</a>
+        
+    </p><div class="postfix or">or</div>
+        
+        <p class="elem-mdl">
+       <span class="agroupof"><span>one </span><a class="ref" href="audio.html#audio.attrs.src">audio.attrs.src</a><span> element</span>, 
+                          <span class="postfix or">or</span> <span>zero or more </span><a class="ref" href="source.html#source">source</a><span> elements</span> </span> <span class="postfix followedby">followed by</span> 
+  <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="audio-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#audio-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="audio.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="audio.html#audio.attrs.autoplay" title="audio.attrs.autoplay">autoplay</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="audio.html#audio.attrs.autobuffer" title="audio.attrs.autobuffer">autobuffer</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="audio.html#audio.attrs.controls" title="audio.attrs.controls">controls</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="audio.html#audio.attrs.loop" title="audio.attrs.loop">loop</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="audio.html#audio.attrs.autoplay" title="audio.attrs.autoplay">autoplay</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="audio.html#audio.attrs.autobuffer" title="audio.attrs.autobuffer">autobuffer</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="audio.html#audio.attrs.controls" title="audio.attrs.controls">controls</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="audio.html#audio.attrs.loop" title="audio.attrs.loop">loop</a> </span></p></div></div>
       <div class="no-number no-toc" id="audio-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#audio-attributes">#</a></h2>
         <dl class="attr-defs">

Index: time.html
===================================================================
RCS file: /sources/public/html5/markup/time.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- time.html	3 Feb 2010 14:44:06 -0000	1.34
+++ time.html	4 Feb 2010 15:09:22 -0000	1.35
@@ -17,14 +17,21 @@
     <p>The <a href="time.html#time" class="element">time</a> element
     represents a date and/or time.</p>
   </div>
-      <div class="no-number no-toc" id="time-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#time-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="time-attr-mdl">
+      <div class="no-number no-toc" id="time-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#time-content-model">#</a></h2><div class="content-models">
+        
+      <div id="time-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="time-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#time-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="time.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="time.html#time.attrs.datetime" title="time.attrs.datetime">datetime</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="time.html#time.attrs.pubdate" title="time.attrs.pubdate">pubdate</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="time.html#time.attrs.datetime" title="time.attrs.datetime">datetime</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="time.html#time.attrs.pubdate" title="time.attrs.pubdate">pubdate</a> </span></p></div></div>
       <div class="no-number no-toc" id="time-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#time-attributes">#</a></h2>
         <dl class="attr-defs">

Index: meta.http-equiv.default-style.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.default-style.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- meta.http-equiv.default-style.html	1 Feb 2010 05:25:02 -0000	1.32
+++ meta.http-equiv.default-style.html	4 Feb 2010 15:09:20 -0000	1.33
@@ -19,14 +19,21 @@
     whose value is "<code>default-style</code>" represents a pragma
     directive that specifies the document&#8217;s preferred stylesheet.</p>
   </div>
-      <div class="no-number no-toc" id="meta.http-equiv.default-style-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#meta.http-equiv.default-style-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="meta.http-equiv.default-style-attr-mdl">
+      <div class="no-number no-toc" id="meta.http-equiv.default-style-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#meta.http-equiv.default-style-content-model">#</a></h2><div class="content-models">
+        
+      <div id="meta.http-equiv.default-style-mdls">
+        <p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span> 
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="meta.http-equiv.default-style-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#meta.http-equiv.default-style-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="meta.http-equiv.default-style.attrs"><a class="ref" href="common-attributes.html#common.attrs.core" title="common.attrs.core">common.attrs.core</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.attrs.http-equiv.default-style" title="meta.http-equiv.attrs.http-equiv.default-style">http-equiv.default-style</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.attrs.content.default-style" title="meta.http-equiv.attrs.content.default-style">content.default-style</a><span class="postfix required" title="REQUIRED">&#9733;</span></span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.attrs.http-equiv.default-style" title="meta.http-equiv.attrs.http-equiv.default-style">http-equiv.default-style</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.attrs.content.default-style" title="meta.http-equiv.attrs.content.default-style">content.default-style</a><span class="postfix required" title="REQUIRED">&#9733;</span></span></p></div></div>
       <div class="no-number no-toc" id="meta.http-equiv.default-style-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#meta.http-equiv.default-style-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -65,8 +72,7 @@
         <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#meta.http-equiv.default-style-context">#</a></h2>
         <p class="permitted-parents">
         <span class="context-mdl"><span>Any element that can contain
-            <a href="common-models.html#common.elem.metadata">metadata elements</a></span></span>, 
-        <span class="context-mdl"><a href="noscript.html#noscript">noscript</a></span></p>
+            <a href="common-models.html#common.elem.metadata">metadata elements</a></span></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: keygen.html
===================================================================
RCS file: /sources/public/html5/markup/keygen.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- keygen.html	3 Feb 2010 14:44:05 -0000	1.34
+++ keygen.html	4 Feb 2010 15:09:20 -0000	1.35
@@ -18,16 +18,23 @@
     represents a control for generating a public-private key
     pair and for submitting the public key from that key pair.</p>
   </div>
-      <div class="no-number no-toc" id="keygen-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#keygen-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="keygen-attr-mdl">
+      <div class="no-number no-toc" id="keygen-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#keygen-content-model">#</a></h2><div class="content-models">
+        
+      <div id="keygen-mdls">
+        <p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span> 
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="keygen-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#keygen-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="keygen.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="keygen.html#keygen.attrs.challenge" title="keygen.attrs.challenge">challenge</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="keygen.html#keygen.attrs.keytype" title="keygen.attrs.keytype">keytype</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> <span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="keygen.html#keygen.attrs.challenge" title="keygen.attrs.challenge">challenge</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="keygen.html#keygen.attrs.keytype" title="keygen.attrs.keytype">keytype</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>  </span></p></div></div>
       <div class="no-number no-toc" id="keygen-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#keygen-attributes">#</a></h2>
         <dl class="attr-defs">

Index: command.command.html
===================================================================
RCS file: /sources/public/html5/markup/command.command.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- command.command.html	3 Feb 2010 14:44:04 -0000	1.33
+++ command.command.html	4 Feb 2010 15:09:18 -0000	1.34
@@ -19,14 +19,21 @@
     value is "<code>command</code>" represents a command with an
     associated action.</p>
   </div>
-      <div class="no-number no-toc" id="command.command-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#command.command-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="command.command-attr-mdl">
+      <div class="no-number no-toc" id="command.command-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#command.command-content-model">#</a></h2><div class="content-models">
+        
+      <div id="command.command-mdls">
+        <p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span> 
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="command.command-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#command.command-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="command.command.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="command.command.html#command.command.attrs.type" title="command.command.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="command.command.html#command.command.attrs.label" title="command.command.attrs.label">label</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="command.command.html#command.command.attrs.icon" title="command.command.attrs.icon">icon</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="command.command.html#command.command.attrs.disabled" title="command.command.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="command.command.html#command.command.attrs.type" title="command.command.attrs.type">type</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="command.command.html#command.command.attrs.label" title="command.command.attrs.label">label</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="command.command.html#command.command.attrs.icon" title="command.command.attrs.icon">icon</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="command.command.html#command.command.attrs.disabled" title="command.command.attrs.disabled">disabled</a> </span></p></div></div>
       <div class="no-number no-toc" id="command.command-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#command.command-attributes">#</a></h2>
         <dl class="attr-defs">

Index: progress.html
===================================================================
RCS file: /sources/public/html5/markup/progress.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- progress.html	3 Feb 2010 14:44:06 -0000	1.34
+++ progress.html	4 Feb 2010 15:09:21 -0000	1.35
@@ -17,14 +17,21 @@
     <p>The <a href="progress.html#progress" class="element">progress</a>
     element represents the completion progress of a task.</p>
   </div>
-      <div class="no-number no-toc" id="progress-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#progress-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="progress-attr-mdl">
+      <div class="no-number no-toc" id="progress-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#progress-content-model">#</a></h2><div class="content-models">
+        
+      <div id="progress-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="progress-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#progress-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="progress.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="progress.html#progress.attrs.value" title="progress.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="progress.html#progress.attrs.max" title="progress.attrs.max">max</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="progress.html#progress.attrs.value" title="progress.attrs.value">value</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="progress.html#progress.attrs.max" title="progress.attrs.max">max</a> </span></p></div></div>
       <div class="no-number no-toc" id="progress-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#progress-attributes">#</a></h2>
         <dl class="attr-defs">

Index: dfn.html
===================================================================
RCS file: /sources/public/html5/markup/dfn.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- dfn.html	2 Feb 2010 17:04:53 -0000	1.31
+++ dfn.html	4 Feb 2010 15:09:18 -0000	1.32
@@ -17,9 +17,16 @@
     <p>The <a href="dfn.html#dfn" class="element">dfn</a> element
     represents the defining instance of a term.</p>
   </div>
-      <div class="no-number no-toc" id="dfn-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#dfn-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="dfn-attr-mdl">
+      <div class="no-number no-toc" id="dfn-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#dfn-content-model">#</a></h2><div class="content-models">
+        
+      <div id="dfn-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="dfn-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#dfn-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="dfn.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: schema.html
===================================================================
RCS file: /sources/public/html5/markup/schema.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- schema.html	3 Feb 2010 14:44:06 -0000	1.9
+++ schema.html	4 Feb 2010 15:09:21 -0000	1.10
@@ -212,34 +212,34 @@
 <div class='define' id='common.inner.phrasing-define'>
   <div class='patternname' id='the-common.inner.phrasing'><a href='#the-common.inner.phrasing'>common.inner.phrasing</a> =</div>
   <span class='pattern' id='common.inner.phrasing'><a class='ref' href='#normal-character-data'>normal-character-data</a>
-   <span class='postfix &amp;'>&amp;</span> <a class='ref' href='#common.elem.phrasing'>common.elem.phrasing</a><span class='postfix zeroormore' title='ZERO OR MORE'>*</span> </span>
+   <span class='postfix intermixed'>intermixed with</span> <a class='ref' href='#common.elem.phrasing'>common.elem.phrasing</a><span class='postfix zeroormore' title='ZERO OR MORE'>*</span> </span>
 </div>
 <div class='define' id='common.inner.flow-define'>
   <div class='patternname' id='the-common.inner.flow'><a href='#the-common.inner.flow'>common.inner.flow</a> =</div>
   <span class='pattern' id='common.inner.flow'><a class='ref' href='#normal-character-data'>normal-character-data</a>
-   <span class='postfix &amp;'>&amp;</span> <a class='ref' href='#common.elem.flow'>common.elem.flow</a><span class='postfix zeroormore' title='ZERO OR MORE'>*</span> </span>
+   <span class='postfix intermixed'>intermixed with</span> <a class='ref' href='#common.elem.flow'>common.elem.flow</a><span class='postfix zeroormore' title='ZERO OR MORE'>*</span> </span>
[...3258 lines suppressed...]
   </span>
 </div>
 <div class='define' id='meter.attrs-define'>
   <div class='patternname' id='the-meter.attrs'><a href='#the-meter.attrs'>meter.attrs</a> =</div>
   <span class='pattern' id='meter.attrs'><a class='ref' href='#common.attrs'>common.attrs</a>
-   <span class='postfix &amp;'>&amp;</span> <a class='ref' href='#meter.attrs.value' title='meter.attrs.value'>value</a>
-   <span class='postfix &amp;'>&amp;</span> <a class='ref' href='#meter.attrs.min' title='meter.attrs.min'>min</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> 
-   <span class='postfix &amp;'>&amp;</span> <a class='ref' href='#meter.attrs.low' title='meter.attrs.low'>low</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> 
-   <span class='postfix &amp;'>&amp;</span> <a class='ref' href='#meter.attrs.high' title='meter.attrs.high'>high</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> 
-   <span class='postfix &amp;'>&amp;</span> <a class='ref' href='#meter.attrs.max' title='meter.attrs.max'>max</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> 
-   <span class='postfix &amp;'>&amp;</span> <a class='ref' href='#meter.attrs.optimum' title='meter.attrs.optimum'>optimum</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> </span>
+   <span class='postfix intermixed'>intermixed with</span> <a class='ref' href='#meter.attrs.value' title='meter.attrs.value'>value</a>
+   <span class='postfix intermixed'>intermixed with</span> <a class='ref' href='#meter.attrs.min' title='meter.attrs.min'>min</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> 
+   <span class='postfix intermixed'>intermixed with</span> <a class='ref' href='#meter.attrs.low' title='meter.attrs.low'>low</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> 
+   <span class='postfix intermixed'>intermixed with</span> <a class='ref' href='#meter.attrs.high' title='meter.attrs.high'>high</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> 
+   <span class='postfix intermixed'>intermixed with</span> <a class='ref' href='#meter.attrs.max' title='meter.attrs.max'>max</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> 
+   <span class='postfix intermixed'>intermixed with</span> <a class='ref' href='#meter.attrs.optimum' title='meter.attrs.optimum'>optimum</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> </span>
 </div>
 <div class='define' id='meter.attrs.value-define'>
   <div class='patternname' id='the-meter.attrs.value'><a href='#the-meter.attrs.value'>value</a> =</div>

Index: textarea.html
===================================================================
RCS file: /sources/public/html5/markup/textarea.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- textarea.html	1 Feb 2010 05:25:04 -0000	1.34
+++ textarea.html	4 Feb 2010 15:09:22 -0000	1.35
@@ -18,27 +18,32 @@
     element represents a multi-line plain-text edit control for
     the element&#8217;s raw value.</p>
   </div>
-      <div class="no-number no-toc" id="textarea-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#textarea-contents">#</a></h2><div class="prose-model">
-    <p>
-      <a href="syntax.html#replaceable-character-data">replaceable character data</a>
+      <div class="no-number no-toc" id="textarea-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#textarea-content-model">#</a></h2><div class="content-models">
+        
+      <div id="textarea-mdls">
+        <p class="elem-mdl">
+      <span>one </span><a class="ref" href="syntax.html#replaceable-character-data">replaceable-character-data</a><span> element</span>
+        
     </p>
-  </div></div><div class="no-number no-toc" id="textarea-attr-mdl">
+        </div>
+      </div></div><div class="no-number no-toc" id="textarea-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#textarea-attr-mdl">#</a></h2>
         <div class="attr-content-models">
-          <p><span class="pattern" id="textarea.attrs">(<a class="ref" href="common-attributes.html">common attributes</a>
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )
-   <span class="postfix &amp;">&amp;</span> (<a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="textarea.html#textarea.attrs.rows" title="textarea.attrs.rows">rows</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> ((<a class="ref" href="textarea.html#textarea.attrs.wrap.hard" title="textarea.attrs.wrap.hard">wrap.hard</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-                                                                                          <span class="postfix &amp;">&amp;</span> <a class="ref" href="textarea.html#textarea.attrs.cols" title="textarea.attrs.cols">cols</a><span class="postfix required" title="REQUIRED">&#9733;</span>)
-                                                                                         <span class="postfix or">or</span> (<a class="ref" href="textarea.html#textarea.attrs.wrap.soft" title="textarea.attrs.wrap.soft">wrap.soft</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                                                                                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="textarea.html#textarea.attrs.cols" title="textarea.attrs.cols">cols</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )))</span></p></div></div>
+          <p><span class="pattern" id="textarea.attrs"> <a class="ref" href="common-attributes.html">common attributes</a>
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> 
+   <span class="postfix intermixed">&amp;</span>  <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="textarea.html#textarea.attrs.rows" title="textarea.attrs.rows">rows</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span>  <span class="agroupof"> <span class="agroupof"><a class="ref" href="textarea.html#textarea.attrs.wrap.hard" title="textarea.attrs.wrap.hard">wrap.hard</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+                                                                                                                                                                                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="textarea.html#textarea.attrs.cols" title="textarea.attrs.cols">cols</a><span class="postfix required" title="REQUIRED">&#9733;</span></span>
+                                                                                                                                                                   <span class="postfix or">or</span>  <span class="agroupof"><a class="ref" href="textarea.html#textarea.attrs.wrap.soft" title="textarea.attrs.wrap.soft">wrap.soft</a> 
+                                                                                                                                                                                                                              <span class="postfix intermixed">&amp;</span> <a class="ref" href="textarea.html#textarea.attrs.cols" title="textarea.attrs.cols">cols</a> </span></span></span></p></div></div>
       <div class="no-number no-toc" id="textarea-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#textarea-attributes">#</a></h2>
         <dl class="attr-defs">

Index: cite.html
===================================================================
RCS file: /sources/public/html5/markup/cite.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- cite.html	1 Feb 2010 05:25:00 -0000	1.29
+++ cite.html	4 Feb 2010 15:09:18 -0000	1.30
@@ -19,9 +19,16 @@
     of a book mentioned within the main text flow of a
     document.</p>
   </div>
-      <div class="no-number no-toc" id="cite-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#cite-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="cite-attr-mdl">
+      <div class="no-number no-toc" id="cite-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#cite-content-model">#</a></h2><div class="content-models">
+        
+      <div id="cite-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="cite-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#cite-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="cite.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: meter.html
===================================================================
RCS file: /sources/public/html5/markup/meter.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- meter.html	3 Feb 2010 14:44:05 -0000	1.36
+++ meter.html	4 Feb 2010 15:09:20 -0000	1.37
@@ -18,18 +18,25 @@
     represents a scalar gauge providing a measurement within a
     known range, or a fractional value.</p>
   </div>
-      <div class="no-number no-toc" id="meter-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#meter-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="meter-attr-mdl">
+      <div class="no-number no-toc" id="meter-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#meter-content-model">#</a></h2><div class="content-models">
+        
+      <div id="meter-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="meter-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#meter-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="meter.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="meter.html#meter.attrs.value" title="meter.attrs.value">value</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="meter.html#meter.attrs.min" title="meter.attrs.min">min</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="meter.html#meter.attrs.low" title="meter.attrs.low">low</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="meter.html#meter.attrs.high" title="meter.attrs.high">high</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="meter.html#meter.attrs.max" title="meter.attrs.max">max</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="meter.html#meter.attrs.optimum" title="meter.attrs.optimum">optimum</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="meter.html#meter.attrs.value" title="meter.attrs.value">value</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="meter.html#meter.attrs.min" title="meter.attrs.min">min</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="meter.html#meter.attrs.low" title="meter.attrs.low">low</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="meter.html#meter.attrs.high" title="meter.attrs.high">high</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="meter.html#meter.attrs.max" title="meter.attrs.max">max</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="meter.html#meter.attrs.optimum" title="meter.attrs.optimum">optimum</a> </span></p></div></div>
       <div class="no-number no-toc" id="meter-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#meter-attributes">#</a></h2>
         <dl class="attr-defs">

Index: input.button.html
===================================================================
RCS file: /sources/public/html5/markup/input.button.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- input.button.html	1 Feb 2010 05:25:01 -0000	1.31
+++ input.button.html	4 Feb 2010 15:09:19 -0000	1.32
@@ -19,16 +19,24 @@
     value is "<code>button</code>" represents a button with no
     additional semantics.</p>
   </div>
-      <div class="no-number no-toc" id="input.button-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.button-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.button-attr-mdl">
+      <div class="no-number no-toc" id="input.button-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#input.button-content-model">#</a></h2><div class="content-models">
+        
+      <div id="input.button-mdls">
+        <p class="elem-mdl">
+      <a class="ref" href="input.button.html#input.button.attrs">input.button.attrs</a>
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="input.button-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.button-attr-mdl">#</a></h2>
         <div class="attr-content-models">
-          <p><span class="pattern" id="input.button.attrs">(<a class="ref" href="common-attributes.html">common attributes</a>
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.button.html#input.button.attrs.type" title="input.button.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.button.html#input.button.attrs.value" title="input.button.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+          <p><span class="pattern" id="input.button.attrs"> <a class="ref" href="common-attributes.html">common attributes</a>
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.button.html#input.button.attrs.type" title="input.button.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.button.html#input.button.attrs.value" title="input.button.attrs.value">value</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> </span></p></div></div>
       <div class="no-number no-toc" id="input.button-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.button-attributes">#</a></h2>
         <dl class="attr-defs">

Index: aside.html
===================================================================
RCS file: /sources/public/html5/markup/aside.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- aside.html	3 Feb 2010 14:44:04 -0000	1.35
+++ aside.html	4 Feb 2010 15:09:17 -0000	1.36
@@ -18,9 +18,17 @@
     represents content that is tangentially related to the content
     that forms the main textual flow of a document.</p>
   </div>
-      <div class="no-number no-toc" id="aside-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#aside-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></div></div><div class="no-number no-toc" id="aside-attr-mdl">
+      <div class="no-number no-toc" id="aside-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#aside-content-model">#</a></h2><div class="content-models">
+        
+      <div id="aside-mdls">
+        <p class="elem-mdl">
+      <span>zero or more </span><a class="ref" href="style.html#style">style</a><span> elements</span>,   <span class="postfix followedby">followed by</span> 
+  <a href="terminology.html#flow-content">flow content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="aside-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#aside-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="aside.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: section.html
===================================================================
RCS file: /sources/public/html5/markup/section.html,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- section.html	3 Feb 2010 14:44:06 -0000	1.38
+++ section.html	4 Feb 2010 15:09:21 -0000	1.39
@@ -18,9 +18,17 @@
     represents a section of a document, typically with a title or
     heading.</p>
   </div>
-      <div class="no-number no-toc" id="section-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#section-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></div></div><div class="no-number no-toc" id="section-attr-mdl">
+      <div class="no-number no-toc" id="section-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#section-content-model">#</a></h2><div class="content-models">
+        
+      <div id="section-mdls">
+        <p class="elem-mdl">
+      <span>zero or more </span><a class="ref" href="style.html#style">style</a><span> elements</span>,   <span class="postfix followedby">followed by</span> 
+  <a href="terminology.html#flow-content">flow content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="section-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#section-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="section.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: link.html
===================================================================
RCS file: /sources/public/html5/markup/link.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- link.html	1 Feb 2010 11:33:27 -0000	1.34
+++ link.html	4 Feb 2010 15:09:20 -0000	1.35
@@ -19,16 +19,23 @@
     element represents metadata that expresses inter-document
     relationships.</p>
   </div>
-      <div class="no-number no-toc" id="link-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#link-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="link-attr-mdl">
+      <div class="no-number no-toc" id="link-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#link-content-model">#</a></h2><div class="content-models">
+        
+      <div id="link-mdls">
+        <p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span> 
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="link-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#link-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="link.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="link.html#link.attrs.href" title="link.attrs.href">href</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="link.html#link.attrs.rel" title="link.attrs.rel">rel</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="link.html#link.attrs.hreflang" title="link.attrs.hreflang">hreflang</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="link.html#link.attrs.media" title="link.attrs.media">media</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="link.html#link.attrs.type" title="link.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="link.html#link.attrs.sizes" title="link.attrs.sizes">sizes</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="link.html#link.attrs.href" title="link.attrs.href">href</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="link.html#link.attrs.rel" title="link.attrs.rel">rel</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="link.html#link.attrs.hreflang" title="link.attrs.hreflang">hreflang</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="link.html#link.attrs.media" title="link.attrs.media">media</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="link.html#link.attrs.type" title="link.attrs.type">type</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="link.html#link.attrs.sizes" title="link.attrs.sizes">sizes</a> </span></p></div></div>
       <div class="no-number no-toc" id="link-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#link-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -113,8 +120,7 @@
         <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#link-context">#</a></h2>
         <p class="permitted-parents">
         <span class="context-mdl"><span>Any element that can contain
-            <a href="common-models.html#common.elem.metadata">metadata elements</a></span></span>, 
-        <span class="context-mdl"><a href="noscript.html#noscript">noscript</a></span></p>
+            <a href="common-models.html#common.elem.metadata">metadata elements</a></span></span></p>
       </div>
       
       <div class="no-number no-toc" id="link-display">

Index: meta.http-equiv.refresh.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.refresh.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- meta.http-equiv.refresh.html	1 Feb 2010 05:25:02 -0000	1.30
+++ meta.http-equiv.refresh.html	4 Feb 2010 15:09:20 -0000	1.31
@@ -23,14 +23,21 @@
     place of the current page, and the URL for the replacement
     page.</p>
   </div>
-      <div class="no-number no-toc" id="meta.http-equiv.refresh-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#meta.http-equiv.refresh-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="meta.http-equiv.refresh-attr-mdl">
+      <div class="no-number no-toc" id="meta.http-equiv.refresh-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#meta.http-equiv.refresh-content-model">#</a></h2><div class="content-models">
+        
+      <div id="meta.http-equiv.refresh-mdls">
+        <p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span> 
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="meta.http-equiv.refresh-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#meta.http-equiv.refresh-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="meta.http-equiv.refresh.attrs"><a class="ref" href="common-attributes.html#common.attrs.core" title="common.attrs.core">common.attrs.core</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.attrs.http-equiv.refresh" title="meta.http-equiv.attrs.http-equiv.refresh">http-equiv.refresh</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.attrs.content.refresh" title="meta.http-equiv.attrs.content.refresh">content.refresh</a><span class="postfix required" title="REQUIRED">&#9733;</span></span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.attrs.http-equiv.refresh" title="meta.http-equiv.attrs.http-equiv.refresh">http-equiv.refresh</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.attrs.content.refresh" title="meta.http-equiv.attrs.content.refresh">content.refresh</a><span class="postfix required" title="REQUIRED">&#9733;</span></span></p></div></div>
       <div class="no-number no-toc" id="meta.http-equiv.refresh-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#meta.http-equiv.refresh-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -69,8 +76,7 @@
         <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#meta.http-equiv.refresh-context">#</a></h2>
         <p class="permitted-parents">
         <span class="context-mdl"><span>Any element that can contain
-            <a href="common-models.html#common.elem.metadata">metadata elements</a></span></span>, 
-        <span class="context-mdl"><a href="noscript.html#noscript">noscript</a></span></p>
+            <a href="common-models.html#common.elem.metadata">metadata elements</a></span></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: area.html
===================================================================
RCS file: /sources/public/html5/markup/area.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- area.html	1 Feb 2010 05:24:59 -0000	1.36
+++ area.html	4 Feb 2010 15:09:17 -0000	1.37
@@ -20,24 +20,31 @@
       corresponding area on an image map, or a dead area on an
       image map.</p>
   </div>
-      <div class="no-number no-toc" id="area-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#area-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="area-attr-mdl">
+      <div class="no-number no-toc" id="area-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#area-content-model">#</a></h2><div class="content-models">
+        
+      <div id="area-mdls">
+        <p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span> 
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="area-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#area-attr-mdl">#</a></h2>
         <div class="attr-content-models"><p><span class="pattern" id="area.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> (<a class="ref" href="area.html#area.attrs.alt" title="area.attrs.alt">alt</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="area.html#area.attrs.href" title="area.attrs.href">href</a>)<span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="area.html#area.attrs.target" title="area.attrs.target">target</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="area.html#area.attrs.ping" title="area.attrs.ping">ping</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="area.html#area.attrs.rel" title="area.attrs.rel">rel</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="area.html#area.attrs.media" title="area.attrs.media">media</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="area.html#area.attrs.hreflang" title="area.attrs.hreflang">hreflang</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="area.html#area.attrs.type" title="area.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <br></br>(<a class="ref" href="area.html#area.attrs.shape.rect" title="area.attrs.shape.rect">shape.rect</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="area.html#area.attrs.coords.rect" title="area.attrs.coords.rect">coords.rect</a><span class="postfix required" title="REQUIRED">&#9733;</span>)
-   <span class="postfix or">or</span> (<a class="ref" href="area.html#area.attrs.shape.circle" title="area.attrs.shape.circle">shape.circle</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-                                        <span class="postfix &amp;">&amp;</span> <a class="ref" href="area.html#area.attrs.coords.circle" title="area.attrs.coords.circle">coords.circle</a><span class="postfix required" title="REQUIRED">&#9733;</span>)
-   <span class="postfix or">or</span> (<a class="ref" href="area.html#area.attrs.shape.poly" title="area.attrs.shape.poly">shape.poly</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-                                        <span class="postfix &amp;">&amp;</span> <a class="ref" href="area.html#area.attrs.coords.poly" title="area.attrs.coords.poly">coords.poly</a><span class="postfix required" title="REQUIRED">&#9733;</span>)
-   <span class="postfix or">or</span> <a class="ref" href="area.html#area.attrs.shape.default" title="area.attrs.shape.default">shape.default</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span>  <span class="agroupof"><a class="ref" href="area.html#area.attrs.alt" title="area.attrs.alt">alt</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="area.html#area.attrs.href" title="area.attrs.href">href</a><span class="postfix required" title="REQUIRED">&#9733;</span></span> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="area.html#area.attrs.target" title="area.attrs.target">target</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="area.html#area.attrs.ping" title="area.attrs.ping">ping</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="area.html#area.attrs.rel" title="area.attrs.rel">rel</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="area.html#area.attrs.media" title="area.attrs.media">media</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="area.html#area.attrs.hreflang" title="area.attrs.hreflang">hreflang</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="area.html#area.attrs.type" title="area.attrs.type">type</a> 
+   <span class="postfix intermixed">&amp;</span> <br></br> <span class="agroupof"><a class="ref" href="area.html#area.attrs.shape.rect" title="area.attrs.shape.rect">shape.rect</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="area.html#area.attrs.coords.rect" title="area.attrs.coords.rect">coords.rect</a><span class="postfix required" title="REQUIRED">&#9733;</span></span>
+   <span class="postfix or">or</span>  <span class="agroupof"><a class="ref" href="area.html#area.attrs.shape.circle" title="area.attrs.shape.circle">shape.circle</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+                                                              <span class="postfix intermixed">&amp;</span> <a class="ref" href="area.html#area.attrs.coords.circle" title="area.attrs.coords.circle">coords.circle</a><span class="postfix required" title="REQUIRED">&#9733;</span></span>
+   <span class="postfix or">or</span>  <span class="agroupof"><a class="ref" href="area.html#area.attrs.shape.poly" title="area.attrs.shape.poly">shape.poly</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+                                                              <span class="postfix intermixed">&amp;</span> <a class="ref" href="area.html#area.attrs.coords.poly" title="area.attrs.coords.poly">coords.poly</a><span class="postfix required" title="REQUIRED">&#9733;</span></span>
+   <span class="postfix or">or</span> <a class="ref" href="area.html#area.attrs.shape.default" title="area.attrs.shape.default">shape.default</a> </span></p></div></div>
       <div class="no-number no-toc" id="area-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#area-attributes">#</a></h2>
         <dl class="attr-defs">

Index: input.text.html
===================================================================
RCS file: /sources/public/html5/markup/input.text.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- input.text.html	1 Feb 2010 05:25:02 -0000	1.32
+++ input.text.html	4 Feb 2010 15:09:20 -0000	1.33
@@ -19,24 +19,32 @@
     value is "<code>text</code>" represents
     a one-line plain text edit control for the <a href="input.html#input" class="element">input</a> element&#8217;s <a href="input.text.html#input.text.attrs.value">value</a>.</p>
   </div>
-      <div class="no-number no-toc" id="input.text-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.text-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.text-attr-mdl">
+      <div class="no-number no-toc" id="input.text-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#input.text-content-model">#</a></h2><div class="content-models">
+        
+      <div id="input.text-mdls">
+        <p class="elem-mdl">
+      <a class="ref" href="input.text.html#input.text.attrs">input.text.attrs</a>
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="input.text-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.text-attr-mdl">#</a></h2>
         <div class="attr-content-models">
-          <p><span class="pattern" id="input.text.attrs">(<a class="ref" href="common-attributes.html">common attributes</a>
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.text.html#input.text.attrs.type" title="input.text.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.text.html#input.text.attrs.value" title="input.text.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )
-   <span class="postfix &amp;">&amp;</span> (<a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )</span></p></div></div>
+          <p><span class="pattern" id="input.text.attrs"> <a class="ref" href="common-attributes.html">common attributes</a>
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.text.html#input.text.attrs.type" title="input.text.attrs.type">type</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.text.html#input.text.attrs.value" title="input.text.attrs.value">value</a> 
+   <span class="postfix intermixed">&amp;</span>  <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a> </span></p></div></div>
       <div class="no-number no-toc" id="input.text-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.text-attributes">#</a></h2>
         <dl class="attr-defs">

Index: samp.html
===================================================================
RCS file: /sources/public/html5/markup/samp.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- samp.html	1 Feb 2010 05:25:03 -0000	1.30
+++ samp.html	4 Feb 2010 15:09:21 -0000	1.31
@@ -18,9 +18,16 @@
     represents (sample) output from a program or computing
     system.</p>
   </div>
-      <div class="no-number no-toc" id="samp-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#samp-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="samp-attr-mdl">
+      <div class="no-number no-toc" id="samp-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#samp-content-model">#</a></h2><div class="content-models">
+        
+      <div id="samp-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="samp-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#samp-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="samp.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: h6.html
===================================================================
RCS file: /sources/public/html5/markup/h6.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- h6.html	1 Feb 2010 05:25:01 -0000	1.35
+++ h6.html	4 Feb 2010 15:09:19 -0000	1.36
@@ -17,9 +17,16 @@
     <p>The <a href="h1.html#h1" class="element">h1</a> through <a href="h6.html#h6" class="element">h6</a> elements are headings for
     the sections with which they are associated.</p>
   </div>
-      <div class="no-number no-toc" id="h6-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#h6-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="h6-attr-mdl">
+      <div class="no-number no-toc" id="h6-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#h6-content-model">#</a></h2><div class="content-models">
+        
+      <div id="h6-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="h6-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#h6-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="h6.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>
@@ -50,8 +57,7 @@
         <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#h6-context">#</a></h2>
         <p class="permitted-parents">
         <span class="context-mdl"><span>Any element that can contain
-            <a href="common-models.html#common.elem.flow">flow elements</a></span></span>, 
-        <span class="context-mdl"><a href="hgroup.html#hgroup">hgroup</a></span></p>
+            <a href="common-models.html#common.elem.flow">flow elements</a></span></span></p>
       </div>
       
       <div class="no-number no-toc" id="h6-display">

Index: input.checkbox.html
===================================================================
RCS file: /sources/public/html5/markup/input.checkbox.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- input.checkbox.html	1 Feb 2010 05:25:01 -0000	1.31
+++ input.checkbox.html	4 Feb 2010 15:09:19 -0000	1.32
@@ -19,18 +19,26 @@
     value is "<code>checkbox</code>" represents
     a state or option that can be toggled.</p>
   </div>
-      <div class="no-number no-toc" id="input.checkbox-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.checkbox-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.checkbox-attr-mdl">
+      <div class="no-number no-toc" id="input.checkbox-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#input.checkbox-content-model">#</a></h2><div class="content-models">
+        
+      <div id="input.checkbox-mdls">
+        <p class="elem-mdl">
+      <a class="ref" href="input.checkbox.html#input.checkbox.attrs">input.checkbox.attrs</a>
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="input.checkbox-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.checkbox-attr-mdl">#</a></h2>
         <div class="attr-content-models">
-          <p><span class="pattern" id="input.checkbox.attrs">(<a class="ref" href="common-attributes.html">common attributes</a>
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.checkbox.html#input.checkbox.attrs.type" title="input.checkbox.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.checked" title="input.attrs.checked">checked</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.checkbox.html#input.checkbox.attrs.value" title="input.checkbox.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )
-   <span class="postfix &amp;">&amp;</span> (<a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )</span></p></div></div>
+          <p><span class="pattern" id="input.checkbox.attrs"> <a class="ref" href="common-attributes.html">common attributes</a>
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.checkbox.html#input.checkbox.attrs.type" title="input.checkbox.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.checked" title="input.attrs.checked">checked</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.checkbox.html#input.checkbox.attrs.value" title="input.checkbox.attrs.value">value</a> 
+   <span class="postfix intermixed">&amp;</span>  <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> </span></p></div></div>
       <div class="no-number no-toc" id="input.checkbox-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.checkbox-attributes">#</a></h2>
         <dl class="attr-defs">

Index: a.html
===================================================================
RCS file: /sources/public/html5/markup/a.html,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- a.html	3 Feb 2010 10:27:01 -0000	1.44
+++ a.html	4 Feb 2010 15:09:17 -0000	1.45
@@ -18,18 +18,27 @@
     <a class="element" href="a.html#a">a</a>
     element represents a hyperlink.</p>
   </div>
-      <div class="no-number no-toc" id="a-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#a-contents">#</a></h2><div class="prose-model"><div id="prose-model"><p><a href="terminology.html#transparent">transparent</a></p></div></div></div><div class="no-number no-toc" id="a-attr-mdl">
+      <div class="no-number no-toc" id="a-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#a-content-model">#</a></h2><div class="content-models">
+        
+      <div id="a-mdls">
+        
+        <p class="elem-mdl"><span class="transparent"><a href="terminology.html#transparent">transparent</a> (<span class="postfix or">either</span> <a href="terminology.html#phrasing-content">phrasing content</a> <span class="postfix or">or</span> <a href="terminology.html#phrasing-content">flow content</a>)</span></p>
+        
+        
+        </div>
+      </div></div><div class="no-number no-toc" id="a-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#a-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="a.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="a.html#a.attrs.name" title="a.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="a.html#a.attrs.href" title="a.attrs.href">href</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="a.html#a.attrs.target" title="a.attrs.target">target</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="a.html#a.attrs.rel" title="a.attrs.rel">rel</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="a.html#a.attrs.hreflang" title="a.attrs.hreflang">hreflang</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="a.html#a.attrs.media" title="a.attrs.media">media</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="a.html#a.attrs.type" title="a.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="a.html#a.attrs.ping" title="a.attrs.ping">ping</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="a.html#a.attrs.name" title="a.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="a.html#a.attrs.href" title="a.attrs.href">href</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="a.html#a.attrs.target" title="a.attrs.target">target</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="a.html#a.attrs.rel" title="a.attrs.rel">rel</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="a.html#a.attrs.hreflang" title="a.attrs.hreflang">hreflang</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="a.html#a.attrs.media" title="a.attrs.media">media</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="a.html#a.attrs.type" title="a.attrs.type">type</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="a.html#a.attrs.ping" title="a.attrs.ping">ping</a> </span></p></div></div>
       <div class="no-number no-toc" id="a-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#a-attributes">#</a></h2>
         <dl class="attr-defs">

Index: object.html
===================================================================
RCS file: /sources/public/html5/markup/object.html,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- object.html	1 Feb 2010 11:33:27 -0000	1.39
+++ object.html	4 Feb 2010 15:09:20 -0000	1.40
@@ -17,24 +17,35 @@
     <p>The <a href="object.html#object" class="element">object</a> element
     represents external content.</p>
   </div>
-      <div class="no-number no-toc" id="object-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#object-contents">#</a></h2><div class="prose-model">
-    <p>Zero or more
-    <a href="param.html#param" class="element">param</a>
-    elements, then,
-    <a href="terminology.html#transparent">transparent</a>
+      <div class="no-number no-toc" id="object-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#object-content-model">#</a></h2><div class="content-models">
+        
+      <div id="object-mdls">
+        
+        <p class="elem-mdl">
+      <span>zero or more </span><a class="ref" href="param.html#param">param</a><span> elements</span>,   <span class="postfix followedby">followed by</span> 
+  <a href="terminology.html#flow-content">flow content</a>
+        
+    </p><div class="postfix or">or</div>
+        
+        <p class="elem-mdl">
+      <span>zero or more </span><a class="ref" href="param.html#param">param</a><span> elements</span>,   <span class="postfix followedby">followed by</span> 
+  <a href="terminology.html#phrasing-content">phrasing content</a>
+        
     </p>
-  </div></div><div class="no-number no-toc" id="object-attr-mdl">
+        </div>
+      </div></div><div class="no-number no-toc" id="object-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#object-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="object.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> ((<a class="ref" href="object.html#object.attrs.data" title="object.attrs.data">data</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-                                               <span class="postfix &amp;">&amp;</span> <a class="ref" href="object.html#object.attrs.type" title="object.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )
-                                              <span class="postfix or">or</span> <a class="ref" href="object.html#object.attrs.type" title="object.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>)
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="object.html#object.attrs.height" title="object.attrs.height">height</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="object.html#object.attrs.width" title="object.attrs.width">width</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="object.html#object.attrs.usemap" title="object.attrs.usemap">usemap</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="object.html#object.attrs.name" title="object.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span>  <span class="agroupof"> <span class="agroupof"><a class="ref" href="object.html#object.attrs.data" title="object.attrs.data">data</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+                                                                                                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="object.html#object.attrs.type" title="object.attrs.type">type</a> </span>
+                                                                                   <span class="postfix or">or</span> <a class="ref" href="object.html#object.attrs.type" title="object.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span></span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="object.html#object.attrs.height" title="object.attrs.height">height</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="object.html#object.attrs.width" title="object.attrs.width">width</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="object.html#object.attrs.usemap" title="object.attrs.usemap">usemap</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="object.html#object.attrs.name" title="object.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> </span></p></div></div>
       <div class="no-number no-toc" id="object-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#object-attributes">#</a></h2>
         <dl class="attr-defs">

Index: terminology.html
===================================================================
RCS file: /sources/public/html5/markup/terminology.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- terminology.html	30 Jan 2010 05:50:00 -0000	1.23
+++ terminology.html	4 Feb 2010 15:09:21 -0000	1.24
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>HTML5: Terminology and symbols</title>
+<title>HTML5: Terminology</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="W3C-ED.css" type="text/css"></link>
 </head>
@@ -12,7 +12,7 @@
 <span class="nav-next"><a href="documents.html">documents &#187;</a></span>
 </div>
 <div id="terminology" class="section">
-  <h2>2. Terminology and symbols <a class="hash" href="#terminology">#</a> <a class="toc-bak" href="Overview.html#terminology-toc">T</a></h2>
+  <h2>2. Terminology <a class="hash" href="#terminology">#</a> <a class="toc-bak" href="Overview.html#terminology-toc">T</a></h2>
     <p>The following is a list of terms that are used in other
     sections of this specification.</p>
   <dl>
@@ -34,6 +34,11 @@
     <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="flow-content" title="flow-content">flow content</dfn></dt>
+    <dd><a href="terminology.html#flow-content">Flow content</a> consists of
+      <a href="common-models.html#common.elem.flow">flow elements</a>
+      intermixed with
+      <a href="syntax.html#normal-character-data">normal character data</a>.</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)
@@ -51,6 +56,11 @@
         LINE FEED (LF) character</li>
       </ul>
     </dd>
+    <dt><dfn id="phrasing-content" title="phrasing-content">phrasing content</dfn></dt>
+    <dd><a href="terminology.html#phrasing-content">Phrasing content</a> consists of
+      <a href="common-models.html#common.elem.phrasing">phrasing elements</a>
+      intermixed with
+      <a href="syntax.html#normal-character-data">normal character data</a>.</dd>
     <dt><dfn id="space" title="space">space</dfn></dt>
     <dd>A <a href="terminology.html#space">space character</a> is any of the
       following:

Index: input.tel.html
===================================================================
RCS file: /sources/public/html5/markup/input.tel.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- input.tel.html	3 Feb 2010 14:44:05 -0000	1.32
+++ input.tel.html	4 Feb 2010 15:09:20 -0000	1.33
@@ -19,24 +19,32 @@
     value is "<code>tel</code>" represents a one-line plain-text
     edit control for entering a telephone number.</p>
   </div>
-      <div class="no-number no-toc" id="input.tel-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.tel-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.tel-attr-mdl">
+      <div class="no-number no-toc" id="input.tel-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#input.tel-content-model">#</a></h2><div class="content-models">
+        
+      <div id="input.tel-mdls">
+        <p class="elem-mdl">
+      <a class="ref" href="input.tel.html#input.tel.attrs">input.tel.attrs</a>
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="input.tel-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.tel-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="input.tel.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.tel.html#input.tel.attrs.type" title="input.tel.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.tel.html#input.tel.attrs.value" title="input.tel.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.tel.html#input.tel.attrs.type" title="input.tel.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.tel.html#input.tel.attrs.value" title="input.tel.attrs.value">value</a> </span></p></div></div>
       <div class="no-number no-toc" id="input.tel-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.tel-attributes">#</a></h2>
         <dl class="attr-defs">

Index: h4.html
===================================================================
RCS file: /sources/public/html5/markup/h4.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- h4.html	1 Feb 2010 05:25:01 -0000	1.35
+++ h4.html	4 Feb 2010 15:09:19 -0000	1.36
@@ -17,9 +17,16 @@
     <p>The <a href="h1.html#h1" class="element">h1</a> through <a href="h6.html#h6" class="element">h6</a> elements are headings for
     the sections with which they are associated.</p>
   </div>
-      <div class="no-number no-toc" id="h4-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#h4-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="h4-attr-mdl">
+      <div class="no-number no-toc" id="h4-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#h4-content-model">#</a></h2><div class="content-models">
+        
+      <div id="h4-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="h4-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#h4-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="h4.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>
@@ -50,8 +57,7 @@
         <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#h4-context">#</a></h2>
         <p class="permitted-parents">
         <span class="context-mdl"><span>Any element that can contain
-            <a href="common-models.html#common.elem.flow">flow elements</a></span></span>, 
-        <span class="context-mdl"><a href="hgroup.html#hgroup">hgroup</a></span></p>
+            <a href="common-models.html#common.elem.flow">flow elements</a></span></span></p>
       </div>
       
       <div class="no-number no-toc" id="h4-display">

Index: header.html
===================================================================
RCS file: /sources/public/html5/markup/header.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- header.html	3 Feb 2010 14:44:05 -0000	1.35
+++ header.html	4 Feb 2010 15:09:19 -0000	1.36
@@ -17,9 +17,16 @@
     <p>The <a href="header.html#header" class="element">header</a> element
     represents the header of a section.</p>
   </div>
-      <div class="no-number no-toc" id="header-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#header-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></div></div><div class="no-number no-toc" id="header-attr-mdl">
+      <div class="no-number no-toc" id="header-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#header-content-model">#</a></h2><div class="content-models">
+        
+      <div id="header-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#flow-content">flow content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="header-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#header-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="header.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: b.html
===================================================================
RCS file: /sources/public/html5/markup/b.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- b.html	3 Feb 2010 14:44:04 -0000	1.32
+++ b.html	4 Feb 2010 15:09:17 -0000	1.33
@@ -20,9 +20,16 @@
     document abstract, product names in a review, or other spans
     of text whose typical typographic presentation is bold text.</p>
   </div>
-      <div class="no-number no-toc" id="b-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#b-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="b-attr-mdl">
+      <div class="no-number no-toc" id="b-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#b-content-model">#</a></h2><div class="content-models">
+        
+      <div id="b-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="b-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#b-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="b.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: img.html
===================================================================
RCS file: /sources/public/html5/markup/img.html,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- img.html	3 Feb 2010 14:44:05 -0000	1.38
+++ img.html	4 Feb 2010 15:09:19 -0000	1.39
@@ -17,17 +17,24 @@
     <p>The <a href="img.html#img" class="element">img</a> element
     represents an image.</p>
   </div>
-      <div class="no-number no-toc" id="img-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#img-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="img-attr-mdl">
+      <div class="no-number no-toc" id="img-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#img-content-model">#</a></h2><div class="content-models">
+        
+      <div id="img-mdls">
+        <p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span> 
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="img-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#img-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="img.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="img.html#img.attrs.src" title="img.attrs.src">src</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="img.html#img.attrs.alt" title="img.attrs.alt">alt</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="img.html#img.attrs.height" title="img.attrs.height">height</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="img.html#img.attrs.width" title="img.attrs.width">width</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="img.html#img.attrs.usemap" title="img.attrs.usemap">usemap</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="img.html#img.attrs.ismap" title="img.attrs.ismap">ismap</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="img.html#img.attrs.border" title="img.attrs.border">border</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="img.html#img.attrs.src" title="img.attrs.src">src</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="img.html#img.attrs.alt" title="img.attrs.alt">alt</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="img.html#img.attrs.height" title="img.attrs.height">height</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="img.html#img.attrs.width" title="img.attrs.width">width</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="img.html#img.attrs.usemap" title="img.attrs.usemap">usemap</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="img.html#img.attrs.ismap" title="img.attrs.ismap">ismap</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="img.html#img.attrs.border" title="img.attrs.border">border</a> </span></p></div></div>
       <div class="no-number no-toc" id="img-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#img-attributes">#</a></h2>
         <dl class="attr-defs">

Index: bdo.html
===================================================================
RCS file: /sources/public/html5/markup/bdo.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- bdo.html	1 Feb 2010 05:25:00 -0000	1.32
+++ bdo.html	4 Feb 2010 15:09:18 -0000	1.33
@@ -18,9 +18,16 @@
     a means to specify a direction override of the Unicode BiDi
     algorithm.</p>
   </div>
-      <div class="no-number no-toc" id="bdo-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#bdo-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="bdo-attr-mdl">
+      <div class="no-number no-toc" id="bdo-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#bdo-content-model">#</a></h2><div class="content-models">
+        
+      <div id="bdo-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="bdo-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#bdo-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="bdo.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: input.number.html
===================================================================
RCS file: /sources/public/html5/markup/input.number.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- input.number.html	3 Feb 2010 14:44:05 -0000	1.33
+++ input.number.html	4 Feb 2010 15:09:19 -0000	1.34
@@ -20,23 +20,31 @@
     a precise control for setting the element&#8217;s value to a
     string representing a number.</p>
   </div>
-      <div class="no-number no-toc" id="input.number-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.number-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.number-attr-mdl">
+      <div class="no-number no-toc" id="input.number-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#input.number-content-model">#</a></h2><div class="content-models">
+        
+      <div id="input.number-mdls">
+        <p class="elem-mdl">
+      <a class="ref" href="input.number.html#input.number.attrs">input.number.attrs</a>
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="input.number-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.number-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="input.number.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.number.html#input.number.attrs.type" title="input.number.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.number.html#input.number.attrs.min" title="input.number.attrs.min">min</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.number.html#input.number.attrs.max" title="input.number.attrs.max">max</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.number.html#input.number.attrs.value" title="input.number.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.number.html#input.number.attrs.type" title="input.number.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.number.html#input.number.attrs.min" title="input.number.attrs.min">min</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.number.html#input.number.attrs.max" title="input.number.attrs.max">max</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.number.html#input.number.attrs.value" title="input.number.attrs.value">value</a> </span></p></div></div>
       <div class="no-number no-toc" id="input.number-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.number-attributes">#</a></h2>
         <dl class="attr-defs">

Index: col.html
===================================================================
RCS file: /sources/public/html5/markup/col.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- col.html	1 Feb 2010 05:25:00 -0000	1.30
+++ col.html	4 Feb 2010 15:09:18 -0000	1.31
@@ -19,11 +19,18 @@
     by its <a href="colgroup.html#colgroup" class="element">colgroup</a>
     parent.</p>
   </div>
-      <div class="no-number no-toc" id="col-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#col-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="col-attr-mdl">
+      <div class="no-number no-toc" id="col-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#col-content-model">#</a></h2><div class="content-models">
+        
+      <div id="col-mdls">
+        <p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span> 
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="col-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#col-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="col.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="col.html#col.attrs.span" title="col.attrs.span">span</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="col.html#col.attrs.span" title="col.attrs.span">span</a> </span></p></div></div>
       <div class="no-number no-toc" id="col-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#col-attributes">#</a></h2>
         <dl class="attr-defs">

Index: datatypes.html
===================================================================
RCS file: /sources/public/html5/markup/datatypes.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- datatypes.html	28 Jan 2010 17:11:48 -0000	1.30
+++ datatypes.html	4 Feb 2010 15:09:18 -0000	1.31
@@ -54,7 +54,7 @@
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.tokens">tokens</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.tokens" class="hash">#</a></div>
       <div class="datatype-desc">A
-        <a href="terminology.html#space">space</a>-separated list of zero or more
+        <span>one </span><a href="terminology.html#space">space</a><span> element</span>, -separated list of zero or more
         <a href="datatypes.html#data-token">token</a>
         instances.</div>
     </div>
@@ -64,7 +64,7 @@
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.browsing-context-name">browsing-context-name</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.browsing-context-name" class="hash">#</a></div>
       <div class="datatype-desc">Any
-        <a href="datatypes.html#data-string">string</a>,
+        <span>one </span><a href="datatypes.html#data-string">string</a><span> element</span>, ,
         with the following restrictions:
         <ul>
           <li>must not start with a
@@ -80,13 +80,13 @@
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.browsing-context-name-or-keyword">browsing-context-name-or-keyword</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.browsing-context-name-or-keyword" class="hash">#</a></div>
       <div class="datatype-desc">Any
-        <a href="datatypes.html#data-string">string</a>
+        <span>one </span><a href="datatypes.html#data-string">string</a><span> element</span>, 
         that is either of the following:
         <ul>
           <li>a
           <a href="datatypes.html#common.data.browsing-context-name">browsing-context-name</a></li>
           <li>any
-          <a href="terminology.html#case-insensitive">case-insensitive match</a>
+          <span>one </span><a href="terminology.html#case-insensitive">case-insensitive match</a><span> element</span>, 
           for one of the following literal strings:
             <ul>
               <li><code>_blank</code></li>
@@ -104,7 +104,7 @@
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.id">id</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.id" class="hash">#</a></div>
       <div class="datatype-desc">Any
-        <a href="datatypes.html#data-string">string</a>,
+        <span>one </span><a href="datatypes.html#data-string">string</a><span> element</span>, ,
         with the following restrictions:
         <ul>
           <li>must be at least one character long</li>
@@ -119,7 +119,7 @@
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.idref">idref</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.idref" class="hash">#</a></div>
       <div class="datatype-desc">Any
-        <a href="datatypes.html#data-string">string</a>,
+        <span>one </span><a href="datatypes.html#data-string">string</a><span> element</span>, ,
         with the following restrictions:
         <ul>
           <li>must be at least one character long</li>
@@ -134,7 +134,7 @@
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.idrefs">idrefs</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.idrefs" class="hash">#</a></div>
       <div class="datatype-desc">A
-        <a href="terminology.html#space">space</a>-separated list of one or more
+        <span>one </span><a href="terminology.html#space">space</a><span> element</span>, -separated list of one or more
         <a href="datatypes.html#common.data.idref">idref</a> instances.</div>
     </div>
       </div>
@@ -143,7 +143,7 @@
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.name">name</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.name" class="hash">#</a></div>
       <div class="datatype-desc">Any
-        <a href="datatypes.html#data-string">string</a>,
+        <span>one </span><a href="datatypes.html#data-string">string</a><span> element</span>, ,
         with the following restrictions:
         <ul>
           <li>must be at least one character long</li>
@@ -331,7 +331,7 @@
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.uris">uris</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.uris" class="hash">#</a></div>
       <div class="datatype-desc">A
-        <a href="terminology.html#space">space</a>-separated list of zero or more
+        <span>one </span><a href="terminology.html#space">space</a><span> element</span>, -separated list of zero or more
         <a href="datatypes.html#data.iri-ref">IRI-reference</a> instances.</div>
     </div>
       </div>
@@ -358,7 +358,7 @@
           <div><span class="common-pattern-name"><dfn id="common.data.sizes">sizes</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.sizes" class="hash">#</a></div>
       <div class="datatype-desc">An unordered set of unique
         space-separated
-        <a href="datatypes.html#data-token">tokens</a>,
+        <span>one </span><a href="datatypes.html#data-token">tokens</a><span> element</span>, ,
         each of which must be one of the following:
         <ul>
           <li>the literal string "<code>any</code>"</li>
@@ -387,15 +387,15 @@
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.charset">charset</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.charset" class="hash">#</a></div>
       <div class="datatype-desc">
-        <p>For documents in the <a href="documents.html#html-syntax">HTML
-          syntax</a>: Any
+        <p>For documents in the <span>one </span><a href="documents.html#html-syntax">HTML
+          syntax</a><span> element</span>, : Any
         <dfn id="character-set-name" title="character-set-name">character set name</dfn>
         listed in the IANA <cite>Character Sets</cite>
         list
         <a href="references.html#refsIANACHARSET">[IANACHARSET]</a>.</p>
-        <p>For documents in the <a href="documents.html#xml-syntax">XML
-          syntax</a>, any
-        <a href="terminology.html#case-insensitive">case-insensitive match</a>
+        <p>For documents in the <span>one </span><a href="documents.html#xml-syntax">XML
+          syntax</a><span> element</span>, , any
+        <span>one </span><a href="terminology.html#case-insensitive">case-insensitive match</a><span> element</span>, 
         for the string
         "<code>UTF-8</code>".</p>
       </div>
@@ -438,7 +438,7 @@
               <li>One or more
               <a href="terminology.html#space">space characters</a>.</li>
               <li>A
-              <a href="terminology.html#case-insensitive">case-insensitive match</a>
+              <span>one </span><a href="terminology.html#case-insensitive">case-insensitive match</a><span> element</span>, 
               for the string
               "<code>url=</code>".</li>
               <li>A
@@ -501,7 +501,7 @@
           <div><span class="common-pattern-name"><dfn id="common.data.sandbox-allow-list">sandbox-allow-list</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.sandbox-allow-list" class="hash">#</a></div>
       <div class="datatype-desc">An unordered set of unique
         space-separated
-        <a href="datatypes.html#data-token">tokens</a>, each of which is one of
+        <span>one </span><a href="datatypes.html#data-token">tokens</a><span> element</span>, , each of which is one of
         the following literal strings:
         <ul>
           <li>"<code>allow-same-origin</code>"</li>
@@ -515,7 +515,7 @@
         <h2 class="common-subhead">9.33. Mimetypelist <a class="hash" href="#form.data.mimetypelist-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.mimetypelist">mimetypelist</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.mimetypelist" class="hash">#</a></div>
-      <div class="datatype-desc">A set of comma-separated <a href="datatypes.html#data-token">tokens</a>,
+      <div class="datatype-desc">A set of comma-separated <span>one </span><a href="datatypes.html#data-token">tokens</a><span> element</span>, ,
       each of which is a valid <a href="datatypes.html#common.data.mimetype">mimetype</a>, with no
       parameters.</div>
     </div>
@@ -524,7 +524,7 @@
         <h2 class="common-subhead">9.34. Charsetlist <a class="hash" href="#form.data.charsetlist-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.charsetlist">charsetlist</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.charsetlist" class="hash">#</a></div>
-      <div class="datatype-desc">A set of comma-separated <a href="datatypes.html#data-token">tokens</a>,
+      <div class="datatype-desc">A set of comma-separated <span>one </span><a href="datatypes.html#data-token">tokens</a><span> element</span>, ,
       each of which is a valid <a href="datatypes.html#common.data.charset">charset</a> that specifies an
       <a href="syntax.html#ascii-compatible">ASCII-compatible character
       encoding</a>.</div>
@@ -565,7 +565,7 @@
       <div class="datatype-desc">A valid
         <dfn id="full-date" title="full-date">full-date</dfn>,
         as defined in RFC 3339
-        <a href="references.html#refsRFC3339">[RFC3339]</a>,
+        <span>one </span><a href="references.html#refsRFC3339">[RFC3339]</a><span> element</span>, ,
         with the additional qualification that the year component
         is a
         <a href="datatypes.html#data-date-fullyear">date-fullyear</a>
@@ -647,14 +647,14 @@
           <li>A
           <dfn id="data-dot-atom" title="data-dot-atom">dot-atom</dfn>,
           as defined in RFC 5322
-          <a href="references.html#refsRFC5322">[RFC5322]</a>,
+          <span>one </span><a href="references.html#refsRFC5322">[RFC5322]</a><span> element</span>, ,
           with the additional constraint that the
           <i>CFWS</i> production is excluded everywhere.</li>
           <li>A
           "<code title="U+0040 COMMERCIAL AT">@</code>"
           character.</li>
           <li>A
-          <a href="datatypes.html#data-dot-atom">dot-atom</a>,
+          <span>one </span><a href="datatypes.html#data-dot-atom">dot-atom</a><span> element</span>, ,
           with the additional constraint that the
           <i>CFWS</i> production is excluded everywhere.</li>
         </ol>
@@ -669,7 +669,7 @@
         <h2 class="common-subhead">9.42. Emailaddresslist <a class="hash" href="#form.data.emailaddresslist-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.emailaddresslist">emailaddresslist</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.emailaddresslist" class="hash">#</a></div>
-      <div class="datatype-desc">A set of comma-separated <a href="datatypes.html#data-token">tokens</a>, each of which is a valid
+      <div class="datatype-desc">A set of comma-separated <span>one </span><a href="datatypes.html#data-token">tokens</a><span> element</span>, , each of which is a valid
       <a href="datatypes.html#form.data.emailaddress">emailaddress</a>.</div>
     </div>
       </div>

Index: command.radio.html
===================================================================
RCS file: /sources/public/html5/markup/command.radio.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- command.radio.html	3 Feb 2010 14:44:04 -0000	1.33
+++ command.radio.html	4 Feb 2010 15:09:18 -0000	1.34
@@ -19,16 +19,23 @@
     value is "<code>radio</code>" represents
     a selection of one item from a list of items.</p>
   </div>
-      <div class="no-number no-toc" id="command.radio-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#command.radio-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="command.radio-attr-mdl">
+      <div class="no-number no-toc" id="command.radio-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#command.radio-content-model">#</a></h2><div class="content-models">
+        
+      <div id="command.radio-mdls">
+        <p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span> 
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="command.radio-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#command.radio-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="command.radio.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> (<a class="ref" href="command.radio.html#command.radio.attrs.type" title="command.radio.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="command.radio.html#command.radio.attrs.radiogroup" title="command.radio.attrs.radiogroup">radiogroup</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="command.radio.html#command.radio.attrs.checked" title="command.radio.attrs.checked">checked</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="command.radio.html#command.radio.attrs.label" title="command.radio.attrs.label">label</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="command.radio.html#command.radio.attrs.icon" title="command.radio.attrs.icon">icon</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="command.radio.html#command.radio.attrs.disabled" title="command.radio.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span>  <span class="agroupof"><a class="ref" href="command.radio.html#command.radio.attrs.type" title="command.radio.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="command.radio.html#command.radio.attrs.radiogroup" title="command.radio.attrs.radiogroup">radiogroup</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="command.radio.html#command.radio.attrs.checked" title="command.radio.attrs.checked">checked</a> </span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="command.radio.html#command.radio.attrs.label" title="command.radio.attrs.label">label</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="command.radio.html#command.radio.attrs.icon" title="command.radio.attrs.icon">icon</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="command.radio.html#command.radio.attrs.disabled" title="command.radio.attrs.disabled">disabled</a> </span></p></div></div>
       <div class="no-number no-toc" id="command.radio-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#command.radio-attributes">#</a></h2>
         <dl class="attr-defs">

Index: input.datetime.html
===================================================================
RCS file: /sources/public/html5/markup/input.datetime.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- input.datetime.html	3 Feb 2010 14:44:05 -0000	1.32
+++ input.datetime.html	4 Feb 2010 15:09:19 -0000	1.33
@@ -21,23 +21,31 @@
     representing a global date and time (with timezone
     information).</p>
   </div>
-      <div class="no-number no-toc" id="input.datetime-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.datetime-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.datetime-attr-mdl">
+      <div class="no-number no-toc" id="input.datetime-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#input.datetime-content-model">#</a></h2><div class="content-models">
+        
+      <div id="input.datetime-mdls">
+        <p class="elem-mdl">
+      <a class="ref" href="input.datetime.html#input.datetime.attrs">input.datetime.attrs</a>
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="input.datetime-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.datetime-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="input.datetime.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.datetime.html#input.datetime.attrs.type" title="input.datetime.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.datetime.html#input.datetime.attrs.min" title="input.datetime.attrs.min">min</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.datetime.html#input.datetime.attrs.max" title="input.datetime.attrs.max">max</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.datetime.html#input.datetime.attrs.value" title="input.datetime.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.datetime.html#input.datetime.attrs.type" title="input.datetime.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.datetime.html#input.datetime.attrs.min" title="input.datetime.attrs.min">min</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.datetime.html#input.datetime.attrs.max" title="input.datetime.attrs.max">max</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.datetime.html#input.datetime.attrs.value" title="input.datetime.attrs.value">value</a> </span></p></div></div>
       <div class="no-number no-toc" id="input.datetime-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.datetime-attributes">#</a></h2>
         <dl class="attr-defs">

Index: input.password.html
===================================================================
RCS file: /sources/public/html5/markup/input.password.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- input.password.html	1 Feb 2010 05:25:02 -0000	1.32
+++ input.password.html	4 Feb 2010 15:09:19 -0000	1.33
@@ -19,23 +19,31 @@
     value is "<code>password</code>" represents
     a one-line plain-text edit control for entering a password.</p>
   </div>
-      <div class="no-number no-toc" id="input.password-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.password-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.password-attr-mdl">
+      <div class="no-number no-toc" id="input.password-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#input.password-content-model">#</a></h2><div class="content-models">
+        
+      <div id="input.password-mdls">
+        <p class="elem-mdl">
+      <a class="ref" href="input.password.html#input.password.attrs">input.password.attrs</a>
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="input.password-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.password-attr-mdl">#</a></h2>
         <div class="attr-content-models">
-          <p><span class="pattern" id="input.password.attrs">(<a class="ref" href="common-attributes.html">common attributes</a>
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.password.html#input.password.attrs.type" title="input.password.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.password.html#input.password.attrs.value" title="input.password.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )
-   <span class="postfix &amp;">&amp;</span> (<a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )</span></p></div></div>
+          <p><span class="pattern" id="input.password.attrs"> <a class="ref" href="common-attributes.html">common attributes</a>
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.password.html#input.password.attrs.type" title="input.password.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.password.html#input.password.attrs.value" title="input.password.attrs.value">value</a> 
+   <span class="postfix intermixed">&amp;</span>  <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a> </span></p></div></div>
       <div class="no-number no-toc" id="input.password-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.password-attributes">#</a></h2>
         <dl class="attr-defs">

Index: embed.html
===================================================================
RCS file: /sources/public/html5/markup/embed.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- embed.html	1 Feb 2010 05:25:00 -0000	1.33
+++ embed.html	4 Feb 2010 15:09:18 -0000	1.34
@@ -17,14 +17,21 @@
     <p>The <a href="embed.html#embed" class="element">embed</a> element
     represents an integration point for external content.</p>
   </div>
-      <div class="no-number no-toc" id="embed-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#embed-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="embed-attr-mdl">
+      <div class="no-number no-toc" id="embed-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#embed-content-model">#</a></h2><div class="content-models">
+        
+      <div id="embed-mdls">
+        <p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span> 
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="embed-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#embed-attr-mdl">#</a></h2>
         <div class="attr-content-models"><div class="attr-content-model"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="embed.html#embed.attrs.src" title="embed.attrs.src">src</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="embed.html#embed.attrs.type" title="embed.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="embed.html#embed.attrs.height" title="embed.attrs.height">height</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="embed.html#embed.attrs.width" title="embed.attrs.width">width</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span>   <span class="attr-prose-desc">Any other attribute that has no namespace</span></div></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="embed.html#embed.attrs.src" title="embed.attrs.src">src</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="embed.html#embed.attrs.type" title="embed.attrs.type">type</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="embed.html#embed.attrs.height" title="embed.attrs.height">height</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="embed.html#embed.attrs.width" title="embed.attrs.width">width</a> 
+   <span class="postfix intermixed">&amp;</span>   <span class="attr-prose-desc">Any other attribute that has no namespace</span></div></div></div>
       <div class="no-number no-toc" id="embed-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#embed-attributes">#</a></h2>
         <dl class="attr-defs">

Index: dd.html
===================================================================
RCS file: /sources/public/html5/markup/dd.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- dd.html	1 Feb 2010 05:25:00 -0000	1.33
+++ dd.html	4 Feb 2010 15:09:18 -0000	1.34
@@ -19,9 +19,16 @@
     element represents a
     <a href="dd.html#dd-description">description or value</a>.</p>
   </div>
-      <div class="no-number no-toc" id="dd-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#dd-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></div></div><div class="no-number no-toc" id="dd-attr-mdl">
+      <div class="no-number no-toc" id="dd-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#dd-content-model">#</a></h2><div class="content-models">
+        
+      <div id="dd-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#flow-content">flow content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="dd-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#dd-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="dd.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>
@@ -41,8 +48,7 @@
       </div>
       <div class="no-number no-toc" id="dd-context">
         <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#dd-context">#</a></h2>
-        <p class="permitted-parents">
-        <span class="context-mdl"><a href="dl.html#dl">dl</a></span></p>
+        <p class="permitted-parents"></p>
       </div>
       
       <div class="no-number no-toc" id="dd-display">

Index: ul.html
===================================================================
RCS file: /sources/public/html5/markup/ul.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- ul.html	1 Feb 2010 05:25:04 -0000	1.28
+++ ul.html	4 Feb 2010 15:09:22 -0000	1.29
@@ -19,11 +19,16 @@
     the order of the items would not change the meaning of
     list.</p>
   </div>
-      <div class="no-number no-toc" id="ul-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#ul-contents">#</a></h2><div class="prose-model">
-    <p>Zero or more
-    <a href="li.html#li" class="element">li</a>
-    elements.</p>
-  </div></div><div class="no-number no-toc" id="ul-attr-mdl">
+      <div class="no-number no-toc" id="ul-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#ul-content-model">#</a></h2><div class="content-models">
+        
+      <div id="ul-mdls">
+        <p class="elem-mdl">
+      <span>zero or more </span><a class="ref" href="li.html#li">li</a><span> elements</span> 
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="ul-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#ul-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="ul.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: input.time.html
===================================================================
RCS file: /sources/public/html5/markup/input.time.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- input.time.html	3 Feb 2010 14:44:05 -0000	1.33
+++ input.time.html	4 Feb 2010 15:09:20 -0000	1.34
@@ -20,23 +20,31 @@
     a control for setting the element&#8217;s value to a string
     representing a time (with no timezone information).</p>
   </div>
-      <div class="no-number no-toc" id="input.time-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.time-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.time-attr-mdl">
+      <div class="no-number no-toc" id="input.time-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#input.time-content-model">#</a></h2><div class="content-models">
+        
+      <div id="input.time-mdls">
+        <p class="elem-mdl">
+      <a class="ref" href="input.time.html#input.time.attrs">input.time.attrs</a>
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="input.time-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.time-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="input.time.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.time.html#input.time.attrs.type" title="input.time.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.time.html#input.time.attrs.min" title="input.time.attrs.min">min</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.time.html#input.time.attrs.max" title="input.time.attrs.max">max</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.time.html#input.time.attrs.value" title="input.time.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.time.html#input.time.attrs.type" title="input.time.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.time.html#input.time.attrs.min" title="input.time.attrs.min">min</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.time.html#input.time.attrs.max" title="input.time.attrs.max">max</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.time.html#input.time.attrs.value" title="input.time.attrs.value">value</a> </span></p></div></div>
       <div class="no-number no-toc" id="input.time-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.time-attributes">#</a></h2>
         <dl class="attr-defs">

Index: dt.html
===================================================================
RCS file: /sources/public/html5/markup/dt.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- dt.html	1 Feb 2010 05:25:00 -0000	1.33
+++ dt.html	4 Feb 2010 15:09:18 -0000	1.34
@@ -19,9 +19,16 @@
     element represents a
     <a href="dt.html#dt-term">term or name</a>.</p>
   </div>
-      <div class="no-number no-toc" id="dt-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#dt-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="dt-attr-mdl">
+      <div class="no-number no-toc" id="dt-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#dt-content-model">#</a></h2><div class="content-models">
+        
+      <div id="dt-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="dt-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#dt-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="dt.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>
@@ -40,8 +47,7 @@
       </div>
       <div class="no-number no-toc" id="dt-context">
         <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#dt-context">#</a></h2>
-        <p class="permitted-parents">
-        <span class="context-mdl"><a href="dl.html#dl">dl</a></span></p>
+        <p class="permitted-parents"></p>
       </div>
       
       <div class="no-number no-toc" id="dt-display">

Index: strong.html
===================================================================
RCS file: /sources/public/html5/markup/strong.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- strong.html	3 Feb 2010 14:44:06 -0000	1.32
+++ strong.html	4 Feb 2010 15:09:21 -0000	1.33
@@ -17,9 +17,16 @@
     <p>The <a href="strong.html#strong" class="element">strong</a> element
     represents a span of text with strong importance.</p>
   </div>
-      <div class="no-number no-toc" id="strong-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#strong-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="strong-attr-mdl">
+      <div class="no-number no-toc" id="strong-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#strong-content-model">#</a></h2><div class="content-models">
+        
+      <div id="strong-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="strong-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#strong-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="strong.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: input.color.html
===================================================================
RCS file: /sources/public/html5/markup/input.color.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- input.color.html	3 Feb 2010 14:44:05 -0000	1.33
+++ input.color.html	4 Feb 2010 15:09:19 -0000	1.34
@@ -20,18 +20,26 @@
     a color-well control, for setting the element&#8217;s value to a
     string representing a simple color.</p>
   </div>
-      <div class="no-number no-toc" id="input.color-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.color-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.color-attr-mdl">
+      <div class="no-number no-toc" id="input.color-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#input.color-content-model">#</a></h2><div class="content-models">
+        
+      <div id="input.color-mdls">
+        <p class="elem-mdl">
+      <a class="ref" href="input.color.html#input.color.attrs">input.color.attrs</a>
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="input.color-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.color-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="input.color.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.color.html#input.color.attrs.type" title="input.color.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.color.html#input.color.attrs.value" title="input.color.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.color.html#input.color.attrs.type" title="input.color.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.color.html#input.color.attrs.value" title="input.color.attrs.value">value</a> </span></p></div></div>
       <div class="no-number no-toc" id="input.color-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.color-attributes">#</a></h2>
         <dl class="attr-defs">

Index: li.html
===================================================================
RCS file: /sources/public/html5/markup/li.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- li.html	1 Feb 2010 05:25:02 -0000	1.34
+++ li.html	4 Feb 2010 15:09:20 -0000	1.35
@@ -17,11 +17,29 @@
     <p>The <a href="li.html#li" class="element">li</a> element represents
     a list item.</p>
   </div>
-      <div class="no-number no-toc" id="li-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#li-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></div></div><div class="no-number no-toc" id="li-attr-mdl">
+      <div class="no-number no-toc" id="li-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#li-content-model">#</a></h2><div class="content-models">
+        
+      <div id="li-mdls">
+        
+        <p class="elem-mdl">
+      <a href="terminology.html#flow-content">flow content</a>
+        
+    </p><div class="postfix or">or</div>
+        
+        <p class="elem-mdl">
+      <a href="terminology.html#flow-content">flow content</a>
+        
+    </p><div class="postfix or">or</div>
+        
+        <p class="elem-mdl">
+      <a href="terminology.html#flow-content">flow content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="li-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#li-attr-mdl">#</a></h2>
-        <div class="attr-content-models"><p><a href="common-attributes.html">common attributes</a><span class="postfix optional">?</span></p><span class="postfix or">or</span><p><a href="common-attributes.html">common attributes</a><span class="postfix optional">?</span> <span class="postfix &amp;">&amp;</span> <a href="li.html#oli.attrs.value">value</a><span class="postfix optional">?</span></p></div></div>
+        <div class="attr-content-models"><p><a href="common-attributes.html">common attributes</a></p><span class="postfix or">or</span><p><a href="common-attributes.html">common attributes</a> <span class="postfix &amp;">&amp;</span> <a href="li.html#oli.attrs.value">value</a></p></div></div>
       <div class="no-number no-toc" id="li-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#li-attributes">#</a></h2>
         <dl class="attr-defs">

Index: style.html
===================================================================
RCS file: /sources/public/html5/markup/style.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- style.html	3 Feb 2010 14:44:06 -0000	1.36
+++ style.html	4 Feb 2010 15:09:21 -0000	1.37
@@ -19,20 +19,31 @@
     element
     allows style information to be embedded in documents.</p>
   </div>
-      <div class="no-number no-toc" id="style-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#style-contents">#</a></h2><div class="prose-model">
-    <p>
-      <a href="syntax.html#non-replaceable-character-data">non-replaceable character data</a>
+      <div class="no-number no-toc" id="style-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#style-content-model">#</a></h2><div class="content-models">
+        
+      <div id="style-mdls">
+        
+        <p class="elem-mdl">
+      <span>one </span><a class="ref" href="syntax.html#non-replaceable-character-data">non-replaceable-character-data</a><span> element</span>
+        
+    </p><div class="postfix or">or</div>
+        
+        <p class="elem-mdl">
+      <span>one </span><a class="ref" href="syntax.html#non-replaceable-character-data">non-replaceable-character-data</a><span> element</span>
+        
     </p>
-  </div></div><div class="no-number no-toc" id="style-attr-mdl">
+        </div>
+      </div></div><div class="no-number no-toc" id="style-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#style-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="style.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="style.html#style.attrs.type" title="style.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="style.html#style.attrs.media" title="style.attrs.media">media</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p><span class="postfix or">or</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="style.html#style.attrs.type" title="style.attrs.type">type</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="style.html#style.attrs.media" title="style.attrs.media">media</a> </span></p><span class="postfix or">or</span>
           <p><span class="pattern" id="style.scoped.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="style.html#style.attrs.type" title="style.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="style.html#style.attrs.media" title="style.attrs.media">media</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="style.html#style.attrs.scoped" title="style.attrs.scoped">scoped</a><span class="postfix required" title="REQUIRED">&#9733;</span></span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="style.html#style.attrs.type" title="style.attrs.type">type</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="style.html#style.attrs.media" title="style.attrs.media">media</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="style.html#style.attrs.scoped" title="style.attrs.scoped">scoped</a><span class="postfix required" title="REQUIRED">&#9733;</span></span></p></div></div>
       <div class="no-number no-toc" id="style-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#style-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -72,7 +83,6 @@
         <span class="context-mdl"><span>Any element that can contain
             <a href="common-models.html#common.elem.metadata">metadata elements</a></span></span>, 
         <span class="context-mdl"><a href="div.html#div">div</a></span>, 
-        <span class="context-mdl"><a href="noscript.html#noscript">noscript</a></span>, 
         <span class="context-mdl"><a href="section.html#section">section</a></span>, 
         <span class="context-mdl"><a href="article.html#article">article</a></span>, 
         <span class="context-mdl"><a href="aside.html#aside">aside</a></span></p>

Index: del.html
===================================================================
RCS file: /sources/public/html5/markup/del.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- del.html	2 Feb 2010 17:04:53 -0000	1.35
+++ del.html	4 Feb 2010 15:09:18 -0000	1.36
@@ -18,12 +18,21 @@
     represents a range of text that has been deleted from a
     document.</p>
   </div>
-      <div class="no-number no-toc" id="del-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#del-contents">#</a></h2><div class="prose-model"><div id="prose-model"><p><a href="terminology.html#transparent">transparent</a></p></div></div></div><div class="no-number no-toc" id="del-attr-mdl">
+      <div class="no-number no-toc" id="del-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#del-content-model">#</a></h2><div class="content-models">
+        
+      <div id="del-mdls">
+        
+        <p class="elem-mdl"><span class="transparent"><a href="terminology.html#transparent">transparent</a> (<span class="postfix or">either</span> <a href="terminology.html#phrasing-content">phrasing content</a> <span class="postfix or">or</span> <a href="terminology.html#phrasing-content">flow content</a>)</span></p>
+        
+        
+        </div>
+      </div></div><div class="no-number no-toc" id="del-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#del-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="del.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="del.html#del.attrs.cite" title="del.attrs.cite">cite</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="del.html#del.attrs.datetime" title="del.attrs.datetime">datetime</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="del.html#del.attrs.cite" title="del.attrs.cite">cite</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="del.html#del.attrs.datetime" title="del.attrs.datetime">datetime</a> </span></p></div></div>
       <div class="no-number no-toc" id="del-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#del-attributes">#</a></h2>
         <dl class="attr-defs">

Index: menu.html
===================================================================
RCS file: /sources/public/html5/markup/menu.html,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- menu.html	3 Feb 2010 14:44:05 -0000	1.38
+++ menu.html	4 Feb 2010 15:09:20 -0000	1.39
@@ -17,22 +17,22 @@
     <p>The <a href="menu.html#menu" class="element">menu</a> element
     represents a list of commands.</p>
   </div>
-      <div class="no-number no-toc" id="menu-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#menu-contents">#</a></h2><div class="prose-model">
-    <p>Exactly one of the following two choices:</p>
-    <ul>
-      <li>One or more <a href="li.html#li" class="element">li</a> elements</li>
-      <li>Or, 
-      <a href="common-models.html#common.elem.flow">flow elements</a>
-      and
-      <a href="syntax.html#normal-character-data">normal character data</a>
-      </li>
-    </ul>
-  </div></div><div class="no-number no-toc" id="menu-attr-mdl">
+      <div class="no-number no-toc" id="menu-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#menu-content-model">#</a></h2><div class="content-models">
+        
+      <div id="menu-mdls">
+        <p class="elem-mdl">
+      (<span>zero or more </span><a class="ref" href=".html#mli">li</a><span> elements</span>,  
+   <span class="postfix or">or</span> <a href="terminology.html#flow-content">flow content</a>)
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="menu-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#menu-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="menu.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="menu.html#menu.attrs.type" title="menu.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="menu.html#menu.attrs.label" title="menu.attrs.label">label</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="menu.html#menu.attrs.type" title="menu.attrs.type">type</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="menu.html#menu.attrs.label" title="menu.attrs.label">label</a> </span></p></div></div>
       <div class="no-number no-toc" id="menu-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#menu-attributes">#</a></h2>
         <dl class="attr-defs">

Index: input.image.html
===================================================================
RCS file: /sources/public/html5/markup/input.image.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- input.image.html	1 Feb 2010 05:25:01 -0000	1.32
+++ input.image.html	4 Feb 2010 15:09:19 -0000	1.33
@@ -22,24 +22,32 @@
     form, or alternatively a button from which the user can submit
     the form.</p>
   </div>
-      <div class="no-number no-toc" id="input.image-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.image-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.image-attr-mdl">
+      <div class="no-number no-toc" id="input.image-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#input.image-content-model">#</a></h2><div class="content-models">
+        
+      <div id="input.image-mdls">
+        <p class="elem-mdl">
+      <a class="ref" href="input.image.html#input.image.attrs">input.image.attrs</a>
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="input.image-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.image-attr-mdl">#</a></h2>
         <div class="attr-content-models">
-          <p><span class="pattern" id="input.image.attrs">(<a class="ref" href="common-attributes.html">common attributes</a>
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.image.html#input.image.attrs.type" title="input.image.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.image.html#input.image.attrs.alt" title="input.image.attrs.alt">alt</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.image.html#input.image.attrs.src" title="input.image.attrs.src">src</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )
-   <span class="postfix &amp;">&amp;</span> (<a class="ref" href="forms-attributes.html#shared-form.attrs.formaction" title="shared-form.attrs.formaction">formaction</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formenctype" title="shared-form.attrs.formenctype">formenctype</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formmethod" title="shared-form.attrs.formmethod">formmethod</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formtarget" title="shared-form.attrs.formtarget">formtarget</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formnovalidate" title="shared-form.attrs.formnovalidate">formnovalidate</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.image.html#input.image.attrs.height" title="input.image.attrs.height">height</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.image.html#input.image.attrs.width" title="input.image.attrs.width">width</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )</span></p></div></div>
+          <p><span class="pattern" id="input.image.attrs"> <a class="ref" href="common-attributes.html">common attributes</a>
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.image.html#input.image.attrs.type" title="input.image.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.image.html#input.image.attrs.alt" title="input.image.attrs.alt">alt</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.image.html#input.image.attrs.src" title="input.image.attrs.src">src</a> 
+   <span class="postfix intermixed">&amp;</span>  <a class="ref" href="forms-attributes.html#shared-form.attrs.formaction" title="shared-form.attrs.formaction">formaction</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formenctype" title="shared-form.attrs.formenctype">formenctype</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formmethod" title="shared-form.attrs.formmethod">formmethod</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formtarget" title="shared-form.attrs.formtarget">formtarget</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formnovalidate" title="shared-form.attrs.formnovalidate">formnovalidate</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.image.html#input.image.attrs.height" title="input.image.attrs.height">height</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.image.html#input.image.attrs.width" title="input.image.attrs.width">width</a> </span></p></div></div>
       <div class="no-number no-toc" id="input.image-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.image-attributes">#</a></h2>
         <dl class="attr-defs">

Index: code.html
===================================================================
RCS file: /sources/public/html5/markup/code.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- code.html	1 Feb 2010 05:25:00 -0000	1.29
+++ code.html	4 Feb 2010 15:09:18 -0000	1.30
@@ -17,9 +17,16 @@
     <p>The <a href="code.html#code" class="element">code</a> element
     represents a fragment of computer code.</p>
   </div>
-      <div class="no-number no-toc" id="code-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#code-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="code-attr-mdl">
+      <div class="no-number no-toc" id="code-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#code-content-model">#</a></h2><div class="content-models">
+        
+      <div id="code-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="code-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#code-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="code.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: h2.html
===================================================================
RCS file: /sources/public/html5/markup/h2.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- h2.html	1 Feb 2010 05:25:01 -0000	1.35
+++ h2.html	4 Feb 2010 15:09:19 -0000	1.36
@@ -17,9 +17,16 @@
     <p>The <a href="h1.html#h1" class="element">h1</a> through <a href="h6.html#h6" class="element">h6</a> elements are headings for
     the sections with which they are associated.</p>
   </div>
-      <div class="no-number no-toc" id="h2-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#h2-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="h2-attr-mdl">
+      <div class="no-number no-toc" id="h2-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#h2-content-model">#</a></h2><div class="content-models">
+        
+      <div id="h2-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="h2-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#h2-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="h2.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>
@@ -50,8 +57,7 @@
         <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#h2-context">#</a></h2>
         <p class="permitted-parents">
         <span class="context-mdl"><span>Any element that can contain
-            <a href="common-models.html#common.elem.flow">flow elements</a></span></span>, 
-        <span class="context-mdl"><a href="hgroup.html#hgroup">hgroup</a></span></p>
+            <a href="common-models.html#common.elem.flow">flow elements</a></span></span></p>
       </div>
       
       <div class="no-number no-toc" id="h2-display">

Index: head.html
===================================================================
RCS file: /sources/public/html5/markup/head.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- head.html	1 Feb 2010 05:25:01 -0000	1.28
+++ head.html	4 Feb 2010 15:09:19 -0000	1.29
@@ -17,16 +17,18 @@
     <p>The <a href="head.html#head" class="element">head</a> element
     collects the document&#8217;s metadata.</p>
   </div>
-      <div class="no-number no-toc" id="head-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#head-contents">#</a></h2><div class="prose-model">
-    <p>A
-    <span class="required">required</span>
-    <a href="title.html#title" class="element">title</a>
-    element, optionally followed by exactly one
-    <a href="base.html#base" class="element">base</a>
-    element, followed by any
-    <a href="common-metadata">metadata elements</a>
+      <div class="no-number no-toc" id="head-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#head-content-model">#</a></h2><div class="content-models">
+        
+      <div id="head-mdls">
+        <p class="elem-mdl">
+      <span>one </span><a class="ref" href="title.html#title">title</a><span> element</span>, 
+   <span class="postfix intermixed">intermixed with</span> <span>an optional </span><a class="ref" href="base.html#base">base</a><span> element</span>,  
+   <span class="postfix intermixed">intermixed with</span> <a href="common-models.html#common.elem.metadata">metadata elements</a>
+        
     </p>
-  </div></div><div class="no-number no-toc" id="head-attr-mdl">
+        </div>
+      </div></div><div class="no-number no-toc" id="head-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#head-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="head.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: p.html
===================================================================
RCS file: /sources/public/html5/markup/p.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- p.html	1 Feb 2010 05:25:03 -0000	1.34
+++ p.html	4 Feb 2010 15:09:20 -0000	1.35
@@ -17,9 +17,16 @@
     <p>The <a href="p.html#p" class="element">p</a> element represents a
     paragraph.</p>
   </div>
-      <div class="no-number no-toc" id="p-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#p-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="p-attr-mdl">
+      <div class="no-number no-toc" id="p-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#p-content-model">#</a></h2><div class="content-models">
+        
+      <div id="p-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="p-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#p-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="p.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: figcaption.html
===================================================================
RCS file: /sources/public/html5/markup/figcaption.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- figcaption.html	3 Feb 2010 14:44:05 -0000	1.3
+++ figcaption.html	4 Feb 2010 15:09:19 -0000	1.4
@@ -19,9 +19,16 @@
     element represents a caption or legend for a
     <a href="figure.html#figure" class="element">figure</a>.</p>
   </div>
-      <div class="no-number no-toc" id="figcaption-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#figcaption-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="figcaption-attr-mdl">
+      <div class="no-number no-toc" id="figcaption-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#figcaption-content-model">#</a></h2><div class="content-models">
+        
+      <div id="figcaption-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="figcaption-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#figcaption-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="figcaption.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>
@@ -37,8 +44,7 @@
       </div>
       <div class="no-number no-toc" id="figcaption-context">
         <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#figcaption-context">#</a></h2>
-        <p class="permitted-parents">
-        <span class="context-mdl"><a href="figure.html#figure">figure</a></span></p>
+        <p class="permitted-parents"></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: map.html
===================================================================
RCS file: /sources/public/html5/markup/map.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- map.html	1 Feb 2010 11:33:27 -0000	1.35
+++ map.html	4 Feb 2010 15:09:20 -0000	1.36
@@ -18,11 +18,20 @@
     conjunction with any <a href="area.html#area" class="element">area</a>
     element descendants, defines an image map.</p>
   </div>
-      <div class="no-number no-toc" id="map-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#map-contents">#</a></h2><div class="prose-model"><div id="prose-model"><p><a href="terminology.html#transparent">transparent</a></p></div></div></div><div class="no-number no-toc" id="map-attr-mdl">
+      <div class="no-number no-toc" id="map-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#map-content-model">#</a></h2><div class="content-models">
+        
+      <div id="map-mdls">
+        
+        <p class="elem-mdl"><span class="transparent"><a href="terminology.html#transparent">transparent</a> (<span class="postfix or">either</span> <a href="terminology.html#phrasing-content">phrasing content</a> <span class="postfix or">or</span> <a href="terminology.html#phrasing-content">flow content</a>)</span></p>
+        
+        
+        </div>
+      </div></div><div class="no-number no-toc" id="map-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#map-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="map.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="map.html#map.attrs.name" title="map.attrs.name">name</a><span class="postfix required" title="REQUIRED">&#9733;</span></span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="map.html#map.attrs.name" title="map.attrs.name">name</a><span class="postfix required" title="REQUIRED">&#9733;</span></span></p></div></div>
       <div class="no-number no-toc" id="map-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#map-attributes">#</a></h2>
         <dl class="attr-defs">

Index: input.file.html
===================================================================
RCS file: /sources/public/html5/markup/input.file.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- input.file.html	1 Feb 2010 05:25:01 -0000	1.30
+++ input.file.html	4 Feb 2010 15:09:19 -0000	1.31
@@ -21,18 +21,26 @@
     name, a file type, and a file body (the contents of the
     file).</p>
   </div>
-      <div class="no-number no-toc" id="input.file-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.file-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.file-attr-mdl">
+      <div class="no-number no-toc" id="input.file-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#input.file-content-model">#</a></h2><div class="content-models">
+        
+      <div id="input.file-mdls">
+        <p class="elem-mdl">
+      <a class="ref" href="input.file.html#input.file.attrs">input.file.attrs</a>
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="input.file-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.file-attr-mdl">#</a></h2>
         <div class="attr-content-models">
-          <p><span class="pattern" id="input.file.attrs">(<a class="ref" href="common-attributes.html">common attributes</a>
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.file.html#input.file.attrs.type" title="input.file.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.file.html#input.file.attrs.accept" title="input.file.attrs.accept">accept</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )
-   <span class="postfix &amp;">&amp;</span> (<a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.multiple" title="input.attrs.multiple">multiple</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )</span></p></div></div>
+          <p><span class="pattern" id="input.file.attrs"> <a class="ref" href="common-attributes.html">common attributes</a>
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.file.html#input.file.attrs.type" title="input.file.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.file.html#input.file.attrs.accept" title="input.file.attrs.accept">accept</a> 
+   <span class="postfix intermixed">&amp;</span>  <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.multiple" title="input.attrs.multiple">multiple</a> </span></p></div></div>
       <div class="no-number no-toc" id="input.file-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.file-attributes">#</a></h2>
         <dl class="attr-defs">

Index: input.radio.html
===================================================================
RCS file: /sources/public/html5/markup/input.radio.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- input.radio.html	1 Feb 2010 05:25:02 -0000	1.32
+++ input.radio.html	4 Feb 2010 15:09:19 -0000	1.33
@@ -20,18 +20,26 @@
     a selection of one item from a list of items (a radio
     button).</p>
   </div>
-      <div class="no-number no-toc" id="input.radio-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.radio-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.radio-attr-mdl">
+      <div class="no-number no-toc" id="input.radio-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#input.radio-content-model">#</a></h2><div class="content-models">
+        
+      <div id="input.radio-mdls">
+        <p class="elem-mdl">
+      <a class="ref" href="input.radio.html#input.radio.attrs">input.radio.attrs</a>
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="input.radio-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.radio-attr-mdl">#</a></h2>
         <div class="attr-content-models">
-          <p><span class="pattern" id="input.radio.attrs">(<a class="ref" href="common-attributes.html">common attributes</a>
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.radio.html#input.radio.attrs.type" title="input.radio.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.checked" title="input.attrs.checked">checked</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.radio.html#input.radio.attrs.value" title="input.radio.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )
-   <span class="postfix &amp;">&amp;</span> (<a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )</span></p></div></div>
+          <p><span class="pattern" id="input.radio.attrs"> <a class="ref" href="common-attributes.html">common attributes</a>
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.radio.html#input.radio.attrs.type" title="input.radio.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.checked" title="input.attrs.checked">checked</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.radio.html#input.radio.attrs.value" title="input.radio.attrs.value">value</a> 
+   <span class="postfix intermixed">&amp;</span>  <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> </span></p></div></div>
       <div class="no-number no-toc" id="input.radio-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.radio-attributes">#</a></h2>
         <dl class="attr-defs">

Index: command.checkbox.html
===================================================================
RCS file: /sources/public/html5/markup/command.checkbox.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- command.checkbox.html	3 Feb 2010 14:44:04 -0000	1.33
+++ command.checkbox.html	4 Feb 2010 15:09:18 -0000	1.34
@@ -19,15 +19,22 @@
     value is "<code>checkbox</code>" represents a state or option
     that can be toggled.</p>
   </div>
-      <div class="no-number no-toc" id="command.checkbox-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#command.checkbox-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="command.checkbox-attr-mdl">
+      <div class="no-number no-toc" id="command.checkbox-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#command.checkbox-content-model">#</a></h2><div class="content-models">
+        
+      <div id="command.checkbox-mdls">
+        <p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span> 
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="command.checkbox-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#command.checkbox-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="command.checkbox.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> (<a class="ref" href="command.checkbox.html#command.checkbox.attrs.type" title="command.checkbox.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="command.checkbox.html#command.checkbox.attrs.checked" title="command.checkbox.attrs.checked">checked</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="command.checkbox.html#command.checkbox.attrs.label" title="command.checkbox.attrs.label">label</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="command.checkbox.html#command.checkbox.attrs.icon" title="command.checkbox.attrs.icon">icon</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="command.checkbox.html#command.checkbox.attrs.disabled" title="command.checkbox.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span>  <span class="agroupof"><a class="ref" href="command.checkbox.html#command.checkbox.attrs.type" title="command.checkbox.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="command.checkbox.html#command.checkbox.attrs.checked" title="command.checkbox.attrs.checked">checked</a> </span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="command.checkbox.html#command.checkbox.attrs.label" title="command.checkbox.attrs.label">label</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="command.checkbox.html#command.checkbox.attrs.icon" title="command.checkbox.attrs.icon">icon</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="command.checkbox.html#command.checkbox.attrs.disabled" title="command.checkbox.attrs.disabled">disabled</a> </span></p></div></div>
       <div class="no-number no-toc" id="command.checkbox-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#command.checkbox-attributes">#</a></h2>
         <dl class="attr-defs">

Index: param.html
===================================================================
RCS file: /sources/public/html5/markup/param.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- param.html	1 Feb 2010 11:33:27 -0000	1.35
+++ param.html	4 Feb 2010 15:09:21 -0000	1.36
@@ -17,12 +17,19 @@
     <p>The <a href="param.html#param" class="element">param</a> element
     defines parameters for plugins invoked by <a href="object.html#object" class="element">object</a> elements.</p>
   </div>
-      <div class="no-number no-toc" id="param-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#param-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="param-attr-mdl">
+      <div class="no-number no-toc" id="param-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#param-content-model">#</a></h2><div class="content-models">
+        
+      <div id="param-mdls">
+        <p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span> 
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="param-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#param-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="param.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="param.html#param.attrs.name" title="param.attrs.name">name</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="param.html#param.attrs.value" title="param.attrs.value">value</a><span class="postfix required" title="REQUIRED">&#9733;</span></span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="param.html#param.attrs.name" title="param.attrs.name">name</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="param.html#param.attrs.value" title="param.attrs.value">value</a><span class="postfix required" title="REQUIRED">&#9733;</span></span></p></div></div>
       <div class="no-number no-toc" id="param-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#param-attributes">#</a></h2>
         <dl class="attr-defs">

Index: span.html
===================================================================
RCS file: /sources/public/html5/markup/span.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- span.html	1 Feb 2010 05:25:03 -0000	1.30
+++ span.html	4 Feb 2010 15:09:21 -0000	1.31
@@ -18,9 +18,16 @@
     generic wrapper for phrasing content that by itself does not
     represent anything.</p>
   </div>
-      <div class="no-number no-toc" id="span-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#span-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="span-attr-mdl">
+      <div class="no-number no-toc" id="span-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#span-content-model">#</a></h2><div class="content-models">
+        
+      <div id="span-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="span-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#span-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="span.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: div.html
===================================================================
RCS file: /sources/public/html5/markup/div.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- div.html	1 Feb 2010 05:25:00 -0000	1.33
+++ div.html	4 Feb 2010 15:09:18 -0000	1.34
@@ -18,9 +18,17 @@
     generic container for flow content that by itself does not
     represent anything.</p>
   </div>
-      <div class="no-number no-toc" id="div-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#div-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></div></div><div class="no-number no-toc" id="div-attr-mdl">
+      <div class="no-number no-toc" id="div-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#div-content-model">#</a></h2><div class="content-models">
+        
+      <div id="div-mdls">
+        <p class="elem-mdl">
+      <span>zero or more </span><a class="ref" href="style.html#style">style</a><span> elements</span>,   <span class="postfix followedby">followed by</span> 
+  <a href="terminology.html#flow-content">flow content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="div-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#div-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="div.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: input.reset.html
===================================================================
RCS file: /sources/public/html5/markup/input.reset.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- input.reset.html	1 Feb 2010 05:25:02 -0000	1.32
+++ input.reset.html	4 Feb 2010 15:09:20 -0000	1.33
@@ -19,16 +19,24 @@
     value is "<code>reset</code>" represents a button for
     resetting a form.</p>
   </div>
-      <div class="no-number no-toc" id="input.reset-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.reset-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.reset-attr-mdl">
+      <div class="no-number no-toc" id="input.reset-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#input.reset-content-model">#</a></h2><div class="content-models">
+        
+      <div id="input.reset-mdls">
+        <p class="elem-mdl">
+      <a class="ref" href="input.reset.html#input.reset.attrs">input.reset.attrs</a>
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="input.reset-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.reset-attr-mdl">#</a></h2>
         <div class="attr-content-models">
-          <p><span class="pattern" id="input.reset.attrs">(<a class="ref" href="common-attributes.html">common attributes</a>
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.reset.html#input.reset.attrs.type" title="input.reset.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.reset.html#input.reset.attrs.value" title="input.reset.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+          <p><span class="pattern" id="input.reset.attrs"> <a class="ref" href="common-attributes.html">common attributes</a>
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.reset.html#input.reset.attrs.type" title="input.reset.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.reset.html#input.reset.attrs.value" title="input.reset.attrs.value">value</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> </span></p></div></div>
       <div class="no-number no-toc" id="input.reset-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.reset-attributes">#</a></h2>
         <dl class="attr-defs">

Index: input.datetime-local.html
===================================================================
RCS file: /sources/public/html5/markup/input.datetime-local.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- input.datetime-local.html	3 Feb 2010 14:44:05 -0000	1.32
+++ input.datetime-local.html	4 Feb 2010 15:09:19 -0000	1.33
@@ -21,23 +21,31 @@
     representing a local date and time (with no timezone
     information).</p>
   </div>
-      <div class="no-number no-toc" id="input.datetime-local-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.datetime-local-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.datetime-local-attr-mdl">
+      <div class="no-number no-toc" id="input.datetime-local-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#input.datetime-local-content-model">#</a></h2><div class="content-models">
+        
+      <div id="input.datetime-local-mdls">
+        <p class="elem-mdl">
+      <a class="ref" href="input.datetime-local.html#input.datetime-local.attrs">input.datetime-local.attrs</a>
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="input.datetime-local-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.datetime-local-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="input.datetime-local.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.datetime-local.html#input.datetime-local.attrs.type" title="input.datetime-local.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.datetime-local.html#input.datetime-local.attrs.min" title="input.datetime-local.attrs.min">min</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.datetime-local.html#input.datetime-local.attrs.max" title="input.datetime-local.attrs.max">max</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.datetime-local.html#input.datetime-local.attrs.value" title="input.datetime-local.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.datetime-local.html#input.datetime-local.attrs.type" title="input.datetime-local.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.datetime-local.html#input.datetime-local.attrs.min" title="input.datetime-local.attrs.min">min</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.datetime-local.html#input.datetime-local.attrs.max" title="input.datetime-local.attrs.max">max</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.datetime-local.html#input.datetime-local.attrs.value" title="input.datetime-local.attrs.value">value</a> </span></p></div></div>
       <div class="no-number no-toc" id="input.datetime-local-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.datetime-local-attributes">#</a></h2>
         <dl class="attr-defs">

Index: q.html
===================================================================
RCS file: /sources/public/html5/markup/q.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- q.html	1 Feb 2010 05:25:03 -0000	1.31
+++ q.html	4 Feb 2010 15:09:21 -0000	1.32
@@ -17,13 +17,20 @@
     <p>The <a href="q.html#q" class="element">q</a> element represents
     phrasing content quoted from another source.</p>
   </div>
-      <div class="no-number no-toc" id="q-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#q-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="q-attr-mdl">
+      <div class="no-number no-toc" id="q-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#q-content-model">#</a></h2><div class="content-models">
+        
+      <div id="q-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="q-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#q-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="q.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="q.html#q.attrs.cite" title="q.attrs.cite">cite</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="q.html#q.attrs.cite" title="q.attrs.cite">cite</a> </span></p></div></div>
       <div class="no-number no-toc" id="q-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#q-attributes">#</a></h2>
         <dl class="attr-defs">

Index: common-attributes.html
===================================================================
RCS file: /sources/public/html5/markup/common-attributes.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- common-attributes.html	3 Feb 2010 14:44:04 -0000	1.30
+++ common-attributes.html	4 Feb 2010 15:09:18 -0000	1.31
@@ -17,28 +17,28 @@
               all elements in the
               <a href="documents.html#html-language">HTML language</a>.</p>
         <div id="common.attrs-mdl">
-        <div class="attr-content-models"><a href="common-attributes.html#common.attrs.core">core attributes</a><span class="postfix optional">?</span>
-   <span class="postfix &amp;">&amp;</span> <a href="common-attributes.html#common.attrs.event-handler">event-handler attributes</a><span class="postfix optional">?</span>
-   <span class="postfix &amp;">&amp;</span> <a href="common-attributes.html#common.attrs.xml">xml attributes</a><span class="postfix optional">?</span>
+        <div class="attr-content-models"><a href="common-attributes.html#common.attrs.core">core attributes</a>
+   <span class="postfix intermixed">&amp;</span> <a href="common-attributes.html#common.attrs.event-handler">event-handler attributes</a>
+   <span class="postfix intermixed">&amp;</span> <a href="common-attributes.html#common.attrs.xml">xml attributes</a>
             </div>
         </div>
       <div id="common.attrs.core" class="section">
         <h2 class="common-subhead">7.01. Core attributes <a class="hash" href="#common.attrs.core">#</a> <a class="toc-bak" href="Overview.html#common.attrs.core-toc">T</a></h2><div id="common.attrs.core-mdl">
         
           <div class="attr-content-models">
-            <p><a class="ref" href="common-attributes.html#common.attrs.accesskey" title="common.attrs.accesskey">accesskey</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.class" title="common.attrs.class">class</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.contenteditable" title="common.attrs.contenteditable">contenteditable</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.contextmenu" title="common.attrs.contextmenu">contextmenu</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.dir" title="common.attrs.dir">dir</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.draggable" title="common.attrs.draggable">draggable</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.hidden" title="common.attrs.hidden">hidden</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.id" title="common.attrs.id">id</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.lang" title="common.attrs.lang">lang</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.spellcheck" title="common.attrs.spellcheck">spellcheck</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.style" title="common.attrs.style">style</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.tabindex" title="common.attrs.tabindex">tabindex</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.title" title="common.attrs.title">title</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </p>
+            <p><a class="ref" href="common-attributes.html#common.attrs.accesskey" title="common.attrs.accesskey">accesskey</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.class" title="common.attrs.class">class</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.contenteditable" title="common.attrs.contenteditable">contenteditable</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.contextmenu" title="common.attrs.contextmenu">contextmenu</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.dir" title="common.attrs.dir">dir</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.draggable" title="common.attrs.draggable">draggable</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.hidden" title="common.attrs.hidden">hidden</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.id" title="common.attrs.id">id</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.lang" title="common.attrs.lang">lang</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.spellcheck" title="common.attrs.spellcheck">spellcheck</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.style" title="common.attrs.style">style</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.tabindex" title="common.attrs.tabindex">tabindex</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.title" title="common.attrs.title">title</a> </p>
           </div>
         </div>
         <div class="no-number no-toc">
@@ -140,60 +140,60 @@
         <h2 class="common-subhead">7.02. Event-handler attributes <a class="hash" href="#common.attrs.event-handler">#</a> <a class="toc-bak" href="Overview.html#common.attrs.event-handler-toc">T</a></h2><div id="common.attrs.event-handler-mdl">
         
           <div class="attr-content-models">
-            <p><a class="ref" href="common-attributes.html#scripting.attr.onabort" title="scripting.attr.onabort">onabort</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onblur" title="scripting.attr.onblur">onblur</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.oncanplay" title="scripting.attr.oncanplay">oncanplay</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.oncanplaythrough" title="scripting.attr.oncanplaythrough">oncanplaythrough</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onchange" title="scripting.attr.onchange">onchange</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onclick" title="scripting.attr.onclick">onclick</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.oncontextmenu" title="scripting.attr.oncontextmenu">oncontextmenu</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.ondblclick" title="scripting.attr.ondblclick">ondblclick</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.ondrag" title="scripting.attr.ondrag">ondrag</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.ondragend" title="scripting.attr.ondragend">ondragend</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.ondragenter" title="scripting.attr.ondragenter">ondragenter</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.ondragleave" title="scripting.attr.ondragleave">ondragleave</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.ondragover" title="scripting.attr.ondragover">ondragover</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.ondragstart" title="scripting.attr.ondragstart">ondragstart</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.ondrop" title="scripting.attr.ondrop">ondrop</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.ondurationchange" title="scripting.attr.ondurationchange">ondurationchange</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onemptied" title="scripting.attr.onemptied">onemptied</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onended" title="scripting.attr.onended">onended</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onerror" title="scripting.attr.onerror">onerror</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onfocus" title="scripting.attr.onfocus">onfocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onformchange" title="scripting.attr.onformchange">onformchange</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onforminput" title="scripting.attr.onforminput">onforminput</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.oninput" title="scripting.attr.oninput">oninput</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.oninvalid" title="scripting.attr.oninvalid">oninvalid</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onkeydown" title="scripting.attr.onkeydown">onkeydown</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onkeypress" title="scripting.attr.onkeypress">onkeypress</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onkeyup" title="scripting.attr.onkeyup">onkeyup</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onload" title="scripting.attr.onload">onload</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onloadeddata" title="scripting.attr.onloadeddata">onloadeddata</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onloadedmetadata" title="scripting.attr.onloadedmetadata">onloadedmetadata</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onloadstart" title="scripting.attr.onloadstart">onloadstart</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onmousedown" title="scripting.attr.onmousedown">onmousedown</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onmousemove" title="scripting.attr.onmousemove">onmousemove</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onmouseout" title="scripting.attr.onmouseout">onmouseout</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onmouseover" title="scripting.attr.onmouseover">onmouseover</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onmouseup" title="scripting.attr.onmouseup">onmouseup</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onmousewheel" title="scripting.attr.onmousewheel">onmousewheel</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onpause" title="scripting.attr.onpause">onpause</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onplay" title="scripting.attr.onplay">onplay</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onplaying" title="scripting.attr.onplaying">onplaying</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onprogress" title="scripting.attr.onprogress">onprogress</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onratechange" title="scripting.attr.onratechange">onratechange</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onreadystatechange" title="scripting.attr.onreadystatechange">onreadystatechange</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onscroll" title="scripting.attr.onscroll">onscroll</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onseeked" title="scripting.attr.onseeked">onseeked</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onseeking" title="scripting.attr.onseeking">onseeking</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onselect" title="scripting.attr.onselect">onselect</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onshow" title="scripting.attr.onshow">onshow</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onstalled" title="scripting.attr.onstalled">onstalled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onsubmit" title="scripting.attr.onsubmit">onsubmit</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onsuspend" title="scripting.attr.onsuspend">onsuspend</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.ontimeupdate" title="scripting.attr.ontimeupdate">ontimeupdate</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onvolumechange" title="scripting.attr.onvolumechange">onvolumechange</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onwaiting" title="scripting.attr.onwaiting">onwaiting</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </p>
+            <p><a class="ref" href="common-attributes.html#scripting.attr.onabort" title="scripting.attr.onabort">onabort</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onblur" title="scripting.attr.onblur">onblur</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.oncanplay" title="scripting.attr.oncanplay">oncanplay</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.oncanplaythrough" title="scripting.attr.oncanplaythrough">oncanplaythrough</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onchange" title="scripting.attr.onchange">onchange</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onclick" title="scripting.attr.onclick">onclick</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.oncontextmenu" title="scripting.attr.oncontextmenu">oncontextmenu</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.ondblclick" title="scripting.attr.ondblclick">ondblclick</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.ondrag" title="scripting.attr.ondrag">ondrag</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.ondragend" title="scripting.attr.ondragend">ondragend</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.ondragenter" title="scripting.attr.ondragenter">ondragenter</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.ondragleave" title="scripting.attr.ondragleave">ondragleave</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.ondragover" title="scripting.attr.ondragover">ondragover</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.ondragstart" title="scripting.attr.ondragstart">ondragstart</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.ondrop" title="scripting.attr.ondrop">ondrop</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.ondurationchange" title="scripting.attr.ondurationchange">ondurationchange</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onemptied" title="scripting.attr.onemptied">onemptied</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onended" title="scripting.attr.onended">onended</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onerror" title="scripting.attr.onerror">onerror</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onfocus" title="scripting.attr.onfocus">onfocus</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onformchange" title="scripting.attr.onformchange">onformchange</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onforminput" title="scripting.attr.onforminput">onforminput</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.oninput" title="scripting.attr.oninput">oninput</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.oninvalid" title="scripting.attr.oninvalid">oninvalid</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onkeydown" title="scripting.attr.onkeydown">onkeydown</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onkeypress" title="scripting.attr.onkeypress">onkeypress</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onkeyup" title="scripting.attr.onkeyup">onkeyup</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onload" title="scripting.attr.onload">onload</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onloadeddata" title="scripting.attr.onloadeddata">onloadeddata</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onloadedmetadata" title="scripting.attr.onloadedmetadata">onloadedmetadata</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onloadstart" title="scripting.attr.onloadstart">onloadstart</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onmousedown" title="scripting.attr.onmousedown">onmousedown</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onmousemove" title="scripting.attr.onmousemove">onmousemove</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onmouseout" title="scripting.attr.onmouseout">onmouseout</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onmouseover" title="scripting.attr.onmouseover">onmouseover</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onmouseup" title="scripting.attr.onmouseup">onmouseup</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onmousewheel" title="scripting.attr.onmousewheel">onmousewheel</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onpause" title="scripting.attr.onpause">onpause</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onplay" title="scripting.attr.onplay">onplay</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onplaying" title="scripting.attr.onplaying">onplaying</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onprogress" title="scripting.attr.onprogress">onprogress</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onratechange" title="scripting.attr.onratechange">onratechange</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onreadystatechange" title="scripting.attr.onreadystatechange">onreadystatechange</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onscroll" title="scripting.attr.onscroll">onscroll</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onseeked" title="scripting.attr.onseeked">onseeked</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onseeking" title="scripting.attr.onseeking">onseeking</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onselect" title="scripting.attr.onselect">onselect</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onshow" title="scripting.attr.onshow">onshow</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onstalled" title="scripting.attr.onstalled">onstalled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onsubmit" title="scripting.attr.onsubmit">onsubmit</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onsuspend" title="scripting.attr.onsuspend">onsuspend</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.ontimeupdate" title="scripting.attr.ontimeupdate">ontimeupdate</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onvolumechange" title="scripting.attr.onvolumechange">onvolumechange</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#scripting.attr.onwaiting" title="scripting.attr.onwaiting">onwaiting</a> </p>
           </div>
         </div>
         <div class="no-number no-toc">
@@ -364,9 +364,9 @@
         <h2 class="common-subhead">7.03. XML attributes <a class="hash" href="#common.attrs.xml">#</a> <a class="toc-bak" href="Overview.html#common.attrs.xml-toc">T</a></h2><div id="common.attrs.xml-mdl">
         
           <div class="attr-content-models">
-            <p><a class="ref" href="common-attributes.html#common.attrs.xmllang" title="common.attrs.xmllang">xml:lang</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.xmlspace" title="common.attrs.xmlspace">xml:space</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.xmlbase" title="common.attrs.xmlbase">xml:base</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </p>
+            <p><a class="ref" href="common-attributes.html#common.attrs.xmllang" title="common.attrs.xmllang">xml:lang</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.xmlspace" title="common.attrs.xmlspace">xml:space</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.xmlbase" title="common.attrs.xmlbase">xml:base</a> </p>
           </div>
         </div>
         <div class="no-number no-toc">

Index: option.html
===================================================================
RCS file: /sources/public/html5/markup/option.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- option.html	3 Feb 2010 14:44:05 -0000	1.36
+++ option.html	4 Feb 2010 15:09:20 -0000	1.37
@@ -19,18 +19,23 @@
     labelled set of options grouped together in an <a href="optgroup.html#optgroup" class="element">optgroup</a>, or an option
     among the list of suggestions in a <a href="datalist.html#datalist" class="element">datalist</a>.</p>
   </div>
-      <div class="no-number no-toc" id="option-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#option-contents">#</a></h2><div class="prose-model">
-    <p>
-    <a href="syntax.html#normal-character-data">Normal character data</a>
+      <div class="no-number no-toc" id="option-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#option-content-model">#</a></h2><div class="content-models">
+        
+      <div id="option-mdls">
+        <p class="elem-mdl">
+      <a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
+        
     </p>
-  </div></div><div class="no-number no-toc" id="option-attr-mdl">
+        </div>
+      </div></div><div class="no-number no-toc" id="option-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#option-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="option.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="option.html#option.attrs.selected" title="option.attrs.selected">selected</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="option.html#option.attrs.label" title="option.attrs.label">label</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="option.html#option.attrs.value" title="option.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="option.html#option.attrs.selected" title="option.attrs.selected">selected</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="option.html#option.attrs.label" title="option.attrs.label">label</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="option.html#option.attrs.value" title="option.attrs.value">value</a> </span></p></div></div>
       <div class="no-number no-toc" id="option-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#option-attributes">#</a></h2>
         <dl class="attr-defs">

Index: label.html
===================================================================
RCS file: /sources/public/html5/markup/label.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- label.html	1 Feb 2010 05:25:02 -0000	1.35
+++ label.html	4 Feb 2010 15:09:20 -0000	1.36
@@ -17,14 +17,21 @@
     <p>The <a href="label.html#label" class="element">label</a> element
     represents a caption for a form control.</p>
   </div>
-      <div class="no-number no-toc" id="label-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#label-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="label-attr-mdl">
+      <div class="no-number no-toc" id="label-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#label-content-model">#</a></h2><div class="content-models">
+        
+      <div id="label-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="label-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#label-attr-mdl">#</a></h2>
         <div class="attr-content-models">
-          <p><span class="pattern" id="label.attrs">(<a class="ref" href="common-attributes.html">common attributes</a>
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="label.html#label.attrs.for" title="label.attrs.for">for</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+          <p><span class="pattern" id="label.attrs"> <span class="agroupof"><a class="ref" href="common-attributes.html">common attributes</a>
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="label.html#label.attrs.for" title="label.attrs.for">for</a> </span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> </span></p></div></div>
       <div class="no-number no-toc" id="label-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#label-attributes">#</a></h2>
         <dl class="attr-defs">

Index: select.html
===================================================================
RCS file: /sources/public/html5/markup/select.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- select.html	3 Feb 2010 14:44:06 -0000	1.33
+++ select.html	4 Feb 2010 15:09:21 -0000	1.34
@@ -18,21 +18,25 @@
     represents a control for selecting among a list of
     options.</p>
   </div>
-      <div class="no-number no-toc" id="select-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#select-contents">#</a></h2><div class="prose-model">
-    <p>Zero or more
-    <a href="option.html#option" class="element">option</a>
-    or
-    <a href="optgroup.html#optgroup" class="element">optgroup</a>
-    elements.</p>
-  </div></div><div class="no-number no-toc" id="select-attr-mdl">
+      <div class="no-number no-toc" id="select-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#select-content-model">#</a></h2><div class="content-models">
+        
+      <div id="select-mdls">
+        <p class="elem-mdl">
+      <span>zero or more </span><a class="ref" href="optgroup.html#optgroup">optgroup</a><span> elements</span>,  
+   <span class="postfix intermixed">intermixed with</span> <span>zero or more </span><a class="ref" href="option.html#option">option</a><span> elements</span> 
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="select-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#select-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="select.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="select.html#select.attrs.size" title="select.attrs.size">size</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="select.html#select.attrs.multiple" title="select.attrs.multiple">multiple</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="select.html#select.attrs.size" title="select.attrs.size">size</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="select.html#select.attrs.multiple" title="select.attrs.multiple">multiple</a> </span></p></div></div>
       <div class="no-number no-toc" id="select-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#select-attributes">#</a></h2>
         <dl class="attr-defs">

Index: noscript.html
===================================================================
RCS file: /sources/public/html5/markup/noscript.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- noscript.html	1 Feb 2010 05:25:03 -0000	1.34
+++ noscript.html	4 Feb 2010 15:09:20 -0000	1.35
@@ -19,21 +19,24 @@
     that don&#8217;t support scripting, by affecting how the document is
     parsed.</p>
   </div>
-      <div class="no-number no-toc" id="noscript-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#noscript-contents">#</a></h2><div class="prose-model">
-    <p>If within a
-    <a href="head.html#head" class="element">head</a>
-    element, in any order, zero or more
-    <a href="link.html#link" class="element">link</a>
-    elements, zero or more
-    <a href="meta.html#meta" class="element">meta</a>
-    elements, and zero or more
-    <a href="style.html#style" class="element">style</a>
-    elements.</p>
-    <p>If not within a
-    <a href="head.html#head" class="element">head</a>
-    element,
-    <a href="terminology.html#transparent">transparent</a>.</p>
-  </div></div><div class="no-number no-toc" id="noscript-attr-mdl">
+      <div class="no-number no-toc" id="noscript-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#noscript-content-model">#</a></h2><div class="content-models">
+        
+      <div id="noscript-mdls">
+        
+        <p class="elem-mdl">
+       <span>zero or more of: </span><span class="agroupof"><span>one </span><a class="ref" href="link.html#link">link</a><span> element</span>, 
+                          <span class="postfix or">or</span> <span>one </span><a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a><span> element</span>, 
+                          <span class="postfix or">or</span> <span>one </span><a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a><span> element</span>, 
+                          <span class="postfix or">or</span> <span>one </span><a class="ref" href="style.html#style">style</a><span> element</span></span>  
+        
+    </p><div class="postfix or">or</div>
+        
+        <p class="elem-mdl"><span class="transparent"><a href="terminology.html#transparent">transparent</a> (<span class="postfix or">either</span> <a href="terminology.html#phrasing-content">phrasing content</a> <span class="postfix or">or</span> <a href="terminology.html#phrasing-content">flow content</a>)</span></p>
+        
+        
+        </div>
+      </div></div><div class="no-number no-toc" id="noscript-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#noscript-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="noscript.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: blockquote.html
===================================================================
RCS file: /sources/public/html5/markup/blockquote.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- blockquote.html	1 Feb 2010 05:25:00 -0000	1.32
+++ blockquote.html	4 Feb 2010 15:09:18 -0000	1.33
@@ -18,13 +18,20 @@
     element represents a section that is quoted from another
     source.</p>
   </div>
-      <div class="no-number no-toc" id="blockquote-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#blockquote-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></div></div><div class="no-number no-toc" id="blockquote-attr-mdl">
+      <div class="no-number no-toc" id="blockquote-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#blockquote-content-model">#</a></h2><div class="content-models">
+        
+      <div id="blockquote-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#flow-content">flow content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="blockquote-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#blockquote-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="blockquote.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="blockquote.html#blockquote.attrs.cite" title="blockquote.attrs.cite">cite</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="blockquote.html#blockquote.attrs.cite" title="blockquote.attrs.cite">cite</a> </span></p></div></div>
       <div class="no-number no-toc" id="blockquote-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#blockquote-attributes">#</a></h2>
         <dl class="attr-defs">

Index: hr.html
===================================================================
RCS file: /sources/public/html5/markup/hr.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- hr.html	3 Feb 2010 14:44:05 -0000	1.32
+++ hr.html	4 Feb 2010 15:09:19 -0000	1.33
@@ -17,7 +17,14 @@
     <p>The <a href="hr.html#hr" class="element">hr</a> element represents
     a paragraph-level thematic break.</p>
   </div>
-      <div class="no-number no-toc" id="hr-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#hr-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="hr-attr-mdl">
+      <div class="no-number no-toc" id="hr-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#hr-content-model">#</a></h2><div class="content-models">
+        
+      <div id="hr-mdls">
+        <p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span> 
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="hr-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#hr-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="hr.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: td.html
===================================================================
RCS file: /sources/public/html5/markup/td.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- td.html	1 Feb 2010 05:25:04 -0000	1.35
+++ td.html	4 Feb 2010 15:09:21 -0000	1.36
@@ -17,15 +17,22 @@
     <p>The <a href="td.html#td" class="element">td</a> element represents
     a data cell in a table.</p>
   </div>
-      <div class="no-number no-toc" id="td-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#td-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></div></div><div class="no-number no-toc" id="td-attr-mdl">
+      <div class="no-number no-toc" id="td-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#td-content-model">#</a></h2><div class="content-models">
+        
+      <div id="td-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#flow-content">flow content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="td-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#td-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="td.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="td.html#td.attrs.colspan" title="td.attrs.colspan">colspan</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="td.html#td.attrs.rowspan" title="td.attrs.rowspan">rowspan</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="td.html#td.attrs.headers" title="td.attrs.headers">headers</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="td.html#td.attrs.colspan" title="td.attrs.colspan">colspan</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="td.html#td.attrs.rowspan" title="td.attrs.rowspan">rowspan</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="td.html#td.attrs.headers" title="td.attrs.headers">headers</a> </span></p></div></div>
       <div class="no-number no-toc" id="td-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#td-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -111,8 +118,7 @@
       </div>
       <div class="no-number no-toc" id="td-context">
         <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#td-context">#</a></h2>
-        <p class="permitted-parents">
-        <span class="context-mdl"><a href="tr.html#tr">tr</a></span></p>
+        <p class="permitted-parents"></p>
       </div>
       
       <div class="no-number no-toc" id="td-display">

Index: em.html
===================================================================
RCS file: /sources/public/html5/markup/em.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- em.html	1 Feb 2010 05:25:00 -0000	1.30
+++ em.html	4 Feb 2010 15:09:18 -0000	1.31
@@ -17,9 +17,16 @@
     <p>The <a href="em.html#em" class="element">em</a> element represents
     a span of text with emphatic stress.</p>
   </div>
-      <div class="no-number no-toc" id="em-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#em-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="em-attr-mdl">
+      <div class="no-number no-toc" id="em-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#em-content-model">#</a></h2><div class="content-models">
+        
+      <div id="em-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="em-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#em-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="em.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: figure.html
===================================================================
RCS file: /sources/public/html5/markup/figure.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- figure.html	3 Feb 2010 14:44:05 -0000	1.18
+++ figure.html	4 Feb 2010 15:09:19 -0000	1.19
@@ -21,25 +21,19 @@
     can be moved away from the main flow of the document without
     affecting the document&#8217;s meaning.</p>
   </div>
-      <div class="no-number no-toc" id="figure-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#figure-contents">#</a></h2><div class="prose-model">
-  <p>Exactly one of the following two choices:</p>
-  <ul>
-    <li>A single
-    <a href="figcaption.html#figcaption" class="element">figcaption</a>
-    element, followed by
-    <a href="common-models.html#common.elem.flow">flow elements</a>
-    and
-    <a href="syntax.html#normal-character-data">normal character data</a>
-    </li>
-    <li>Or,
-    <a href="common-models.html#common.elem.flow">flow elements</a>
-    and
-    <a href="syntax.html#normal-character-data">normal character data</a>,
-    optionally followed by a single
-    <a href="figcaption.html#figcaption" class="element">figcaption</a>
-    element</li>
-  </ul>
-  </div></div><div class="no-number no-toc" id="figure-attr-mdl">
+      <div class="no-number no-toc" id="figure-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#figure-content-model">#</a></h2><div class="content-models">
+        
+      <div id="figure-mdls">
+        <p class="elem-mdl">
+       <span class="agroupof"><span>one </span><a class="ref" href="figcaption.html#figcaption">figcaption</a><span> element</span>,  <span class="postfix followedby">followed by</span> 
+                         <a href="terminology.html#flow-content">flow content</a></span>
+   <span class="postfix or">or</span>  <span class="agroupof"><a href="terminology.html#flow-content">flow content</a> <span class="postfix followedby">followed by</span> 
+                                                             <span>an optional </span><a class="ref" href="figcaption.html#figcaption">figcaption</a><span> element</span> </span>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="figure-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#figure-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="figure.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: input.hidden.html
===================================================================
RCS file: /sources/public/html5/markup/input.hidden.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- input.hidden.html	1 Feb 2010 05:25:01 -0000	1.32
+++ input.hidden.html	4 Feb 2010 15:09:19 -0000	1.33
@@ -20,15 +20,23 @@
     represents a value that is not intended to be examined or
     manipulated by the user.</p>
   </div>
-      <div class="no-number no-toc" id="input.hidden-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.hidden-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.hidden-attr-mdl">
+      <div class="no-number no-toc" id="input.hidden-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#input.hidden-content-model">#</a></h2><div class="content-models">
+        
+      <div id="input.hidden-mdls">
+        <p class="elem-mdl">
+      <a class="ref" href="input.hidden.html#input.hidden.attrs">input.hidden.attrs</a>
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="input.hidden-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.hidden-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="input.hidden.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.hidden.html#input.hidden.attrs.type" title="input.hidden.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.hidden.html#input.hidden.attrs.value" title="input.hidden.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.hidden.html#input.hidden.attrs.type" title="input.hidden.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.hidden.html#input.hidden.attrs.value" title="input.hidden.attrs.value">value</a> </span></p></div></div>
       <div class="no-number no-toc" id="input.hidden-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.hidden-attributes">#</a></h2>
         <dl class="attr-defs">

Index: caption.html
===================================================================
RCS file: /sources/public/html5/markup/caption.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- caption.html	1 Feb 2010 05:25:00 -0000	1.31
+++ caption.html	4 Feb 2010 15:09:18 -0000	1.32
@@ -17,9 +17,16 @@
     <p>The <a href="caption.html#caption" class="element">caption</a> element
     represents the title of the <a href="table.html#table" class="element">table</a> that is its parent.</p>
   </div>
-      <div class="no-number no-toc" id="caption-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#caption-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></div></div><div class="no-number no-toc" id="caption-attr-mdl">
+      <div class="no-number no-toc" id="caption-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#caption-content-model">#</a></h2><div class="content-models">
+        
+      <div id="caption-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#flow-content">flow content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="caption-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#caption-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="caption.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: style.css
===================================================================
RCS file: /sources/public/html5/markup/style.css,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- style.css	3 Feb 2010 14:44:06 -0000	1.90
+++ style.css	4 Feb 2010 15:09:21 -0000	1.91
@@ -31,19 +31,23 @@
   margin-left: 20px;
 }
 
-.content-models,
+.content-models {
+  padding-left: 1em;
+}
+.content-models p {
+  margin-top: 6px;
+  margin-bottom: 6px;
+}
 .attr-content-models {
   border: 1px dotted black;
   padding: 6px;
   background-color: #eee;
 }
 
-.content-models,
 .attr-content-models,
 .attr-defs {
   margin-top: 4px;
 }
-.content-models p,
 .attr-content-models p {
   margin-top: 4px;
   margin-bottom: 6px;
@@ -110,6 +114,10 @@
   color: green;
 }
 
+a.attribute {
+  color: green !important;
+}
+
 .equals-value,
 a .equals-value {
   color: rgb(255, 20, 147);
@@ -506,9 +514,17 @@
 }
 .postfix {
   text-decoration: none;
+}
+.postfix.or {
   color: #999;
   font-weight: bold;
 }
+.postfix.followedby {
+  color: #666;
+}
+.postfix.intermixed {
+  color: #777;
+}
 .postfix.required {
   padding-left: 3px;
   color: goldenrod !important;
@@ -585,3 +601,92 @@
 .warning .admonition-marker {
   font-weight: bold;
 }
+.content-models .agroupof {
+  padding: 2px;
+  padding-top: 11px;
+  padding-bottom: 11px;
+  padding-left: 6px;
+  padding-right: 6px;
+  border: 1px solid #ccc;
+  background-color: #eee;
+  -webkit-border-radius: 8px;
+  -webkit-box-shadow: 4px 4px 4px #888;
+}
+.content-models .agroupof .agroupof{
+  padding-top: 6px;
+  padding-bottom: 6px;
+  border: 2px solid #ccc;
+}
+.content-models .agroupof .agroupof .agroupof {
+  padding: 2px;
+  padding-left: 6px;
+  border: 2px solid #ccc;
+}
+
+.attr-content-models .agroupof {
+  padding: 2px;
+  padding-left: 6px;
+  border: 2px solid #ccc;
+  -webkit-border-radius: 8px;
+  -webkit-box-shadow: 4px 4px 4px #888;
+}
+
+.agroupof + * {
+  padding-left: 6px;
+}
+
+#command .elem-mdl::first-letter,
+#button .elem-mdl::first-letter
+{
+  text-transform: none;
+}
+
+.elem-mdl::first-letter {
+  text-transform: uppercase;
+}
+
+.elem-mdl > *:last-child:after {
+  content: ".";
+  text-decoration: none !important;
+}
+
+#input .elem-mdl > *:last-child:after,
+#table .elem-mdl > *:last-child:after,
+#dl .elem-mdl > *:last-child:after,
+#figure .elem-mdl > *:last-child:after,
+#hgroup .elem-mdl > *:last-child:after
+{
+  content: "";
+}
+
+#area-attr-mdl,
+#dl-content-model,
+#figure-content-model,
+#table-content-model,
+#hgroup-content-model
+{
+  line-height: 200%;
+}
+
+#hgroup-mdls .agroupof {
+  display: block;
+  margin-right: 20%;
+}
+#table-mdls .agroupof {
+  display: block;
+  margin-right: 50%;
+}
+#table-mdls .agroupof .agroupof {
+  display: block;
+  margin-right: 0;
+}
+#table-mdls > .elem-mdl > .agroupof {
+  background-color: inherit;
+  display: block;
+  padding: 2px;
+  padding-left: 6px;
+  border: none;
+  -webkit-border-radius: none;
+  -webkit-box-shadow: none;
+}
+

Index: kbd.html
===================================================================
RCS file: /sources/public/html5/markup/kbd.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- kbd.html	1 Feb 2010 05:25:02 -0000	1.31
+++ kbd.html	4 Feb 2010 15:09:20 -0000	1.32
@@ -17,9 +17,16 @@
     <p>The <a href="kbd.html#kbd" class="element">kbd</a> element
     represents user input.</p>
   </div>
-      <div class="no-number no-toc" id="kbd-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#kbd-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="kbd-attr-mdl">
+      <div class="no-number no-toc" id="kbd-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#kbd-content-model">#</a></h2><div class="content-models">
+        
+      <div id="kbd-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="kbd-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#kbd-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="kbd.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: base.html
===================================================================
RCS file: /sources/public/html5/markup/base.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- base.html	2 Feb 2010 05:22:34 -0000	1.32
+++ base.html	4 Feb 2010 15:09:18 -0000	1.33
@@ -20,12 +20,19 @@
     <a href="terminology.html#context">browsing context</a> name
     for the purposes of following hyperlinks.</p>
   </div>
-      <div class="no-number no-toc" id="base-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#base-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="base-attr-mdl">
+      <div class="no-number no-toc" id="base-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#base-content-model">#</a></h2><div class="content-models">
+        
+      <div id="base-mdls">
+        <p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span> 
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="base-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#base-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="base.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="base.html#base.attrs.href" title="base.attrs.href">href</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="base.html#base.attrs.target" title="base.attrs.target">target</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="base.html#base.attrs.href" title="base.attrs.href">href</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="base.html#base.attrs.target" title="base.attrs.target">target</a> </span></p></div></div>
       <div class="no-number no-toc" id="base-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#base-attributes">#</a></h2>
         <dl class="attr-defs">

Index: canvas.html
===================================================================
RCS file: /sources/public/html5/markup/canvas.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- canvas.html	3 Feb 2010 14:44:04 -0000	1.31
+++ canvas.html	4 Feb 2010 15:09:18 -0000	1.32
@@ -19,12 +19,21 @@
     used for dynamically rendering of images such as game
     graphics, graphs, or other images.</p>
   </div>
-      <div class="no-number no-toc" id="canvas-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#canvas-contents">#</a></h2><div class="prose-model"><div id="prose-model"><p><a href="terminology.html#transparent">transparent</a></p></div></div></div><div class="no-number no-toc" id="canvas-attr-mdl">
+      <div class="no-number no-toc" id="canvas-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#canvas-content-model">#</a></h2><div class="content-models">
+        
+      <div id="canvas-mdls">
+        
+        <p class="elem-mdl"><span class="transparent"><a href="terminology.html#transparent">transparent</a> (<span class="postfix or">either</span> <a href="terminology.html#phrasing-content">phrasing content</a> <span class="postfix or">or</span> <a href="terminology.html#phrasing-content">flow content</a>)</span></p>
+        
+        
+        </div>
+      </div></div><div class="no-number no-toc" id="canvas-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#canvas-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="canvas.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="canvas.html#canvas.attrs.height" title="canvas.attrs.height">height</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="canvas.html#canvas.attrs.width" title="canvas.attrs.width">width</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="canvas.html#canvas.attrs.height" title="canvas.attrs.height">height</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="canvas.html#canvas.attrs.width" title="canvas.attrs.width">width</a> </span></p></div></div>
       <div class="no-number no-toc" id="canvas-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#canvas-attributes">#</a></h2>
         <dl class="attr-defs">

Index: input.search.html
===================================================================
RCS file: /sources/public/html5/markup/input.search.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- input.search.html	3 Feb 2010 14:44:05 -0000	1.35
+++ input.search.html	4 Feb 2010 15:09:20 -0000	1.36
@@ -20,24 +20,32 @@
     a one-line plain-text edit control for entering one or more
     search terms.</p>
   </div>
-      <div class="no-number no-toc" id="input.search-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.search-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.search-attr-mdl">
+      <div class="no-number no-toc" id="input.search-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#input.search-content-model">#</a></h2><div class="content-models">
+        
+      <div id="input.search-mdls">
+        <p class="elem-mdl">
+      <a class="ref" href="input.search.html#input.search.attrs">input.search.attrs</a>
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="input.search-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.search-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="input.search.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.search.html#input.search.attrs.type" title="input.search.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.search.html#input.search.attrs.value" title="input.search.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.search.html#input.search.attrs.type" title="input.search.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.search.html#input.search.attrs.value" title="input.search.attrs.value">value</a> </span></p></div></div>
       <div class="no-number no-toc" id="input.search-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.search-attributes">#</a></h2>
         <dl class="attr-defs">

Index: tfoot.html
===================================================================
RCS file: /sources/public/html5/markup/tfoot.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- tfoot.html	1 Feb 2010 05:25:04 -0000	1.28
+++ tfoot.html	4 Feb 2010 15:09:22 -0000	1.29
@@ -18,11 +18,16 @@
     represents the block of rows that consist of the column
     summaries (footers) for its parent <a href="table.html#table" class="element">table</a> element.</p>
   </div>
-      <div class="no-number no-toc" id="tfoot-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#tfoot-contents">#</a></h2><div class="prose-model">
-    <p>Zero or more
-    <a href="tr.html#tr" class="element">tr</a>
-    elements</p>
-  </div></div><div class="no-number no-toc" id="tfoot-attr-mdl">
+      <div class="no-number no-toc" id="tfoot-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#tfoot-content-model">#</a></h2><div class="content-models">
+        
+      <div id="tfoot-mdls">
+        <p class="elem-mdl">
+      <span>zero or more </span><a class="ref" href="tr.html#tr">tr</a><span> elements</span> 
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="tfoot-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#tfoot-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="tfoot.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>
@@ -60,8 +65,7 @@
       </div>
       <div class="no-number no-toc" id="tfoot-context">
         <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#tfoot-context">#</a></h2>
-        <p class="permitted-parents">
-        <span class="context-mdl"><a href="table.html#table">table</a></span></p>
+        <p class="permitted-parents"></p>
       </div>
       
       <div class="no-number no-toc" id="tfoot-display">

Index: rt.html
===================================================================
RCS file: /sources/public/html5/markup/rt.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- rt.html	3 Feb 2010 14:44:06 -0000	1.32
+++ rt.html	4 Feb 2010 15:09:21 -0000	1.33
@@ -17,9 +17,16 @@
     <p>The <a href="rt.html#rt" class="element">rt</a> element marks the
     ruby text component of a ruby annotation.</p>
   </div>
-      <div class="no-number no-toc" id="rt-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#rt-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="rt-attr-mdl">
+      <div class="no-number no-toc" id="rt-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#rt-content-model">#</a></h2><div class="content-models">
+        
+      <div id="rt-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="rt-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#rt-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="rt.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>
@@ -38,8 +45,7 @@
       </div>
       <div class="no-number no-toc" id="rt-context">
         <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#rt-context">#</a></h2>
-        <p class="permitted-parents">
-        <span class="context-mdl"><a href="ruby.html#ruby">ruby</a></span></p>
+        <p class="permitted-parents"></p>
       </div>
       
       <div class="no-number no-toc" id="rt-display">

Index: fieldset.html
===================================================================
RCS file: /sources/public/html5/markup/fieldset.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- fieldset.html	2 Feb 2010 05:22:34 -0000	1.34
+++ fieldset.html	4 Feb 2010 15:09:19 -0000	1.35
@@ -17,21 +17,23 @@
     <p>The <code><a href="fieldset.html#fieldset" class="element">fieldset</a></code> element represents a
     set of form controls grouped under a common name.</p>
   </div>
-      <div class="no-number no-toc" id="fieldset-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#fieldset-contents">#</a></h2><div class="prose-model">
-    <p>Optionally, a
-    <a href="legend.html#legend" class="element">legend</a>
-    element, followed by
-    <a href="common-models.html#common.elem.flow">flow elements</a>
-    and
-    <a href="syntax.html#normal-character-data">normal character data</a>
+      <div class="no-number no-toc" id="fieldset-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#fieldset-content-model">#</a></h2><div class="content-models">
+        
+      <div id="fieldset-mdls">
+        <p class="elem-mdl">
+      <span>an optional </span><a class="ref" href="legend.html#legend">legend</a><span> element</span>,   <span class="postfix followedby">followed by</span> 
+  <a href="terminology.html#flow-content">flow content</a>
+        
     </p>
-  </div></div><div class="no-number no-toc" id="fieldset-attr-mdl">
+        </div>
+      </div></div><div class="no-number no-toc" id="fieldset-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#fieldset-attr-mdl">#</a></h2>
         <div class="attr-content-models">
-          <p><span class="pattern" id="fieldset.attrs">(<a class="ref" href="common-attributes.html">common attributes</a>)
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+          <p><span class="pattern" id="fieldset.attrs"> <a class="ref" href="common-attributes.html">common attributes</a>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> </span></p></div></div>
       
       
       <div class="no-number no-toc tag-omission" id="fieldset-tags">

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- spec.html	3 Feb 2010 14:44:06 -0000	1.149
+++ spec.html	4 Feb 2010 15:09:21 -0000	1.150
@@ -10,7 +10,7 @@
 <div class="head">
 <div><a href="http://www.w3.org/"><img src="http://www.w3.org/Icons/w3c_home" width="72" height="48" alt="W3C"></a></div>
 <h1>HTML: The Markup Language</h1>
-<h2>W3C Editor&#8217;s Draft <em>3 February 2010</em>
+<h2>W3C Editor&#8217;s Draft <em>4 February 2010</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -49,7 +49,7 @@
           reports index</a> at http://www.w3.org/TR/.
       </em></p>
[...5444 lines suppressed...]
           with the additional constraint that the
           <i>CFWS</i> production is excluded everywhere.</li>
           <li>A
           "<code title="U+0040 COMMERCIAL AT">@</code>"
           character.</li>
           <li>A
-          <a href="#data-dot-atom">dot-atom</a>,
+          <span>one </span><a href="#data-dot-atom">dot-atom</a><span> element</span>, ,
           with the additional constraint that the
           <i>CFWS</i> production is excluded everywhere.</li>
         </ol>
@@ -15961,7 +16701,7 @@
           <div>
 <span class="common-pattern-name"><dfn id="form.data.emailaddresslist">emailaddresslist</dfn></span><code class="punc"> = </code> <a href="#form.data.emailaddresslist" class="hash">#</a>
 </div>
-      <div class="datatype-desc">A set of comma-separated <a href="#data-token">tokens</a>, each of which is a valid
+      <div class="datatype-desc">A set of comma-separated <span>one </span><a href="#data-token">tokens</a><span> element</span>, , each of which is a valid
       <a href="#form.data.emailaddress">emailaddress</a>.</div>
     </div>
       </div>

Index: datalist.html
===================================================================
RCS file: /sources/public/html5/markup/datalist.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- datalist.html	3 Feb 2010 14:44:04 -0000	1.36
+++ datalist.html	4 Feb 2010 15:09:18 -0000	1.37
@@ -19,15 +19,17 @@
     set of <a href="option.html#option" class="element">option</a> elements
     that represent predefined options for other controls.</p>
   </div>
-      <div class="no-number no-toc" id="datalist-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#datalist-contents">#</a></h2><div class="prose-model">
-    <p>Zero or more
-    <a href="option.html#option" class="element">option</a>
-    elements intermixed with
-    <a href="common-models.html#common.elem.phrasing">phrasing elements</a>
-    and
-    <a href="syntax.html#normal-character-data">normal character data</a>
+      <div class="no-number no-toc" id="datalist-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#datalist-content-model">#</a></h2><div class="content-models">
+        
+      <div id="datalist-mdls">
+        <p class="elem-mdl">
+      <span>zero or more </span><a class="ref" href="option.html#option">option</a><span> elements</span>,  
+   <span class="postfix intermixed">intermixed with</span> <a href="terminology.html#phrasing-content">phrasing content</a>
+        
     </p>
-  </div></div><div class="no-number no-toc" id="datalist-attr-mdl">
+        </div>
+      </div></div><div class="no-number no-toc" id="datalist-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#datalist-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="datalist.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: h1.html
===================================================================
RCS file: /sources/public/html5/markup/h1.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- h1.html	1 Feb 2010 05:25:01 -0000	1.34
+++ h1.html	4 Feb 2010 15:09:19 -0000	1.35
@@ -17,9 +17,16 @@
     <p>The <a href="h1.html#h1" class="element">h1</a> through <a href="h6.html#h6" class="element">h6</a> elements are headings for
     the sections with which they are associated.</p>
   </div>
-      <div class="no-number no-toc" id="h1-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#h1-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="h1-attr-mdl">
+      <div class="no-number no-toc" id="h1-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#h1-content-model">#</a></h2><div class="content-models">
+        
+      <div id="h1-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="h1-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#h1-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="h1.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>
@@ -50,8 +57,7 @@
         <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#h1-context">#</a></h2>
         <p class="permitted-parents">
         <span class="context-mdl"><span>Any element that can contain
-            <a href="common-models.html#common.elem.flow">flow elements</a></span></span>, 
-        <span class="context-mdl"><a href="hgroup.html#hgroup">hgroup</a></span></p>
+            <a href="common-models.html#common.elem.flow">flow elements</a></span></span></p>
       </div>
       
       <div class="no-number no-toc" id="h1-display">

Index: h3.html
===================================================================
RCS file: /sources/public/html5/markup/h3.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- h3.html	1 Feb 2010 05:25:01 -0000	1.35
+++ h3.html	4 Feb 2010 15:09:19 -0000	1.36
@@ -17,9 +17,16 @@
     <p>The <a href="h1.html#h1" class="element">h1</a> through <a href="h6.html#h6" class="element">h6</a> elements are headings for
     the sections with which they are associated.</p>
   </div>
-      <div class="no-number no-toc" id="h3-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#h3-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="h3-attr-mdl">
+      <div class="no-number no-toc" id="h3-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#h3-content-model">#</a></h2><div class="content-models">
+        
+      <div id="h3-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="h3-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#h3-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="h3.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>
@@ -50,8 +57,7 @@
         <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#h3-context">#</a></h2>
         <p class="permitted-parents">
         <span class="context-mdl"><span>Any element that can contain
-            <a href="common-models.html#common.elem.flow">flow elements</a></span></span>, 
-        <span class="context-mdl"><a href="hgroup.html#hgroup">hgroup</a></span></p>
+            <a href="common-models.html#common.elem.flow">flow elements</a></span></span></p>
       </div>
       
       <div class="no-number no-toc" id="h3-display">

Index: optgroup.html
===================================================================
RCS file: /sources/public/html5/markup/optgroup.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- optgroup.html	1 Feb 2010 05:25:03 -0000	1.29
+++ optgroup.html	4 Feb 2010 15:09:20 -0000	1.30
@@ -17,16 +17,21 @@
     <p>The <a href="optgroup.html#optgroup" class="element">optgroup</a>
     element represents a group of <a href="option.html#option" class="element">option</a> elements with a common label.</p>
   </div>
-      <div class="no-number no-toc" id="optgroup-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#optgroup-contents">#</a></h2><div class="prose-model">
-    <p>Zero or more
-    <a href="option.html#option" class="element">option</a>
-    elements</p>
-  </div></div><div class="no-number no-toc" id="optgroup-attr-mdl">
+      <div class="no-number no-toc" id="optgroup-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#optgroup-content-model">#</a></h2><div class="content-models">
+        
+      <div id="optgroup-mdls">
+        <p class="elem-mdl">
+      <span>zero or more </span><a class="ref" href="option.html#option">option</a><span> elements</span> 
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="optgroup-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#optgroup-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="optgroup.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="optgroup.html#optgroup.attrs.label" title="optgroup.attrs.label">label</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="optgroup.html#optgroup.attrs.label" title="optgroup.attrs.label">label</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> </span></p></div></div>
       <div class="no-number no-toc" id="optgroup-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#optgroup-attributes">#</a></h2>
         <dl class="attr-defs">

Index: input.week.html
===================================================================
RCS file: /sources/public/html5/markup/input.week.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- input.week.html	3 Feb 2010 14:44:05 -0000	1.33
+++ input.week.html	4 Feb 2010 15:09:20 -0000	1.34
@@ -20,23 +20,31 @@
     a control for setting the element&#8217;s value to a string
     representing a week.</p>
   </div>
-      <div class="no-number no-toc" id="input.week-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.week-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.week-attr-mdl">
+      <div class="no-number no-toc" id="input.week-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#input.week-content-model">#</a></h2><div class="content-models">
+        
+      <div id="input.week-mdls">
+        <p class="elem-mdl">
+      <a class="ref" href="input.week.html#input.week.attrs">input.week.attrs</a>
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="input.week-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.week-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="input.week.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.week.html#input.week.attrs.type" title="input.week.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.week.html#input.week.attrs.min" title="input.week.attrs.min">min</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.week.html#input.week.attrs.max" title="input.week.attrs.max">max</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.step.integer" title="input.attrs.step.integer">step.integer</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.week.html#input.week.attrs.value" title="input.week.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.week.html#input.week.attrs.type" title="input.week.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.week.html#input.week.attrs.min" title="input.week.attrs.min">min</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.week.html#input.week.attrs.max" title="input.week.attrs.max">max</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.step.integer" title="input.attrs.step.integer">step.integer</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.week.html#input.week.attrs.value" title="input.week.attrs.value">value</a> </span></p></div></div>
       <div class="no-number no-toc" id="input.week-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.week-attributes">#</a></h2>
         <dl class="attr-defs">

Index: button.button.html
===================================================================
RCS file: /sources/public/html5/markup/button.button.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- button.button.html	1 Feb 2010 05:25:00 -0000	1.37
+++ button.button.html	4 Feb 2010 15:09:18 -0000	1.38
@@ -19,18 +19,25 @@
     value is "<code>button</code>" represents a button with no
     additional semantics.</p>
   </div>
-      <div class="no-number no-toc" id="button.button-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#button.button-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="button.button-attr-mdl">
+      <div class="no-number no-toc" id="button.button-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#button.button-content-model">#</a></h2><div class="content-models">
+        
+      <div id="button.button-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#flow-content">flow content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="button.button-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#button.button-attr-mdl">#</a></h2>
         <div class="attr-content-models">
-          <p><span class="pattern" id="button.button.attrs">(<a class="ref" href="common-attributes.html">common attributes</a>
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="button.button.html#button.button.attrs.type" title="button.button.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="button.button.html#button.button.attrs.value" title="button.button.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+          <p><span class="pattern" id="button.button.attrs"> <a class="ref" href="common-attributes.html">common attributes</a>
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="button.button.html#button.button.attrs.type" title="button.button.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="button.button.html#button.button.attrs.value" title="button.button.attrs.value">value</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> </span></p></div></div>
       <div class="no-number no-toc" id="button.button-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#button.button-attributes">#</a></h2>
         <dl class="attr-defs">

Index: form.html
===================================================================
RCS file: /sources/public/html5/markup/form.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- form.html	3 Feb 2010 14:44:05 -0000	1.37
+++ form.html	4 Feb 2010 15:09:19 -0000	1.38
@@ -17,20 +17,27 @@
     <p>The <a href="form.html#form" class="element">form</a> element
     represents a user-submittable form.</p>
   </div>
-      <div class="no-number no-toc" id="form-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#form-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></div></div><div class="no-number no-toc" id="form-attr-mdl">
+      <div class="no-number no-toc" id="form-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#form-content-model">#</a></h2><div class="content-models">
+        
+      <div id="form-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#flow-content">flow content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="form-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#form-attr-mdl">#</a></h2>
         <div class="attr-content-models">
-          <p><span class="pattern" id="form.attrs">(<a class="ref" href="common-attributes.html">common attributes</a>
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="form.html#form.attrs.action" title="form.attrs.action">action</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="form.html#form.attrs.method" title="form.attrs.method">method</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="form.html#form.attrs.enctype" title="form.attrs.enctype">enctype</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="form.html#form.attrs.accept-charset" title="form.attrs.accept-charset">accept-charset</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )
-   <span class="postfix &amp;">&amp;</span> (<a class="ref" href="form.html#form.attrs.novalidate" title="form.attrs.novalidate">novalidate</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="form.html#form.attrs.target" title="form.attrs.target">target</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="form.html#form.attrs.autocomplete" title="form.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )</span></p></div></div>
+          <p><span class="pattern" id="form.attrs"> <span class="agroupof"><a class="ref" href="common-attributes.html">common attributes</a>
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="form.html#form.attrs.action" title="form.attrs.action">action</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="form.html#form.attrs.method" title="form.attrs.method">method</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="form.html#form.attrs.enctype" title="form.attrs.enctype">enctype</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="form.html#form.attrs.accept-charset" title="form.attrs.accept-charset">accept-charset</a> </span>
+   <span class="postfix intermixed">&amp;</span>  <span class="agroupof"><a class="ref" href="form.html#form.attrs.novalidate" title="form.attrs.novalidate">novalidate</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="form.html#form.attrs.target" title="form.attrs.target">target</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="form.html#form.attrs.autocomplete" title="form.attrs.autocomplete">autocomplete</a> </span></span></p></div></div>
       <div class="no-number no-toc" id="form-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#form-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -39,15 +46,15 @@
     </span> </dt>
             <dd>The submission action for the form.</dd>
           
-            <dt><a class="attribute-name" id="form.attrs.method" title="form.attrs.method" href="form.html#form.attrs.method">method</a> = <span class="attr-values">( "get"
-    <span class="postfix or">or</span>  "post")
-   <span class="postfix or">or</span> ( "put"
-                                        <span class="postfix or">or</span>  "delete")</span> </dt>
+            <dt><a class="attribute-name" id="form.attrs.method" title="form.attrs.method" href="form.html#form.attrs.method">method</a> = <span class="attr-values"> <span class="agroupof"> "get"
+                          <span class="postfix or">or</span>  "post"</span>
+   <span class="postfix or">or</span>  <span class="agroupof"> "put"
+                                                              <span class="postfix or">or</span>  "delete"</span></span> </dt>
             <dd>The HTTP method with which a UA is meant to associate
         this element for form submission.</dd>
           
-            <dt><a class="attribute-name" id="form.attrs.enctype" title="form.attrs.enctype" href="form.html#form.attrs.enctype">enctype</a> = <span class="attr-values">( "application/x-www-form-urlencoded"
-    <span class="postfix or">or</span>  "multipart/form-data")
+            <dt><a class="attribute-name" id="form.attrs.enctype" title="form.attrs.enctype" href="form.html#form.attrs.enctype">enctype</a> = <span class="attr-values"> <span class="agroupof"> "application/x-www-form-urlencoded"
+                          <span class="postfix or">or</span>  "multipart/form-data"</span>
    <span class="postfix or">or</span>  "text/plain"</span> </dt>
             <dd>A MIME type with which a UA is meant to associate the
         form contents for form submission.</dd>

Index: small.html
===================================================================
RCS file: /sources/public/html5/markup/small.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- small.html	3 Feb 2010 14:44:06 -0000	1.32
+++ small.html	4 Feb 2010 15:09:21 -0000	1.33
@@ -18,9 +18,16 @@
     represents so-called &#8220;small print&#8221; such as legal disclaimers
     and caveats.</p>
   </div>
-      <div class="no-number no-toc" id="small-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#small-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="small-attr-mdl">
+      <div class="no-number no-toc" id="small-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#small-content-model">#</a></h2><div class="content-models">
+        
+      <div id="small-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="small-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#small-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="small.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: ruby.html
===================================================================
RCS file: /sources/public/html5/markup/ruby.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- ruby.html	3 Feb 2010 14:44:06 -0000	1.32
+++ ruby.html	4 Feb 2010 15:09:21 -0000	1.33
@@ -17,25 +17,20 @@
     <p>The <a href="ruby.html#ruby" class="element">ruby</a> element allows
     spans of phrasing content to be marked with ruby annotations.</p>
   </div>
-      <div class="no-number no-toc" id="ruby-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#ruby-contents">#</a></h2><div class="prose-model">
-    <p>One or more groups of the following:
-    <a href="common-models.html#common.elem.phrasing">phrasing elements</a>
-    and
-    <a href="syntax.html#normal-character-data">normal character data</a>
-    followed by either:</p>
-    <ul>
-      <li>a single
-      <a href="rt.html#rt" class="element">rt</a>
-      element</li>
-      <li>or, an
-      <a href="rp.html#rp" class="element">rp</a>
-      element, followed by an
-      <a href="rt.html#rt" class="element">rt</a>
-      element, followed by another
-      <a href="rp.html#rp" class="element">rp</a>
-      </li>
-    </ul>
-  </div></div><div class="no-number no-toc" id="ruby-attr-mdl">
+      <div class="no-number no-toc" id="ruby-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#ruby-content-model">#</a></h2><div class="content-models">
+        
+      <div id="ruby-mdls">
+        <p class="elem-mdl">
+       <span>one or more of: </span><span class="agroupof"><a href="terminology.html#phrasing-content">phrasing content</a> <span class="postfix followedby">followed by</span> 
+                          <span class="agroupof"><span>one </span><a class="ref" href="rt.html#rt">rt</a><span> element</span>, 
+                                                 <span class="postfix or">or</span>  <span class="agroupof"><span>one </span><a class="ref" href="rp.html#rp">rp</a><span> element</span>,  <span class="postfix followedby">followed by</span> 
+                                                                                                           <span>one </span><a class="ref" href="rt.html#rt">rt</a><span> element</span>,  <span class="postfix followedby">followed by</span> 
+                                                                                                           <span>one </span><a class="ref" href="rp.html#rp">rp</a><span> element</span></span></span></span>  
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="ruby-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#ruby-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="ruby.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: ol.html
===================================================================
RCS file: /sources/public/html5/markup/ol.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ol.html	3 Feb 2010 14:44:05 -0000	1.31
+++ ol.html	4 Feb 2010 15:09:20 -0000	1.32
@@ -19,16 +19,21 @@
     items are intentionally ordered, such that changing the order
     would change the meaning of the list.</p>
   </div>
-      <div class="no-number no-toc" id="ol-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#ol-contents">#</a></h2><div class="prose-model">
-    <p>Zero or more
-    <a href="li.html#li" class="element">li</a>
-    elements</p>
-  </div></div><div class="no-number no-toc" id="ol-attr-mdl">
+      <div class="no-number no-toc" id="ol-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#ol-content-model">#</a></h2><div class="content-models">
+        
+      <div id="ol-mdls">
+        <p class="elem-mdl">
+      <span>zero or more </span><a class="ref" href=".html#oli">li</a><span> elements</span> 
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="ol-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#ol-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="ol.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="ol.html#ol.attrs.start" title="ol.attrs.start">start</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="ol.html#ol.attrs.reversed" title="ol.attrs.reversed">reversed</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="ol.html#ol.attrs.start" title="ol.attrs.start">start</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="ol.html#ol.attrs.reversed" title="ol.attrs.reversed">reversed</a> </span></p></div></div>
       <div class="no-number no-toc" id="ol-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#ol-attributes">#</a></h2>
         <dl class="attr-defs">

Index: article.html
===================================================================
RCS file: /sources/public/html5/markup/article.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- article.html	1 Feb 2010 05:24:59 -0000	1.36
+++ article.html	4 Feb 2010 15:09:17 -0000	1.37
@@ -19,9 +19,17 @@
     of a document or site; for example, a magazine or newspaper
     article, or a blog entry.</p>
   </div>
-      <div class="no-number no-toc" id="article-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#article-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></div></div><div class="no-number no-toc" id="article-attr-mdl">
+      <div class="no-number no-toc" id="article-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#article-content-model">#</a></h2><div class="content-models">
+        
+      <div id="article-mdls">
+        <p class="elem-mdl">
+      <span>zero or more </span><a class="ref" href="style.html#style">style</a><span> elements</span>,   <span class="postfix followedby">followed by</span> 
+  <a href="terminology.html#flow-content">flow content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="article-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#article-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="article.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: colgroup.html
===================================================================
RCS file: /sources/public/html5/markup/colgroup.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- colgroup.html	1 Feb 2010 05:25:00 -0000	1.31
+++ colgroup.html	4 Feb 2010 15:09:18 -0000	1.32
@@ -18,18 +18,19 @@
     element represents a group of one or more columns in the <a href="table.html#table" class="element">table</a> that is its
     parent.</p>
   </div>
-      <div class="no-number no-toc" id="colgroup-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#colgroup-contents">#</a></h2><div class="prose-model">
-    <p>If the element does not have a
-    <a href="colgroup.html#colgroup.attrs.span" class="attribute">span</a>
-    attribute, zero or more
-    <a href="col.html#col" class="element">col</a>
-    elements.</p>
-    <p>If the element has a
-    <a href="colgroup.html#colgroup.attrs.span" class="attribute">span</a>
-    attribute, empty.</p>
-  </div></div><div class="no-number no-toc" id="colgroup-attr-mdl">
+      <div class="no-number no-toc" id="colgroup-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#colgroup-content-model">#</a></h2><div class="content-models">
+        
+      <div id="colgroup-mdls">
+        <p class="elem-mdl">
+      <span>zero or more </span><a class="ref" href="col.html#col">col</a><span> elements</span>,  
+   <span class="postfix or">or</span> <span>an optional </span><a href="colgroup.html#colgroup.attrs.span" class="attribute">span</a><span> attribute</span> 
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="colgroup-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#colgroup-attr-mdl">#</a></h2>
-        <div class="attr-content-models"><div class="attr-content-model"><a class="ref" href="common-attributes.html">common attributes</a></div><div class="attr-content-model"><a href="colgroup.html#colgroup.attrs.span">span</a><span class="postfix required" title="REQUIRED">&#9733;</span></div></div></div>
+        <div class="attr-content-models"><p><span class="pattern" id="colgroup.attrs"><a href="common-attributes.html">common attributes</a> <span class="postfix intermixed">&amp;</span>  <a href="colgroup.html#colgroup.attrs.span">span</a></span></p></div></div>
       <div class="no-number no-toc" id="colgroup-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#colgroup-attributes">#</a></h2>
         <dl class="attr-defs">

Index: dl.html
===================================================================
RCS file: /sources/public/html5/markup/dl.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- dl.html	1 Feb 2010 05:25:00 -0000	1.32
+++ dl.html	4 Feb 2010 15:09:18 -0000	1.33
@@ -17,13 +17,17 @@
     <p>The <a href="dl.html#dl" class="element">dl</a> element represents
     a <a href="dl.html#description-list">description list</a>.</p>
   </div>
-      <div class="no-number no-toc" id="dl-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#dl-contents">#</a></h2><div class="prose-model">
-    <p>Zero or more groups each consisting of one or more
-    <a href="dt.html#dt" class="element">dt</a>
-    elements followed by one or more
-    <a href="dd.html#dd" class="element">dd</a>
-    elements</p>
-  </div></div><div class="no-number no-toc" id="dl-attr-mdl">
+      <div class="no-number no-toc" id="dl-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#dl-content-model">#</a></h2><div class="content-models">
+        
+      <div id="dl-mdls">
+        <p class="elem-mdl">
+       <span>zero or more of: </span><span class="agroupof"><span>one or more </span><a class="ref" href="dt.html#dt">dt</a><span> elements</span>,   <span class="postfix followedby">followed by</span> 
+                         <span>one or more </span><a class="ref" href="dd.html#dd">dd</a><span> elements</span> </span>  
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="dl-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#dl-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="dl.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: thead.html
===================================================================
RCS file: /sources/public/html5/markup/thead.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- thead.html	1 Feb 2010 05:25:04 -0000	1.28
+++ thead.html	4 Feb 2010 15:09:22 -0000	1.29
@@ -20,11 +20,16 @@
     <a href="table.html#table" class="element">table</a>
     element.</p>
   </div>
-      <div class="no-number no-toc" id="thead-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#thead-contents">#</a></h2><div class="prose-model">
-    <p>Zero or more
-    <a href="tr.html#tr" class="element">tr</a>
-    elements</p>
-  </div></div><div class="no-number no-toc" id="thead-attr-mdl">
+      <div class="no-number no-toc" id="thead-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#thead-content-model">#</a></h2><div class="content-models">
+        
+      <div id="thead-mdls">
+        <p class="elem-mdl">
+      <span>zero or more </span><a class="ref" href="tr.html#tr">tr</a><span> elements</span> 
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="thead-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#thead-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="thead.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: tbody.html
===================================================================
RCS file: /sources/public/html5/markup/tbody.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- tbody.html	1 Feb 2010 05:25:04 -0000	1.28
+++ tbody.html	4 Feb 2010 15:09:21 -0000	1.29
@@ -19,11 +19,16 @@
     its parent <a href="table.html#table" class="element">table</a>
     element.</p>
   </div>
-      <div class="no-number no-toc" id="tbody-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#tbody-contents">#</a></h2><div class="prose-model">
-    <p>Zero or more
-    <a href="tr.html#tr" class="element">tr</a>
-    elements</p>
-  </div></div><div class="no-number no-toc" id="tbody-attr-mdl">
+      <div class="no-number no-toc" id="tbody-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#tbody-content-model">#</a></h2><div class="content-models">
+        
+      <div id="tbody-mdls">
+        <p class="elem-mdl">
+      <span>zero or more </span><a class="ref" href="tr.html#tr">tr</a><span> elements</span> 
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="tbody-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#tbody-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="tbody.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>
@@ -64,8 +69,7 @@
       </div>
       <div class="no-number no-toc" id="tbody-context">
         <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#tbody-context">#</a></h2>
-        <p class="permitted-parents">
-        <span class="context-mdl"><a href="table.html#table">table</a></span></p>
+        <p class="permitted-parents"></p>
       </div>
       
       <div class="no-number no-toc" id="tbody-display">

Index: video.html
===================================================================
RCS file: /sources/public/html5/markup/video.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- video.html	3 Feb 2010 14:44:06 -0000	1.37
+++ video.html	4 Feb 2010 15:09:22 -0000	1.38
@@ -17,28 +17,36 @@
     <p>The <a href="video.html#video" class="element">video</a> element
     represents a video or movie.</p>
   </div>
-      <div class="no-number no-toc" id="video-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#video-contents">#</a></h2><div class="prose-model">
-    <p>If the element does not have a
-    <a href="video.html#video.attrs.src" class="attribute">src</a>
-    attribute, one or more 
-    <a href="source.html#source" class="element">source</a>
-    elements, then,
-    <a href="terminology.html#transparent">transparent</a>.</p>
-    <p>If the element has a
-    <a href="video.html#video.attrs.src" class="attribute">src</a>
-    attribute,
-    <a href="terminology.html#transparent">transparent</a>.</p>
-  </div></div><div class="no-number no-toc" id="video-attr-mdl">
+      <div class="no-number no-toc" id="video-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#video-content-model">#</a></h2><div class="content-models">
+        
+      <div id="video-mdls">
+        
+        <p class="elem-mdl">
+       <span class="agroupof"><span>one </span><a class="ref" href="video.html#video.attrs.src">video.attrs.src</a><span> element</span>, 
+                          <span class="postfix or">or</span> <span>zero or more </span><a class="ref" href="source.html#source">source</a><span> elements</span> </span> <span class="postfix followedby">followed by</span> 
+  <a href="terminology.html#flow-content">flow content</a>
+        
+    </p><div class="postfix or">or</div>
+        
+        <p class="elem-mdl">
+       <span class="agroupof"><span>one </span><a class="ref" href="video.html#video.attrs.src">video.attrs.src</a><span> element</span>, 
+                          <span class="postfix or">or</span> <span>zero or more </span><a class="ref" href="source.html#source">source</a><span> elements</span> </span> <span class="postfix followedby">followed by</span> 
+  <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="video-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#video-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="video.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="video.html#video.attrs.autoplay" title="video.attrs.autoplay">autoplay</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="video.html#video.attrs.autobuffer" title="video.attrs.autobuffer">autobuffer</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="video.html#video.attrs.controls" title="video.attrs.controls">controls</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="video.html#video.attrs.loop" title="video.attrs.loop">loop</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="video.html#video.attrs.poster" title="video.attrs.poster">poster</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="video.html#video.attrs.height" title="video.attrs.height">height</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="video.html#video.attrs.width" title="video.attrs.width">width</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="video.html#video.attrs.autoplay" title="video.attrs.autoplay">autoplay</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="video.html#video.attrs.autobuffer" title="video.attrs.autobuffer">autobuffer</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="video.html#video.attrs.controls" title="video.attrs.controls">controls</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="video.html#video.attrs.loop" title="video.attrs.loop">loop</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="video.html#video.attrs.poster" title="video.attrs.poster">poster</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="video.html#video.attrs.height" title="video.attrs.height">height</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="video.html#video.attrs.width" title="video.attrs.width">width</a> </span></p></div></div>
       <div class="no-number no-toc" id="video-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#video-attributes">#</a></h2>
         <dl class="attr-defs">

Index: source.html
===================================================================
RCS file: /sources/public/html5/markup/source.html,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- source.html	3 Feb 2010 14:44:06 -0000	1.40
+++ source.html	4 Feb 2010 15:09:21 -0000	1.41
@@ -24,13 +24,20 @@
     <a href="video.html#video" class="element">video</a>
     elements.</p>
   </div>
-      <div class="no-number no-toc" id="source-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#source-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="source-attr-mdl">
+      <div class="no-number no-toc" id="source-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#source-content-model">#</a></h2><div class="content-models">
+        
+      <div id="source-mdls">
+        <p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span> 
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="source-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#source-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="source.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="source.html#source.attrs.src" title="source.attrs.src">src</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="source.html#source.attrs.type" title="source.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="source.html#source.attrs.media" title="source.attrs.media">media</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="source.html#source.attrs.src" title="source.attrs.src">src</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="source.html#source.attrs.type" title="source.attrs.type">type</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="source.html#source.attrs.media" title="source.attrs.media">media</a> </span></p></div></div>
       <div class="no-number no-toc" id="source-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#source-attributes">#</a></h2>
         <dl class="attr-defs">

Index: button.reset.html
===================================================================
RCS file: /sources/public/html5/markup/button.reset.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- button.reset.html	1 Feb 2010 05:25:00 -0000	1.37
+++ button.reset.html	4 Feb 2010 15:09:18 -0000	1.38
@@ -19,18 +19,25 @@
     value is "<code>reset</code>" represents a button for
     resetting a form.</p>
   </div>
-      <div class="no-number no-toc" id="button.reset-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#button.reset-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="button.reset-attr-mdl">
+      <div class="no-number no-toc" id="button.reset-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#button.reset-content-model">#</a></h2><div class="content-models">
+        
+      <div id="button.reset-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#flow-content">flow content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="button.reset-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#button.reset-attr-mdl">#</a></h2>
         <div class="attr-content-models">
-          <p><span class="pattern" id="button.reset.attrs">(<a class="ref" href="common-attributes.html">common attributes</a>
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="button.reset.html#button.reset.attrs.type" title="button.reset.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="button.reset.html#button.reset.attrs.value" title="button.reset.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+          <p><span class="pattern" id="button.reset.attrs"> <a class="ref" href="common-attributes.html">common attributes</a>
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="button.reset.html#button.reset.attrs.type" title="button.reset.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="button.reset.html#button.reset.attrs.value" title="button.reset.attrs.value">value</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> </span></p></div></div>
       <div class="no-number no-toc" id="button.reset-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#button.reset-attributes">#</a></h2>
         <dl class="attr-defs">

Index: meta.charset.html
===================================================================
RCS file: /sources/public/html5/markup/meta.charset.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- meta.charset.html	3 Feb 2010 14:44:05 -0000	1.37
+++ meta.charset.html	4 Feb 2010 15:09:20 -0000	1.38
@@ -19,13 +19,20 @@
     attribute represents a <a href="syntax.html#encoding-declaration">character encoding
       declaration</a>.</p>
   </div>
-      <div class="no-number no-toc" id="meta.charset-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#meta.charset-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="meta.charset-attr-mdl">
+      <div class="no-number no-toc" id="meta.charset-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#meta.charset-content-model">#</a></h2><div class="content-models">
+        
+      <div id="meta.charset-mdls">
+        <p class="elem-mdl"><span>empty (<a href="syntax.html#void-element">void element</a>)</span> 
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="meta.charset-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#meta.charset-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="meta.charset.attrs"><a class="ref" href="common-attributes.html#common.attrs.core" title="common.attrs.core">common.attrs.core</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="meta.charset.html#meta.charset.attrs.charset" title="meta.charset.attrs.charset">charset</a><span class="postfix required" title="REQUIRED">&#9733;</span></span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="meta.charset.html#meta.charset.attrs.charset" title="meta.charset.attrs.charset">charset</a><span class="postfix required" title="REQUIRED">&#9733;</span></span></p></div></div>
       <div class="no-number no-toc" id="meta.charset-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#meta.charset-attributes">#</a></h2>
         <dl class="attr-defs">

Index: output.html
===================================================================
RCS file: /sources/public/html5/markup/output.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- output.html	3 Feb 2010 14:44:05 -0000	1.35
+++ output.html	4 Feb 2010 15:09:20 -0000	1.36
@@ -17,15 +17,22 @@
     <p>The <a href="output.html#output" class="element">output</a> element
     represents the result of a calculation.</p>
   </div>
-      <div class="no-number no-toc" id="output-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#output-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="output-attr-mdl">
+      <div class="no-number no-toc" id="output-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#output-content-model">#</a></h2><div class="content-models">
+        
+      <div id="output-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="output-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#output-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="output.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="output.html#output.attrs.for" title="output.attrs.for">for</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="output.html#output.attrs.for" title="output.attrs.for">for</a> </span></p></div></div>
       <div class="no-number no-toc" id="output-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#output-attributes">#</a></h2>
         <dl class="attr-defs">

Index: i.html
===================================================================
RCS file: /sources/public/html5/markup/i.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- i.html	1 Feb 2010 05:25:01 -0000	1.30
+++ i.html	4 Feb 2010 15:09:19 -0000	1.31
@@ -19,9 +19,16 @@
     offset from the normal prose (content whose typical
     typographic presentation is italicized).</p>
   </div>
-      <div class="no-number no-toc" id="i-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#i-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="i-attr-mdl">
+      <div class="no-number no-toc" id="i-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#i-content-model">#</a></h2><div class="content-models">
+        
+      <div id="i-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="i-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#i-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="i.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: input.submit.html
===================================================================
RCS file: /sources/public/html5/markup/input.submit.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- input.submit.html	1 Feb 2010 05:25:02 -0000	1.32
+++ input.submit.html	4 Feb 2010 15:09:20 -0000	1.33
@@ -19,21 +19,29 @@
     value is "<code>submit</code>" represents a button for
     submitting a form.</p>
   </div>
-      <div class="no-number no-toc" id="input.submit-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.submit-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.submit-attr-mdl">
+      <div class="no-number no-toc" id="input.submit-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#input.submit-content-model">#</a></h2><div class="content-models">
+        
+      <div id="input.submit-mdls">
+        <p class="elem-mdl">
+      <a class="ref" href="input.submit.html#input.submit.attrs">input.submit.attrs</a>
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="input.submit-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.submit-attr-mdl">#</a></h2>
         <div class="attr-content-models">
-          <p><span class="pattern" id="input.submit.attrs">(<a class="ref" href="common-attributes.html">common attributes</a>
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.submit.html#input.submit.attrs.type" title="input.submit.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.submit.html#input.submit.attrs.value" title="input.submit.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )
-   <span class="postfix &amp;">&amp;</span> (<a class="ref" href="forms-attributes.html#shared-form.attrs.formaction" title="shared-form.attrs.formaction">formaction</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formenctype" title="shared-form.attrs.formenctype">formenctype</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formmethod" title="shared-form.attrs.formmethod">formmethod</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formtarget" title="shared-form.attrs.formtarget">formtarget</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formnovalidate" title="shared-form.attrs.formnovalidate">formnovalidate</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )</span></p></div></div>
+          <p><span class="pattern" id="input.submit.attrs"> <a class="ref" href="common-attributes.html">common attributes</a>
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.submit.html#input.submit.attrs.type" title="input.submit.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.submit.html#input.submit.attrs.value" title="input.submit.attrs.value">value</a> 
+   <span class="postfix intermixed">&amp;</span>  <a class="ref" href="forms-attributes.html#shared-form.attrs.formaction" title="shared-form.attrs.formaction">formaction</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formenctype" title="shared-form.attrs.formenctype">formenctype</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formmethod" title="shared-form.attrs.formmethod">formmethod</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formtarget" title="shared-form.attrs.formtarget">formtarget</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formnovalidate" title="shared-form.attrs.formnovalidate">formnovalidate</a> </span></p></div></div>
       <div class="no-number no-toc" id="input.submit-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.submit-attributes">#</a></h2>
         <dl class="attr-defs">

Index: input.date.html
===================================================================
RCS file: /sources/public/html5/markup/input.date.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- input.date.html	3 Feb 2010 14:44:05 -0000	1.32
+++ input.date.html	4 Feb 2010 15:09:19 -0000	1.33
@@ -20,23 +20,31 @@
     a control for setting the element&#8217;s value to a string
     representing a date.</p>
   </div>
-      <div class="no-number no-toc" id="input.date-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.date-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.date-attr-mdl">
+      <div class="no-number no-toc" id="input.date-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#input.date-content-model">#</a></h2><div class="content-models">
+        
+      <div id="input.date-mdls">
+        <p class="elem-mdl">
+      <a class="ref" href="input.date.html#input.date.attrs">input.date.attrs</a>
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="input.date-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.date-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="input.date.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.date.html#input.date.attrs.type" title="input.date.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.date.html#input.date.attrs.min" title="input.date.attrs.min">min</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.date.html#input.date.attrs.max" title="input.date.attrs.max">max</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.step.integer" title="input.attrs.step.integer">step.integer</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.date.html#input.date.attrs.value" title="input.date.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.date.html#input.date.attrs.type" title="input.date.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.date.html#input.date.attrs.min" title="input.date.attrs.min">min</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.date.html#input.date.attrs.max" title="input.date.attrs.max">max</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.step.integer" title="input.attrs.step.integer">step.integer</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.date.html#input.date.attrs.value" title="input.date.attrs.value">value</a> </span></p></div></div>
       <div class="no-number no-toc" id="input.date-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.date-attributes">#</a></h2>
         <dl class="attr-defs">

Index: var.html
===================================================================
RCS file: /sources/public/html5/markup/var.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- var.html	1 Feb 2010 05:25:04 -0000	1.30
+++ var.html	4 Feb 2010 15:09:22 -0000	1.31
@@ -19,9 +19,16 @@
     programming context, or placeholder text that the reader is
     meant to mentally replace with some other literal value.</p>
   </div>
-      <div class="no-number no-toc" id="var-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#var-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="var-attr-mdl">
+      <div class="no-number no-toc" id="var-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#var-content-model">#</a></h2><div class="content-models">
+        
+      <div id="var-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="var-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#var-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="var.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: sub.html
===================================================================
RCS file: /sources/public/html5/markup/sub.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- sub.html	2 Feb 2010 17:04:53 -0000	1.31
+++ sub.html	4 Feb 2010 15:09:21 -0000	1.32
@@ -17,9 +17,16 @@
     <p>The <a href="sub.html#sub" class="element">sub</a> element
     represents subscript.</p>
   </div>
-      <div class="no-number no-toc" id="sub-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#sub-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="sub-attr-mdl">
+      <div class="no-number no-toc" id="sub-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#sub-content-model">#</a></h2><div class="content-models">
+        
+      <div id="sub-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="sub-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#sub-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="sub.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: title.html
===================================================================
RCS file: /sources/public/html5/markup/title.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- title.html	1 Feb 2010 05:25:04 -0000	1.29
+++ title.html	4 Feb 2010 15:09:22 -0000	1.30
@@ -17,11 +17,16 @@
     <p>The <a href="title.html#title" class="element">title</a> element
     represents the document&#8217;s title or name.</p>
   </div>
-      <div class="no-number no-toc" id="title-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#title-contents">#</a></h2><div class="prose-model">
-    <p>
-      <a href="syntax.html#replaceable-character-data">replaceable character data</a>
+      <div class="no-number no-toc" id="title-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#title-content-model">#</a></h2><div class="content-models">
+        
+      <div id="title-mdls">
+        <p class="elem-mdl">
+      <span>one </span><a class="ref" href="syntax.html#replaceable-character-data">replaceable-character-data</a><span> element</span>
+        
     </p>
-  </div></div><div class="no-number no-toc" id="title-attr-mdl">
+        </div>
+      </div></div><div class="no-number no-toc" id="title-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#title-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="title.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: pre.html
===================================================================
RCS file: /sources/public/html5/markup/pre.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- pre.html	1 Feb 2010 05:25:03 -0000	1.32
+++ pre.html	4 Feb 2010 15:09:21 -0000	1.33
@@ -19,9 +19,16 @@
     represented by typographic conventions rather than by
     elements.</p>
   </div>
-      <div class="no-number no-toc" id="pre-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#pre-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="pre-attr-mdl">
+      <div class="no-number no-toc" id="pre-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#pre-content-model">#</a></h2><div class="content-models">
+        
+      <div id="pre-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="pre-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#pre-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="pre.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: button.submit.html
===================================================================
RCS file: /sources/public/html5/markup/button.submit.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- button.submit.html	1 Feb 2010 05:25:00 -0000	1.37
+++ button.submit.html	4 Feb 2010 15:09:18 -0000	1.38
@@ -19,23 +19,30 @@
     value is "<code>submit</code>" represents a button for
     submitting a form.</p>
   </div>
-      <div class="no-number no-toc" id="button.submit-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#button.submit-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="button.submit-attr-mdl">
+      <div class="no-number no-toc" id="button.submit-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#button.submit-content-model">#</a></h2><div class="content-models">
+        
+      <div id="button.submit-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#flow-content">flow content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="button.submit-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#button.submit-attr-mdl">#</a></h2>
         <div class="attr-content-models">
-          <p><span class="pattern" id="button.submit.attrs">(<a class="ref" href="common-attributes.html">common attributes</a>
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="button.submit.html#button.submit.attrs.type" title="button.submit.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-    <span class="postfix &amp;">&amp;</span> <a class="ref" href="button.submit.html#button.submit.attrs.value" title="button.submit.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )
-   <span class="postfix &amp;">&amp;</span> (<a class="ref" href="forms-attributes.html#shared-form.attrs.formaction" title="shared-form.attrs.formaction">formaction</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formenctype" title="shared-form.attrs.formenctype">formenctype</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formmethod" title="shared-form.attrs.formmethod">formmethod</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formtarget" title="shared-form.attrs.formtarget">formtarget</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-                                              <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formnovalidate" title="shared-form.attrs.formnovalidate">formnovalidate</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )</span></p></div></div>
+          <p><span class="pattern" id="button.submit.attrs"> <a class="ref" href="common-attributes.html">common attributes</a>
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="button.submit.html#button.submit.attrs.type" title="button.submit.attrs.type">type</a> 
+                          <span class="postfix intermixed">&amp;</span> <a class="ref" href="button.submit.html#button.submit.attrs.value" title="button.submit.attrs.value">value</a> 
+   <span class="postfix intermixed">&amp;</span>  <a class="ref" href="forms-attributes.html#shared-form.attrs.formaction" title="shared-form.attrs.formaction">formaction</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formenctype" title="shared-form.attrs.formenctype">formenctype</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formmethod" title="shared-form.attrs.formmethod">formmethod</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formtarget" title="shared-form.attrs.formtarget">formtarget</a> 
+                                                                                   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formnovalidate" title="shared-form.attrs.formnovalidate">formnovalidate</a> </span></p></div></div>
       <div class="no-number no-toc" id="button.submit-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#button.submit-attributes">#</a></h2>
         <dl class="attr-defs">

Index: rp.html
===================================================================
RCS file: /sources/public/html5/markup/rp.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- rp.html	3 Feb 2010 14:44:06 -0000	1.32
+++ rp.html	4 Feb 2010 15:09:21 -0000	1.33
@@ -19,9 +19,16 @@
     ruby annotation, to be shown by UAs that don&#8217;t support
     ruby annotations.</p>
   </div>
-      <div class="no-number no-toc" id="rp-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#rp-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="rp-attr-mdl">
+      <div class="no-number no-toc" id="rp-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#rp-content-model">#</a></h2><div class="content-models">
+        
+      <div id="rp-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="rp-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#rp-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="rp.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>
@@ -40,8 +47,7 @@
       </div>
       <div class="no-number no-toc" id="rp-context">
         <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#rp-context">#</a></h2>
-        <p class="permitted-parents">
-        <span class="context-mdl"><a href="ruby.html#ruby">ruby</a></span></p>
+        <p class="permitted-parents"></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: sup.html
===================================================================
RCS file: /sources/public/html5/markup/sup.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- sup.html	2 Feb 2010 17:04:53 -0000	1.31
+++ sup.html	4 Feb 2010 15:09:21 -0000	1.32
@@ -17,9 +17,16 @@
     <p>The <a href="sup.html#sup" class="element">sup</a> element
     represents superscript.</p>
   </div>
-      <div class="no-number no-toc" id="sup-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#sup-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="sup-attr-mdl">
+      <div class="no-number no-toc" id="sup-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#sup-content-model">#</a></h2><div class="content-models">
+        
+      <div id="sup-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="sup-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#sup-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="sup.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: details.html
===================================================================
RCS file: /sources/public/html5/markup/details.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- details.html	3 Feb 2010 14:44:04 -0000	1.20
+++ details.html	4 Feb 2010 15:09:18 -0000	1.21
@@ -18,19 +18,21 @@
     represents a control from which the user can obtain additional
     information or controls on-demand.</p>
   </div>
-      <div class="no-number no-toc" id="details-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#details-contents">#</a></h2><div class="prose-model">
-    <p>Optionally, a single
-    <a href="summary.html#summary" class="element">summary</a>
-    element, followed by
-    <a href="common-models.html#common.elem.flow">flow elements</a>
-    and
-    <a href="syntax.html#normal-character-data">normal character data</a>
+      <div class="no-number no-toc" id="details-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#details-content-model">#</a></h2><div class="content-models">
+        
+      <div id="details-mdls">
+        <p class="elem-mdl">
+      <span>an optional </span><a class="ref" href="summary.html#summary">summary</a><span> element</span>,   <span class="postfix followedby">followed by</span> 
+  <a href="terminology.html#flow-content">flow content</a>
+        
     </p>
-  </div></div><div class="no-number no-toc" id="details-attr-mdl">
+        </div>
+      </div></div><div class="no-number no-toc" id="details-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#details-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="details.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="details.html#details.attrs.open" title="details.attrs.open">open</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="details.html#details.attrs.open" title="details.attrs.open">open</a> </span></p></div></div>
       <div class="no-number no-toc" id="details-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#details-attributes">#</a></h2>
         <dl class="attr-defs">

Index: input.url.html
===================================================================
RCS file: /sources/public/html5/markup/input.url.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- input.url.html	3 Feb 2010 14:44:05 -0000	1.33
+++ input.url.html	4 Feb 2010 15:09:20 -0000	1.34
@@ -20,24 +20,32 @@
     a control for editing an absolute URL given in the element&#8217;s
     value.</p>
   </div>
-      <div class="no-number no-toc" id="input.url-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.url-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.url-attr-mdl">
+      <div class="no-number no-toc" id="input.url-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#input.url-content-model">#</a></h2><div class="content-models">
+        
+      <div id="input.url-mdls">
+        <p class="elem-mdl">
+      <a class="ref" href="input.url.html#input.url.attrs">input.url.attrs</a>
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="input.url-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.url-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="input.url.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.url.html#input.url.attrs.type" title="input.url.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="input.url.html#input.url.attrs.value" title="input.url.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.url.html#input.url.attrs.type" title="input.url.attrs.type">type</a><span class="postfix required" title="REQUIRED">&#9733;</span>
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a> 
+   <span class="postfix intermixed">&amp;</span> <a class="ref" href="input.url.html#input.url.attrs.value" title="input.url.attrs.value">value</a> </span></p></div></div>
       <div class="no-number no-toc" id="input.url-attributes">
         <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.url-attributes">#</a></h2>
         <dl class="attr-defs">

Index: summary.html
===================================================================
RCS file: /sources/public/html5/markup/summary.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- summary.html	3 Feb 2010 14:44:06 -0000	1.3
+++ summary.html	4 Feb 2010 15:09:21 -0000	1.4
@@ -20,9 +20,16 @@
     <a href="details.html#details" class="element">details</a>
     element.</p>
   </div>
-      <div class="no-number no-toc" id="summary-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#summary-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="summary-attr-mdl">
+      <div class="no-number no-toc" id="summary-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#summary-content-model">#</a></h2><div class="content-models">
+        
+      <div id="summary-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="summary-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#summary-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="summary.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: hgroup.html
===================================================================
RCS file: /sources/public/html5/markup/hgroup.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- hgroup.html	3 Feb 2010 14:44:05 -0000	1.30
+++ hgroup.html	4 Feb 2010 15:09:19 -0000	1.31
@@ -17,17 +17,21 @@
     <p>The <a href="hgroup.html#hgroup" class="element">hgroup</a> element
     represents a group of headings.</p>
   </div>
-      <div class="no-number no-toc" id="hgroup-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#hgroup-contents">#</a></h2><div class="prose-model">
-    <p>One or more
-    <a href="h1.html#h1" class="element">h1</a>,
-    <a href="h2.html#h2" class="element">h2</a>,
-    <a href="h3.html#h3" class="element">h3</a>,
-    <a href="h4.html#h4" class="element">h4</a>,
-    <a href="h5.html#h5" class="element">h5</a>,
-    and/or
-    <a href="h6.html#h6" class="element">h6</a>
-    elements</p>
-  </div></div><div class="no-number no-toc" id="hgroup-attr-mdl">
+      <div class="no-number no-toc" id="hgroup-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#hgroup-content-model">#</a></h2><div class="content-models">
+        
+      <div id="hgroup-mdls">
+        <p class="elem-mdl">
+       <span>one or more of: </span><span class="agroupof"><span>one </span><a class="ref" href="h1.html#h1">h1</a><span> element</span>, 
+                          <span class="postfix or">or</span> <span>one </span><a class="ref" href="h2.html#h2">h2</a><span> element</span>, 
+                          <span class="postfix or">or</span> <span>one </span><a class="ref" href="h3.html#h3">h3</a><span> element</span>, 
+                          <span class="postfix or">or</span> <span>one </span><a class="ref" href="h4.html#h4">h4</a><span> element</span>, 
+                          <span class="postfix or">or</span> <span>one </span><a class="ref" href="h5.html#h5">h5</a><span> element</span>, 
+                          <span class="postfix or">or</span> <span>one </span><a class="ref" href="h6.html#h6">h6</a><span> element</span></span>  
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="hgroup-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#hgroup-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="hgroup.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>

Index: h5.html
===================================================================
RCS file: /sources/public/html5/markup/h5.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- h5.html	1 Feb 2010 05:25:01 -0000	1.35
+++ h5.html	4 Feb 2010 15:09:19 -0000	1.36
@@ -17,9 +17,16 @@
     <p>The <a href="h1.html#h1" class="element">h1</a> through <a href="h6.html#h6" class="element">h6</a> elements are headings for
     the sections with which they are associated.</p>
   </div>
-      <div class="no-number no-toc" id="h5-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#h5-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">normal character data</a>
-                and
-                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="h5-attr-mdl">
+      <div class="no-number no-toc" id="h5-content-model">
+        <h2 class="element-subhead">Permitted content <a class="hash" href="#h5-content-model">#</a></h2><div class="content-models">
+        
+      <div id="h5-mdls">
+        <p class="elem-mdl">
+      <a href="terminology.html#phrasing-content">phrasing content</a>
+        
+    </p>
+        </div>
+      </div></div><div class="no-number no-toc" id="h5-attr-mdl">
         <h2 class="element-subhead">Permitted attributes <a class="hash" href="#h5-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><span class="pattern" id="h5.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>
@@ -50,8 +57,7 @@
         <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#h5-context">#</a></h2>
         <p class="permitted-parents">
         <span class="context-mdl"><span>Any element that can contain
-            <a href="common-models.html#common.elem.flow">flow elements</a></span></span>, 
-        <span class="context-mdl"><a href="hgroup.html#hgroup">hgroup</a></span></p>
+            <a href="common-models.html#common.elem.flow">flow elements</a></span></span></p>
       </div>
       
       <div class="no-number no-toc" id="h5-display">
Received on Thursday, 4 February 2010 15:09:26 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Thursday, 4 February 2010 15:09:42 GMT