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

html5/markup Makefile,1.82,1.83 Overview.html,1.371,1.372 a.html,1.41,1.42 abbr.html,1.28,1.29 address.html,1.30,1.31 area.html,1.34,1.35 article.html,1.34,1.35 aside.html,1.31,1.32 audio.html,1.36,1.37 b.html,1.28,1.29 base.html,1.29,1.30 bdo.html,1.30,1.31 blockquote.html,1.30,1.31 body.html,1.32,1.33 br.html,1.25,1.26 button.button.html,1.35,1.36 button.reset.html,1.35,1.36 button.submit.html,1.35,1.36 canvas.html,1.27,1.28 caption.html,1.29,1.30 cite.html,1.27,1.28 code.html,1.27,1.28 col.html,1.28,1.29 colgroup.html,1.29,1.30 command.checkbox.html,1.29,1.30 command.command.html,1.29,1.30 command.radio.html,1.29,1.30 common-models.html,1.22,1.23 datalist.html,1.32,1.33 dd.html,1.31,1.32 del.html,1.32,1.33 dfn.html,1.28,1.29 div.html,1.31,1.32 dl.html,1.30,1.31 dt.html,1.31,1.32 em.html,1.28,1.29 embed.html,1.31,1.32 fieldset.html,1.31,1.32 footer.html,1.31,1.32 form.html,1.34,1.35 h1.html,1.32,1.33 h2.html,1.33,1.34 h3.html,1.33,1.34 h4.html,1.33,1.34 h5.html,1.33,1.34 h6.html,1.33,1.34 head.htm

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Mon, 01 Feb 2010 02:34:56 +0000
To: Message-Id: <E1Nbm7t-00078E-NS@lionel-hutz.w3.org>
Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv27127

Modified Files:
	Makefile 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-models.html datalist.html dd.html del.html dfn.html 
	div.html dl.html dt.html em.html embed.html fieldset.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 
	script.html section.html select.html small.html source.html 
	span.html spec.html strong.html style.html sub.html sup.html 
	table.html tbody.html td.html textarea.html tfoot.html th.html 
	thead.html time.html title.html tr.html ul.html var.html 
	video.html 
Log Message:
checkpointing

Index: body.html
===================================================================
RCS file: /sources/public/html5/markup/body.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- body.html	30 Jan 2010 04:44:21 -0000	1.32
+++ body.html	1 Feb 2010 02:34:49 -0000	1.33
@@ -18,19 +18,9 @@
     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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#body-content-model">#</a></h2><div class="content-models">
-        
-      <div id="body-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="body-mdl" href="body.html#body-mdl" class="element">body</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="body.html#body.attrs">body.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="body-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></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>
@@ -130,10 +120,9 @@
   
       </div>
       <div class="no-number no-toc" id="body-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#body-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="html.html#html-mdl">html</a> = <a class="ref" href="head.html#head">head</a> <span class="postfix followedby">followed by</span> 
-  <a class="ref" href="body.html#body">body</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#body-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="html.html#html">html</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="body-display">

Index: legend.html
===================================================================
RCS file: /sources/public/html5/markup/legend.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- legend.html	31 Jan 2010 06:10:59 -0000	1.28
+++ legend.html	1 Feb 2010 02:34:52 -0000	1.29
@@ -19,19 +19,9 @@
     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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#legend-content-model">#</a></h2><div class="content-models">
-        
-      <div id="legend-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="legend-mdl" href="legend.html#legend-mdl" class="element">legend</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="legend.html#legend.attrs">legend.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="legend-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -46,11 +36,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="legend-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#legend-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="fieldset.html#fieldset-mdl">fieldset</a> = <a class="ref" href="legend.html#legend">legend</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span>  <span class="postfix followedby">followed by</span> 
-  (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#legend-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="fieldset.html#fieldset">fieldset</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="legend-display">

Index: address.html
===================================================================
RCS file: /sources/public/html5/markup/address.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- address.html	30 Jan 2010 04:44:20 -0000	1.30
+++ address.html	1 Feb 2010 02:34:49 -0000	1.31
@@ -17,19 +17,9 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#address-content-model">#</a></h2><div class="content-models">
-        
-      <div id="address-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="address-mdl" href="address.html#address-mdl" class="element">address</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="address.html#address.attrs">address.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="address-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></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>
@@ -53,9 +43,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="address-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#address-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#address-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="address-display">

Index: th.html
===================================================================
RCS file: /sources/public/html5/markup/th.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- th.html	31 Jan 2010 06:11:01 -0000	1.33
+++ th.html	1 Feb 2010 02:34:54 -0000	1.34
@@ -17,19 +17,9 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#th-content-model">#</a></h2><div class="content-models">
-        
-      <div id="th-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="th-mdl" href="th.html#th-mdl" class="element">th</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="th.html#th.attrs">th.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="th-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -133,10 +123,9 @@
   
       </div>
       <div class="no-number no-toc" id="th-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#th-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="tr.html#tr-mdl">tr</a> = (<a class="ref" href="td.html#td">td</a>
-    <span class="postfix or">or</span> <a class="ref" href="th.html#th">th</a>)<span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#th-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="tr.html#tr">tr</a></span></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.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- mark.html	31 Jan 2010 06:11:00 -0000	1.27
+++ mark.html	1 Feb 2010 02:34:52 -0000	1.28
@@ -19,19 +19,9 @@
     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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#mark-content-model">#</a></h2><div class="content-models">
-        
-      <div id="mark-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="mark-mdl" href="mark.html#mark-mdl" class="element">mark</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="mark.html#mark.attrs">mark.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="mark-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -46,9 +36,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="mark-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#mark-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#mark-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -d -r1.371 -r1.372
--- Overview.html	31 Jan 2010 06:10:58 -0000	1.371
+++ Overview.html	1 Feb 2010 02:34:49 -0000	1.372
@@ -626,14 +626,14 @@
 <li id="common-models-toc">
 <span class="toc-section-number"></span><a href="common-models.html#common-models"><span class="toc-section-number">6.</span> Common content models</a>
 <ul>
-<li id="common-flow-toc">
-<span class="toc-section-number"></span><a href="common-models.html#common-flow"><span class="toc-section-number">6.01.</span> Flow elements</a>
+<li id="common.elem.flow-toc">
+<span class="toc-section-number"></span><a href="common-models.html#common.elem.flow"><span class="toc-section-number">6.01.</span> Flow elements</a>
 </li>
-<li id="common-metadata-toc">
-<span class="toc-section-number"></span><a href="common-models.html#common-metadata"><span class="toc-section-number">6.02.</span> Metadata elements</a>
+<li id="common.elem.metadata-toc">
+<span class="toc-section-number"></span><a href="common-models.html#common.elem.metadata"><span class="toc-section-number">6.02.</span> Metadata elements</a>
 </li>
-<li id="common-phrasing-toc">
-<span class="toc-section-number"></span><a href="common-models.html#common-phrasing"><span class="toc-section-number">6.03.</span> Phrasing elements</a>
+<li id="common.elem.phrasing-toc">
+<span class="toc-section-number"></span><a href="common-models.html#common.elem.phrasing"><span class="toc-section-number">6.03.</span> Phrasing elements</a>
 </li>
 </ul>
 </li>

Index: br.html
===================================================================
RCS file: /sources/public/html5/markup/br.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- br.html	30 Jan 2010 04:44:21 -0000	1.25
+++ br.html	1 Feb 2010 02:34:49 -0000	1.26
@@ -17,16 +17,7 @@
     <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#br-content-model">#</a></h2><div class="content-models">
-        
-      <div id="br-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="br-mdl" href="br.html#br-mdl" class="element">br</a> = </span><span>
-      empty
-       &amp; <a class="ref" href="br.html#br.attrs">br.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="br-attr-mdl">
+      <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">
         <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>
@@ -50,9 +41,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="br-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#br-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#br-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: input.email.html
===================================================================
RCS file: /sources/public/html5/markup/input.email.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- input.email.html	30 Jan 2010 04:44:23 -0000	1.28
+++ input.email.html	1 Feb 2010 02:34:51 -0000	1.29
@@ -20,15 +20,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#input.email-content-model">#</a></h2><div class="content-models">
-        
-      <div id="input.email-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="input.email-mdl" href="input.email.html#input.email-mdl"><span class="element">input</span>.email</a> = </span><span>
-      <a class="ref" href="input.email.html#input.email.attrs">input.email.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="input.email-attr-mdl">
+      <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">
         <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>
@@ -105,9 +97,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="input.email-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.email-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#input.email-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: tr.html
===================================================================
RCS file: /sources/public/html5/markup/tr.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- tr.html	31 Jan 2010 06:11:01 -0000	1.26
+++ tr.html	1 Feb 2010 02:34:54 -0000	1.27
@@ -30,17 +30,7 @@
     or
     <a href="td.html#td" class="element">td</a>
     elements</p>
-  </div></div><div class="no-number no-toc" id="tr-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#tr-content-model">#</a></h2><div class="content-models">
-        
-      <div id="tr-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="tr-mdl" href="tr.html#tr-mdl" class="element">tr</a> = </span><span>
-      (<a class="ref" href="td.html#td">td</a>
-    <span class="postfix or">or</span> <a class="ref" href="th.html#th">th</a>)<span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-       &amp; <a class="ref" href="tr.html#tr.attrs">tr.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="tr-attr-mdl">
+  </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>
@@ -81,20 +71,12 @@
   
       </div>
       <div class="no-number no-toc" id="tr-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#tr-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="table.html#table-mdl">table</a> = <a class="ref" href="caption.html#caption">caption</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span>  <span class="postfix followedby">followed by</span> 
-  <a class="ref" href="colgroup.html#colgroup">colgroup</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span>  <span class="postfix followedby">followed by</span> 
-  <a class="ref" href="thead.html#thead">thead</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span>  <span class="postfix followedby">followed by</span> 
-  ((<a class="ref" href="tfoot.html#tfoot">tfoot</a> <span class="postfix followedby">followed by</span> 
-    (<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-      <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> ))
-    <span class="postfix or">or</span> ((<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-                                          <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> ) <span class="postfix followedby">followed by</span> 
-                                        <a class="ref" href="tfoot.html#tfoot">tfoot</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ))</li>
-        <li class="context-mdl"><a href="thead.html#thead-mdl">thead</a> = <a class="ref" href="tr.html#tr">tr</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li>
-        <li class="context-mdl"><a href="tfoot.html#tfoot-mdl">tfoot</a> = <a class="ref" href="tr.html#tr">tr</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li>
-        <li class="context-mdl"><a href="tbody.html#tbody-mdl">tbody</a> = <a class="ref" href="tr.html#tr">tr</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#tr-context">#</a></h2>
+        <p>
+        <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>
       </div>
       
       <div class="no-number no-toc" id="tr-display">

Index: input.month.html
===================================================================
RCS file: /sources/public/html5/markup/input.month.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- input.month.html	31 Jan 2010 06:10:59 -0000	1.29
+++ input.month.html	1 Feb 2010 02:34:51 -0000	1.30
@@ -20,15 +20,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#input.month-content-model">#</a></h2><div class="content-models">
-        
-      <div id="input.month-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="input.month-mdl" href="input.month.html#input.month-mdl"><span class="element">input</span>.month</a> = </span><span>
-      <a class="ref" href="input.month.html#input.month.attrs">input.month.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="input.month-attr-mdl">
+      <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">
         <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>
@@ -109,9 +101,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="input.month-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.month-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#input.month-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: iframe.html
===================================================================
RCS file: /sources/public/html5/markup/iframe.html,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- iframe.html	30 Jan 2010 04:44:22 -0000	1.38
+++ iframe.html	1 Feb 2010 02:34:51 -0000	1.39
@@ -24,16 +24,7 @@
     <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#iframe-content-model">#</a></h2><div class="content-models">
-        
-      <div id="iframe-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="iframe-mdl" href="iframe.html#iframe-mdl" class="element">iframe</a> = </span><span>
-      <a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-       &amp; <a class="ref" href="iframe.html#iframe.attrs">iframe.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="iframe-attr-mdl">
+  </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>
@@ -128,9 +119,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="iframe-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#iframe-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#iframe-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="iframe-display">

Index: ins.html
===================================================================
RCS file: /sources/public/html5/markup/ins.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- ins.html	31 Jan 2010 06:10:59 -0000	1.32
+++ ins.html	1 Feb 2010 02:34:52 -0000	1.33
@@ -18,24 +18,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#ins-content-model">#</a></h2><div class="content-models">
-        
-      <dl id="ins-mdls">
-        <dt class="content-model"><span class="element-pattern-name" id="ins.elem.flow"><a class="hash" href="ins.html#ins.elem.flow"><span class="element">ins</span>.elem.flow</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="ins.html#ins.attrs">ins.attrs</a>
-    </span></dd>
-        <dt class="content-model"><span class="element-pattern-name" id="ins.elem.phrasing"><a class="hash" href="ins.html#ins.elem.phrasing"><span class="element">ins</span>.elem.phrasing</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="ins.html#ins.attrs">ins.attrs</a>
-    </span></dd>
-        </dl>
-      </div></div><div class="no-number no-toc" id="ins-attr-mdl">
+      <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">
         <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>
@@ -66,10 +49,10 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="ins-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#ins-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#ins-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span>, 
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="ins-display">

Index: abbr.html
===================================================================
RCS file: /sources/public/html5/markup/abbr.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- abbr.html	30 Jan 2010 04:44:20 -0000	1.28
+++ abbr.html	1 Feb 2010 02:34:49 -0000	1.29
@@ -18,19 +18,9 @@
       <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#abbr-content-model">#</a></h2><div class="content-models">
-        
-      <div id="abbr-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="abbr-mdl" href="abbr.html#abbr-mdl" class="element">abbr</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="abbr.html#abbr.attrs">abbr.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="abbr-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -45,9 +35,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="abbr-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#abbr-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#abbr-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       
         <div class="no-number no-toc" id="abbr-details">

Index: div.html
===================================================================
RCS file: /sources/public/html5/markup/div.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- div.html	30 Jan 2010 04:44:22 -0000	1.31
+++ div.html	1 Feb 2010 02:34:50 -0000	1.32
@@ -18,20 +18,9 @@
     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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#div-content-model">#</a></h2><div class="content-models">
-        
-      <div id="div-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="div-mdl" href="div.html#div-mdl" class="element">div</a> = </span><span>
-      <a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span>  <span class="postfix followedby">followed by</span> 
-  (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="div.html#div.attrs">div.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="div-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></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>
@@ -55,9 +44,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="div-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#div-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#div-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="div-display">

Index: meta.name.html
===================================================================
RCS file: /sources/public/html5/markup/meta.name.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- meta.name.html	31 Jan 2010 06:11:00 -0000	1.30
+++ meta.name.html	1 Feb 2010 02:34:53 -0000	1.31
@@ -18,16 +18,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#meta.name-content-model">#</a></h2><div class="content-models">
-        
-      <div id="meta.name-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="meta.name-mdl" href="meta.name.html#meta.name-mdl"><span class="element">meta</span>.name</a> = </span><span>
-      empty
-       &amp; <a class="ref" href="meta.name.html#meta.name.attrs">meta.name.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="meta.name-attr-mdl">
+      <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">
         <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>
@@ -55,19 +46,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="meta.name-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#meta.name-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.metadata">common.elem.metadata</a> = <a class="ref" href="link.html#link">link</a>
-   <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
-   <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a>
-   <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-   <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#meta.name-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.metadata">common.elem.metadata</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: table.html
===================================================================
RCS file: /sources/public/html5/markup/table.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- table.html	31 Jan 2010 06:11:01 -0000	1.30
+++ table.html	1 Feb 2010 02:34:54 -0000	1.31
@@ -42,24 +42,7 @@
       <a href="tfoot.html#tfoot" class="element">tfoot</a>
       element</li>
     </ul>
-  </div></div><div class="no-number no-toc" id="table-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#table-content-model">#</a></h2><div class="content-models">
-        
-      <div id="table-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="table-mdl" href="table.html#table-mdl" class="element">table</a> = </span><span>
-      <a class="ref" href="caption.html#caption">caption</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span>  <span class="postfix followedby">followed by</span> 
-  <a class="ref" href="colgroup.html#colgroup">colgroup</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span>  <span class="postfix followedby">followed by</span> 
-  <a class="ref" href="thead.html#thead">thead</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span>  <span class="postfix followedby">followed by</span> 
-  ((<a class="ref" href="tfoot.html#tfoot">tfoot</a> <span class="postfix followedby">followed by</span> 
-    (<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-      <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> ))
-    <span class="postfix or">or</span> ((<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-                                          <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> ) <span class="postfix followedby">followed by</span> 
-                                        <a class="ref" href="tfoot.html#tfoot">tfoot</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ))
-       &amp; <a class="ref" href="table.html#table.attrs">table.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="table-attr-mdl">
+  </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>
@@ -117,9 +100,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="table-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#table-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#table-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="table-display">

Index: nav.html
===================================================================
RCS file: /sources/public/html5/markup/nav.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- nav.html	31 Jan 2010 06:11:00 -0000	1.32
+++ nav.html	1 Feb 2010 02:34:53 -0000	1.33
@@ -19,19 +19,9 @@
     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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#nav-content-model">#</a></h2><div class="content-models">
-        
-      <div id="nav-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="nav-mdl" href="nav.html#nav-mdl" class="element">nav</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="nav.html#nav.attrs">nav.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="nav-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></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>
@@ -55,9 +45,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="nav-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#nav-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#nav-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="nav-display">

Index: html.html
===================================================================
RCS file: /sources/public/html5/markup/html.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- html.html	30 Jan 2010 04:44:22 -0000	1.30
+++ html.html	1 Feb 2010 02:34:51 -0000	1.31
@@ -23,17 +23,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#html-content-model">#</a></h2><div class="content-models">
-        
-      <div id="html-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="html-mdl" href="html.html#html-mdl" class="element">html</a> = </span><span>
-      <a class="ref" href="head.html#head">head</a> <span class="postfix followedby">followed by</span> 
-  <a class="ref" href="body.html#body">body</a>
-       &amp; <a class="ref" href="html.html#html.attrs">html.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="html-attr-mdl">
+  </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>

Index: meta.http-equiv.content-type.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.content-type.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- meta.http-equiv.content-type.html	31 Jan 2010 06:11:00 -0000	1.33
+++ meta.http-equiv.content-type.html	1 Feb 2010 02:34:52 -0000	1.34
@@ -19,16 +19,7 @@
       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-content-model">
-        <h2 class="element-subhead">Content model <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 class="element-pattern-name"><a id="meta.http-equiv.content-type-mdl" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type-mdl"><span class="element">meta</span>.http-equiv.content-type</a> = </span><span>
-      empty
-       &amp; <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type.attrs">meta.http-equiv.content-type.attrs</a>
-    </span></p>
-        </div>
-      </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-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">
         <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>
@@ -55,18 +46,18 @@
       <div class="no-number no-toc" id="meta.http-equiv.content-type-constraints">
         <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#meta.http-equiv.content-type-constraints">#</a></h2>
         <ul class="assertions">
-    <p>A <a href="meta.html#meta" class="element">meta</a> element in the
+    <li>A <a href="meta.html#meta" class="element">meta</a> element in the
     <a href="meta.http-equiv.content-type.html#encoding-declaration-state">encoding declaration
       state</a> may be used in a <a href="documents.html#syntax-document-html">document in the HTML syntax</a>,
-    but it must not be used in a <a href="documents.html#syntax-document-xml">document in the XML syntax</a>.</p>
-    <p>There must not be more than one <a href="meta.html#meta" class="element">meta</a> element in the <a href="meta.http-equiv.content-type.html#encoding-declaration-state">encoding declaration
-      state</a> per document.</p>
-    <p>If a document contains a
+    but it must not be used in a <a href="documents.html#syntax-document-xml">document in the XML syntax</a>.</li>
+    <li>There must not be more than one <a href="meta.html#meta" class="element">meta</a> element in the <a href="meta.http-equiv.content-type.html#encoding-declaration-state">encoding declaration
+      state</a> per document.</li>
+    <li>If a document contains a
     <a href="meta.html#meta" class="element">meta</a> 
     element in the <a href="meta.http-equiv.content-type.html#encoding-declaration-state">encoding
       declaration state</a>,
     then the document must not contain a <a href="meta.html#meta" class="element">meta</a> element with a <a href="meta.charset.html#meta.charset.attrs.charset">charset</a>
-    attribute.</p>
+    attribute.</li>
   
           <li><span>
 				The &#8220;scheme&#8221; attribute on the &#8220;meta&#8221; element is obsolete.
@@ -83,19 +74,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="meta.http-equiv.content-type-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#meta.http-equiv.content-type-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.metadata">common.elem.metadata</a> = <a class="ref" href="link.html#link">link</a>
-   <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
-   <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a>
-   <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-   <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#meta.http-equiv.content-type-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.metadata">common.elem.metadata</a></span></p>
       </div>
       
         <div class="no-number no-toc" id="meta.http-equiv.content-type-details">

Index: footer.html
===================================================================
RCS file: /sources/public/html5/markup/footer.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- footer.html	30 Jan 2010 04:44:22 -0000	1.31
+++ footer.html	1 Feb 2010 02:34:50 -0000	1.32
@@ -17,19 +17,9 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#footer-content-model">#</a></h2><div class="content-models">
-        
-      <div id="footer-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="footer-mdl" href="footer.html#footer-mdl" class="element">footer</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="footer.html#footer.attrs">footer.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="footer-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></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>
@@ -59,9 +49,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="footer-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#footer-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#footer-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="footer-display">

Index: meta.http-equiv.content-language.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.content-language.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- meta.http-equiv.content-language.html	31 Jan 2010 06:11:00 -0000	1.26
+++ meta.http-equiv.content-language.html	1 Feb 2010 02:34:52 -0000	1.27
@@ -19,16 +19,7 @@
     whose value is "<code>content-language</code>" represents a pragma
     directive that specifies a document-wide default language.</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-content-model">
-        <h2 class="element-subhead">Content model <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 class="element-pattern-name"><a id="meta.http-equiv.content-language-mdl" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language-mdl"><span class="element">meta</span>.http-equiv.content-language</a> = </span><span>
-      empty
-       &amp; <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language.attrs">meta.http-equiv.content-language.attrs</a>
-    </span></p>
-        </div>
-      </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-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">
         <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>
@@ -71,19 +62,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="meta.http-equiv.content-language-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#meta.http-equiv.content-language-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.metadata">common.elem.metadata</a> = <a class="ref" href="link.html#link">link</a>
-   <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
-   <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a>
-   <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-   <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#meta.http-equiv.content-language-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.metadata">common.elem.metadata</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: script.html
===================================================================
RCS file: /sources/public/html5/markup/script.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- script.html	31 Jan 2010 06:11:00 -0000	1.37
+++ script.html	1 Feb 2010 02:34:53 -0000	1.38
@@ -15,28 +15,13 @@
       <h2 class="element-head"><span class="element">script</span> &#8211; <span class="shortdesc">embedded script</span> <a class="hash" href="#script">#</a> <a class="toc-bak" href="Overview.html#script-toc">T</a></h2>
       <div id="script-longdesc" class="longdesc">
     <p>The <a href="script.html#script" class="element">script</a> element
-    dynamic script and data blocks to be included in documents.</p>
+    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>
+    <a href="syntax.html#non-replaceable-character-data">non-replaceable character data</a>
     </p>
-  </div></div><div class="no-number no-toc" id="script-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#script-content-model">#</a></h2><div class="content-models">
-        
-      <dl id="script-mdls">
-        <dt class="content-model"><span class="element-pattern-name" id="script.elem.embedded"><a class="hash" href="script.html#script.elem.embedded"><span class="element">script</span>.elem.embedded</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      <a class="ref" href="syntax.html#non-replaceable-character-data">non-replaceable-character-data</a>
-       &amp; <a class="ref" href=".html#script.attrs.embedded" title="script.attrs.embedded">script.attrs.embedded</a>
-    </span></dd>
-        <dt class="content-model"><span class="element-pattern-name" id="script.elem.imported"><a class="hash" href="script.html#script.elem.imported"><span class="element">script</span>.elem.imported</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      <a class="ref" href="syntax.html#non-replaceable-character-data">non-replaceable-character-data</a>
-       &amp; <a class="ref" href=".html#script.attrs.imported" title="script.attrs.imported">script.attrs.imported</a>
-    </span></dd>
-        </dl>
-      </div></div><div class="no-number no-toc" id="script-attr-mdl">
+  </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>
@@ -109,20 +94,10 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="script-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#script-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.metadata">common.elem.metadata</a> = <a class="ref" href="link.html#link">link</a>
-   <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
-   <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a>
-   <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-   <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a></li>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#script-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.metadata">common.elem.metadata</a></span>, 
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span>, </p>
       </div>
       
       <div class="no-number no-toc" id="script-display">

Index: input.range.html
===================================================================
RCS file: /sources/public/html5/markup/input.range.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- input.range.html	31 Jan 2010 06:10:59 -0000	1.29
+++ input.range.html	1 Feb 2010 02:34:52 -0000	1.30
@@ -20,15 +20,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#input.range-content-model">#</a></h2><div class="content-models">
-        
-      <div id="input.range-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="input.range-mdl" href="input.range.html#input.range-mdl"><span class="element">input</span>.range</a> = </span><span>
-      <a class="ref" href="input.range.html#input.range.attrs">input.range.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="input.range-attr-mdl">
+      <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">
         <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>
@@ -107,9 +99,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="input.range-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.range-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#input.range-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: audio.html
===================================================================
RCS file: /sources/public/html5/markup/audio.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- audio.html	30 Jan 2010 04:44:21 -0000	1.36
+++ audio.html	1 Feb 2010 02:34:49 -0000	1.37
@@ -28,28 +28,7 @@
     <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#audio-content-model">#</a></h2><div class="content-models">
-        
-      <dl id="audio-mdls">
-        <dt class="content-model"><span class="element-pattern-name" id="audio.elem.flow"><a class="hash" href="audio.html#audio.elem.flow"><span class="element">audio</span>.elem.flow</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      (<a class="ref" href="audio.html#audio.attrs.src">audio.attrs.src</a>
-    <span class="postfix or">or</span> <a class="ref" href="source.html#source">source</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) <span class="postfix followedby">followed by</span> 
-  (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="audio.html#audio.attrs">audio.attrs</a>
-    </span></dd>
-        <dt class="content-model"><span class="element-pattern-name" id="audio.elem.phrasing"><a class="hash" href="audio.html#audio.elem.phrasing"><span class="element">audio</span>.elem.phrasing</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      (<a class="ref" href="audio.html#audio.attrs.src">audio.attrs.src</a>
-    <span class="postfix or">or</span> <a class="ref" href="source.html#source">source</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) <span class="postfix followedby">followed by</span> 
-  (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="audio.html#audio.attrs">audio.attrs</a>
-    </span></dd>
-        </dl>
-      </div></div><div class="no-number no-toc" id="audio-attr-mdl">
+  </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>
@@ -107,10 +86,10 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="audio-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#audio-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#audio-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span>, 
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: time.html
===================================================================
RCS file: /sources/public/html5/markup/time.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- time.html	31 Jan 2010 06:11:01 -0000	1.30
+++ time.html	1 Feb 2010 02:34:54 -0000	1.31
@@ -17,19 +17,9 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#time-content-model">#</a></h2><div class="content-models">
-        
-      <div id="time-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="time-mdl" href="time.html#time-mdl" class="element">time</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="time.html#time.attrs">time.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="time-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -74,9 +64,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="time-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#time-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#time-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       
         <div class="no-number no-toc" id="time-details">

Index: meta.http-equiv.default-style.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.default-style.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- meta.http-equiv.default-style.html	31 Jan 2010 06:11:00 -0000	1.30
+++ meta.http-equiv.default-style.html	1 Feb 2010 02:34:52 -0000	1.31
@@ -19,16 +19,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <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 class="element-pattern-name"><a id="meta.http-equiv.default-style-mdl" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style-mdl"><span class="element">meta</span>.http-equiv.default-style</a> = </span><span>
-      empty
-       &amp; <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style.attrs">meta.http-equiv.default-style.attrs</a>
-    </span></p>
-        </div>
-      </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-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">
         <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>
@@ -71,23 +62,10 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="meta.http-equiv.default-style-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#meta.http-equiv.default-style-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.metadata">common.elem.metadata</a> = <a class="ref" href="link.html#link">link</a>
-   <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
-   <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a>
-   <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-   <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a></li>
-        <li class="context-mdl"><a href="noscript.html#noscript.elem.head">noscript.elem.head</a> = (<a class="ref" href="link.html#link">link</a>
-    <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-    <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-    <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a>)<span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#meta.http-equiv.default-style-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.metadata">common.elem.metadata</a></span>, 
+        <span class="context-mdl"><a href="noscript.html#noscript">noscript</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: keygen.html
===================================================================
RCS file: /sources/public/html5/markup/keygen.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- keygen.html	31 Jan 2010 06:10:59 -0000	1.30
+++ keygen.html	1 Feb 2010 02:34:52 -0000	1.31
@@ -18,16 +18,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#keygen-content-model">#</a></h2><div class="content-models">
-        
-      <div id="keygen-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="keygen-mdl" href="keygen.html#keygen-mdl" class="element">keygen</a> = </span><span>
-      empty
-       &amp; <a class="ref" href="keygen.html#keygen.attrs">keygen.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="keygen-attr-mdl">
+      <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">
         <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>
@@ -74,9 +65,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="keygen-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#keygen-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#keygen-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: command.command.html
===================================================================
RCS file: /sources/public/html5/markup/command.command.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- command.command.html	30 Jan 2010 04:44:21 -0000	1.29
+++ command.command.html	1 Feb 2010 02:34:50 -0000	1.30
@@ -19,16 +19,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#command.command-content-model">#</a></h2><div class="content-models">
-        
-      <div id="command.command-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="command.command-mdl" href="command.command.html#command.command-mdl"><span class="element">command</span>.command</a> = </span><span>
-      empty
-       &amp; <a class="ref" href="command.command.html#command.command.attrs">command.command.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="command.command-attr-mdl">
+      <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">
         <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>
@@ -69,20 +60,10 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="command.command-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#command.command-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.metadata">common.elem.metadata</a> = <a class="ref" href="link.html#link">link</a>
-   <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
-   <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a>
-   <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-   <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a></li>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#command.command-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.metadata">common.elem.metadata</a></span>, 
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: progress.html
===================================================================
RCS file: /sources/public/html5/markup/progress.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- progress.html	31 Jan 2010 06:11:00 -0000	1.30
+++ progress.html	1 Feb 2010 02:34:53 -0000	1.31
@@ -17,19 +17,9 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#progress-content-model">#</a></h2><div class="content-models">
-        
-      <div id="progress-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="progress-mdl" href="progress.html#progress-mdl" class="element">progress</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="progress.html#progress.attrs">progress.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="progress-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -76,9 +66,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="progress-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#progress-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#progress-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: dfn.html
===================================================================
RCS file: /sources/public/html5/markup/dfn.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- dfn.html	30 Jan 2010 04:44:22 -0000	1.28
+++ dfn.html	1 Feb 2010 02:34:50 -0000	1.29
@@ -17,19 +17,9 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#dfn-content-model">#</a></h2><div class="content-models">
-        
-      <div id="dfn-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="dfn-mdl" href="dfn.html#dfn-mdl" class="element">dfn</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="dfn.html#dfn.attrs">dfn.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="dfn-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -53,9 +43,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="dfn-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#dfn-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#dfn-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: textarea.html
===================================================================
RCS file: /sources/public/html5/markup/textarea.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- textarea.html	31 Jan 2010 06:11:01 -0000	1.32
+++ textarea.html	1 Feb 2010 02:34:54 -0000	1.33
@@ -20,18 +20,9 @@
   </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>
+      <a href="syntax.html#replaceable-character-data">replaceable character data</a>
     </p>
-  </div></div><div class="no-number no-toc" id="textarea-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#textarea-content-model">#</a></h2><div class="content-models">
-        
-      <div id="textarea-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="textarea-mdl" href="textarea.html#textarea-mdl" class="element">textarea</a> = </span><span>
-      <a class="ref" href="syntax.html#replaceable-character-data">replaceable-character-data</a>
-       &amp; <a class="ref" href="textarea.html#textarea.attrs">textarea.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="textarea-attr-mdl">
+  </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>
@@ -98,9 +89,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="textarea-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#textarea-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#textarea-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       
         <div class="no-number no-toc" id="textarea-details">

Index: cite.html
===================================================================
RCS file: /sources/public/html5/markup/cite.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- cite.html	30 Jan 2010 04:44:21 -0000	1.27
+++ cite.html	1 Feb 2010 02:34:50 -0000	1.28
@@ -19,19 +19,9 @@
     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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#cite-content-model">#</a></h2><div class="content-models">
-        
-      <div id="cite-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="cite-mdl" href="cite.html#cite-mdl" class="element">cite</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="cite.html#cite.attrs">cite.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="cite-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -46,9 +36,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="cite-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#cite-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#cite-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="cite-display">

Index: meter.html
===================================================================
RCS file: /sources/public/html5/markup/meter.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- meter.html	31 Jan 2010 06:11:00 -0000	1.31
+++ meter.html	1 Feb 2010 02:34:53 -0000	1.32
@@ -18,19 +18,9 @@
     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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#meter-content-model">#</a></h2><div class="content-models">
-        
-      <div id="meter-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="meter-mdl" href="meter.html#meter-mdl" class="element">meter</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="meter.html#meter.attrs">meter.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="meter-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -160,9 +150,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="meter-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#meter-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#meter-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: input.button.html
===================================================================
RCS file: /sources/public/html5/markup/input.button.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- input.button.html	30 Jan 2010 04:44:22 -0000	1.29
+++ input.button.html	1 Feb 2010 02:34:51 -0000	1.30
@@ -19,15 +19,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#input.button-content-model">#</a></h2><div class="content-models">
-        
-      <div id="input.button-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="input.button-mdl" href="input.button.html#input.button-mdl"><span class="element">input</span>.button</a> = </span><span>
-      <a class="ref" href="input.button.html#input.button.attrs">input.button.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="input.button-attr-mdl">
+      <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">
         <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>
@@ -86,9 +78,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="input.button-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.button-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#input.button-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: aside.html
===================================================================
RCS file: /sources/public/html5/markup/aside.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- aside.html	30 Jan 2010 04:44:21 -0000	1.31
+++ aside.html	1 Feb 2010 02:34:49 -0000	1.32
@@ -18,20 +18,9 @@
     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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#aside-content-model">#</a></h2><div class="content-models">
-        
-      <div id="aside-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="aside-mdl" href="aside.html#aside-mdl" class="element">aside</a> = </span><span>
-      <a class="ref" href="style.html#style-pattern">style</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span>  <span class="postfix followedby">followed by</span> 
-  (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="aside.html#aside.attrs">aside.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="aside-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></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>
@@ -55,9 +44,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="aside-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#aside-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#aside-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="aside-display">

Index: section.html
===================================================================
RCS file: /sources/public/html5/markup/section.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- section.html	31 Jan 2010 06:11:00 -0000	1.34
+++ section.html	1 Feb 2010 02:34:53 -0000	1.35
@@ -18,20 +18,9 @@
     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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#section-content-model">#</a></h2><div class="content-models">
-        
-      <div id="section-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="section-mdl" href="section.html#section-mdl" class="element">section</a> = </span><span>
-      <a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span>  <span class="postfix followedby">followed by</span> 
-  (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="section.html#section.attrs">section.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="section-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></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>
@@ -55,9 +44,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="section-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#section-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#section-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="section-display">

Index: link.html
===================================================================
RCS file: /sources/public/html5/markup/link.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- link.html	31 Jan 2010 06:10:59 -0000	1.31
+++ link.html	1 Feb 2010 02:34:52 -0000	1.32
@@ -19,16 +19,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#link-content-model">#</a></h2><div class="content-models">
-        
-      <div id="link-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="link-mdl" href="link.html#link-mdl" class="element">link</a> = </span><span>
-      empty
-       &amp; <a class="ref" href="link.html#link.attrs">link.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="link-attr-mdl">
+      <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">
         <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>
@@ -124,23 +115,10 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="link-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#link-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.metadata">common.elem.metadata</a> = <a class="ref" href="link.html#link">link</a>
-   <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
-   <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a>
-   <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-   <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a></li>
-        <li class="context-mdl"><a href="noscript.html#noscript.elem.head">noscript.elem.head</a> = (<a class="ref" href="link.html#link">link</a>
-    <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-    <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-    <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a>)<span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#link-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.metadata">common.elem.metadata</a></span>, 
+        <span class="context-mdl"><a href="noscript.html#noscript">noscript</a></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.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- meta.http-equiv.refresh.html	31 Jan 2010 06:11:00 -0000	1.28
+++ meta.http-equiv.refresh.html	1 Feb 2010 02:34:53 -0000	1.29
@@ -23,16 +23,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <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 class="element-pattern-name"><a id="meta.http-equiv.refresh-mdl" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh-mdl"><span class="element">meta</span>.http-equiv.refresh</a> = </span><span>
-      empty
-       &amp; <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh.attrs">meta.http-equiv.refresh.attrs</a>
-    </span></p>
-        </div>
-      </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-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">
         <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>
@@ -75,23 +66,10 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="meta.http-equiv.refresh-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#meta.http-equiv.refresh-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.metadata">common.elem.metadata</a> = <a class="ref" href="link.html#link">link</a>
-   <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
-   <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a>
-   <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-   <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a></li>
-        <li class="context-mdl"><a href="noscript.html#noscript.elem.head">noscript.elem.head</a> = (<a class="ref" href="link.html#link">link</a>
-    <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-    <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-    <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a>)<span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#meta.http-equiv.refresh-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.metadata">common.elem.metadata</a></span>, 
+        <span class="context-mdl"><a href="noscript.html#noscript">noscript</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: area.html
===================================================================
RCS file: /sources/public/html5/markup/area.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- area.html	30 Jan 2010 05:49:59 -0000	1.34
+++ area.html	1 Feb 2010 02:34:49 -0000	1.35
@@ -20,16 +20,7 @@
       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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#area-content-model">#</a></h2><div class="content-models">
-        
-      <div id="area-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="area-mdl" href="area.html#area-mdl" class="element">area</a> = </span><span>
-      empty
-       &amp; <a class="ref" href="area.html#area.attrs">area.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="area-attr-mdl">
+      <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">
         <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>
@@ -104,15 +95,15 @@
     </span> </dt>
             <dd>The MIME type of the destination of the hyperlink.</dd>
           
-            <dt><a class="attribute-name" id="area.attrs.shape.rect" title="area.attrs.shape.rect" href="area.html#area.attrs.shape.rect">shape<span class="attr-qualifier">.rect</span></a> = <span class="attr-values">  "rect" </span><span class="punc"><a href=".html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a></span> <a class="attribute-name" id="area.attrs.coords.rect" title="area.attrs.coords.rect" href="area.html#area.attrs.coords.rect">coords<span class="attr-qualifier">.rect</span></a> = <span class="attr-values"> d:rectangle </span></dt>
+            <dt><a class="attribute-name" id="area.attrs.shape.rect" title="area.attrs.shape.rect" href="area.html#area.attrs.shape.rect">shape<span class="attr-qualifier">.rect</span></a> = <span class="attr-values">  "rect" </span><span class="punc postfix &amp;">&amp;</span> <a class="attribute-name" id="area.attrs.coords.rect" title="area.attrs.coords.rect" href="area.html#area.attrs.coords.rect">coords<span class="attr-qualifier">.rect</span></a> = <span class="attr-values"> d:rectangle </span></dt>
             <dd>Specifies that the shape of the area of this hyperlink
         on the image map is a rectangle.</dd>
           
-            <dt><a class="attribute-name" id="area.attrs.shape.circle" title="area.attrs.shape.circle" href="area.html#area.attrs.shape.circle">shape<span class="attr-qualifier">.circle</span></a> = <span class="attr-values">  "circle" </span><span class="punc"><a href=".html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a></span> <a class="attribute-name" id="area.attrs.coords.circle" title="area.attrs.coords.circle" href="area.html#area.attrs.coords.circle">coords<span class="attr-qualifier">.circle</span></a> = <span class="attr-values"> d:circle </span></dt>
+            <dt><a class="attribute-name" id="area.attrs.shape.circle" title="area.attrs.shape.circle" href="area.html#area.attrs.shape.circle">shape<span class="attr-qualifier">.circle</span></a> = <span class="attr-values">  "circle" </span><span class="punc postfix &amp;">&amp;</span> <a class="attribute-name" id="area.attrs.coords.circle" title="area.attrs.coords.circle" href="area.html#area.attrs.coords.circle">coords<span class="attr-qualifier">.circle</span></a> = <span class="attr-values"> d:circle </span></dt>
             <dd>Specifies that the shape of the area of this hyperlink
         on the image map is a circle.</dd>
           
-            <dt><a class="attribute-name" id="area.attrs.shape.poly" title="area.attrs.shape.poly" href="area.html#area.attrs.shape.poly">shape<span class="attr-qualifier">.poly</span></a> = <span class="attr-values">  "poly" </span><span class="punc"><a href=".html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a></span> <a class="attribute-name" id="area.attrs.coords.poly" title="area.attrs.coords.poly" href="area.html#area.attrs.coords.poly">coords<span class="attr-qualifier">.poly</span></a> = <span class="attr-values"> d:polyline </span></dt>
+            <dt><a class="attribute-name" id="area.attrs.shape.poly" title="area.attrs.shape.poly" href="area.html#area.attrs.shape.poly">shape<span class="attr-qualifier">.poly</span></a> = <span class="attr-values">  "poly" </span><span class="punc postfix &amp;">&amp;</span> <a class="attribute-name" id="area.attrs.coords.poly" title="area.attrs.coords.poly" href="area.html#area.attrs.coords.poly">coords<span class="attr-qualifier">.poly</span></a> = <span class="attr-values"> d:polyline </span></dt>
             <dd>Specifies that the shape of the area of this hyperlink
         on the image map is a polygon.</dd>
           
@@ -145,9 +136,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="area-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#area-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#area-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="area-display">

Index: input.text.html
===================================================================
RCS file: /sources/public/html5/markup/input.text.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- input.text.html	31 Jan 2010 06:10:59 -0000	1.30
+++ input.text.html	1 Feb 2010 02:34:52 -0000	1.31
@@ -19,15 +19,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#input.text-content-model">#</a></h2><div class="content-models">
-        
-      <div id="input.text-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="input.text-mdl" href="input.text.html#input.text-mdl"><span class="element">input</span>.text</a> = </span><span>
-      <a class="ref" href="input.text.html#input.text.attrs">input.text.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="input.text-attr-mdl">
+      <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">
         <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>
@@ -94,9 +86,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="input.text-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.text-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#input.text-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: Makefile
===================================================================
RCS file: /sources/public/html5/markup/Makefile,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- Makefile	28 Jan 2010 22:13:49 -0000	1.82
+++ Makefile	1 Feb 2010 02:34:49 -0000	1.83
@@ -31,6 +31,12 @@
 
 ELEMENTS=$(wildcard elements/*.html)
 
+ifeq ($(SHOW_CONTENT_MODELS),1)
+SHOW_CONTENT_MODELS=1
+else
+SHOW_CONTENT_MODELS=0
+endif
+
 all: Overview.html spec.html
 
 patch-schema: $(SCHEMA_FILES)
@@ -73,7 +79,9 @@
   src/terms.html src/syntax.html src/documents.html \
   $(ELEMENTS) src/attributes.html src/datatypes.html src/references.html \
   LICENSE.xml html.css.xml html.css.LICENSE.xml
-	$(XSLTPROC) $(XSLTPROCFLAGS) tools/generate-spec-source.xsl $< \
+	$(XSLTPROC) $(XSLTPROCFLAGS) \
+	  --param show-content-models $(SHOW_CONTENT_MODELS) \
+	  tools/generate-spec-source.xsl $< \
 	  | $(PERL) $(PERLFLAGS) -pi -e 's|(Use CSS instead). (http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes)|<a href="$$2">$$1</a>.|g' > $@
 
 Overview.html: html.spec.src.html src/status.html tools/specgen.xsl tools/toc.xsl tools/chunker.xsl

Index: samp.html
===================================================================
RCS file: /sources/public/html5/markup/samp.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- samp.html	31 Jan 2010 06:11:00 -0000	1.28
+++ samp.html	1 Feb 2010 02:34:53 -0000	1.29
@@ -18,19 +18,9 @@
     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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#samp-content-model">#</a></h2><div class="content-models">
-        
-      <div id="samp-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="samp-mdl" href="samp.html#samp-mdl" class="element">samp</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="samp.html#samp.attrs">samp.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="samp-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -45,9 +35,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="samp-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#samp-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#samp-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="samp-display">

Index: h6.html
===================================================================
RCS file: /sources/public/html5/markup/h6.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- h6.html	30 Jan 2010 04:44:22 -0000	1.33
+++ h6.html	1 Feb 2010 02:34:51 -0000	1.34
@@ -17,19 +17,9 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#h6-content-model">#</a></h2><div class="content-models">
-        
-      <div id="h6-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="h6-mdl" href="h6.html#h6-mdl" class="element">h6</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="h6.html#h6.attrs">h6.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="h6-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -57,15 +47,10 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="h6-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#h6-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li>
-        <li class="context-mdl"><a href="hgroup.html#hgroup-mdl">hgroup</a> = (<a class="ref" href="h1.html#h1">h1</a>
-    <span class="postfix or">or</span> <a class="ref" href="h2.html#h2">h2</a>
-    <span class="postfix or">or</span> <a class="ref" href="h3.html#h3">h3</a>
-    <span class="postfix or">or</span> <a class="ref" href="h4.html#h4">h4</a>
-    <span class="postfix or">or</span> <a class="ref" href="h5.html#h5">h5</a>
-    <span class="postfix or">or</span> <a class="ref" href="h6.html#h6">h6</a>)<span class="postfix oneormore" title="ONE OR MORE">+</span> </li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#h6-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span>, 
+        <span class="context-mdl"><a href="hgroup.html#hgroup">hgroup</a></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.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- input.checkbox.html	30 Jan 2010 04:44:22 -0000	1.29
+++ input.checkbox.html	1 Feb 2010 02:34:51 -0000	1.30
@@ -19,15 +19,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#input.checkbox-content-model">#</a></h2><div class="content-models">
-        
-      <div id="input.checkbox-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="input.checkbox-mdl" href="input.checkbox.html#input.checkbox-mdl"><span class="element">input</span>.checkbox</a> = </span><span>
-      <a class="ref" href="input.checkbox.html#input.checkbox.attrs">input.checkbox.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="input.checkbox-attr-mdl">
+      <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">
         <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>
@@ -88,9 +80,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="input.checkbox-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.checkbox-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#input.checkbox-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: a.html
===================================================================
RCS file: /sources/public/html5/markup/a.html,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- a.html	30 Jan 2010 04:44:20 -0000	1.41
+++ a.html	1 Feb 2010 02:34:49 -0000	1.42
@@ -18,24 +18,7 @@
     <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#a-content-model">#</a></h2><div class="content-models">
-        
-      <dl id="a-mdls">
-        <dt class="content-model"><span class="element-pattern-name" id="a.elem.phrasing"><a class="hash" href="a.html#a.elem.phrasing"><span class="element">a</span>.elem.phrasing</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="a.html#a.attrs">a.attrs</a>
-    </span></dd>
-        <dt class="content-model"><span class="element-pattern-name" id="a.elem.flow"><a class="hash" href="a.html#a.elem.flow"><span class="element">a</span>.elem.flow</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="a.html#a.attrs">a.attrs</a>
-    </span></dd>
-        </dl>
-      </div></div><div class="no-number no-toc" id="a-attr-mdl">
+      <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">
         <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>
@@ -147,10 +130,10 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="a-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#a-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#a-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span>, 
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="a-display">

Index: object.html
===================================================================
RCS file: /sources/public/html5/markup/object.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- object.html	31 Jan 2010 06:11:00 -0000	1.36
+++ object.html	1 Feb 2010 02:34:53 -0000	1.37
@@ -23,26 +23,7 @@
     elements, then,
     <a href="terminology.html#transparent">transparent</a>
     </p>
-  </div></div><div class="no-number no-toc" id="object-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#object-content-model">#</a></h2><div class="content-models">
-        
-      <dl id="object-mdls">
-        <dt class="content-model"><span class="element-pattern-name" id="object.elem.flow"><a class="hash" href="object.html#object.elem.flow"><span class="element">object</span>.elem.flow</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      <a class="ref" href="param.html#param">param</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span>  <span class="postfix followedby">followed by</span> 
-  (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="object.html#object.attrs">object.attrs</a>
-    </span></dd>
-        <dt class="content-model"><span class="element-pattern-name" id="object.elem.phrasing"><a class="hash" href="object.html#object.elem.phrasing"><span class="element">object</span>.elem.phrasing</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      <a class="ref" href="param.html#param">param</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span>  <span class="postfix followedby">followed by</span> 
-  (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="object.html#object.attrs">object.attrs</a>
-    </span></dd>
-        </dl>
-      </div></div><div class="no-number no-toc" id="object-attr-mdl">
+  </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>
@@ -159,10 +140,10 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="object-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#object-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#object-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span>, 
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       
         <div class="no-number no-toc" id="object-details">

Index: input.tel.html
===================================================================
RCS file: /sources/public/html5/markup/input.tel.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- input.tel.html	31 Jan 2010 06:10:59 -0000	1.28
+++ input.tel.html	1 Feb 2010 02:34:52 -0000	1.29
@@ -19,15 +19,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#input.tel-content-model">#</a></h2><div class="content-models">
-        
-      <div id="input.tel-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="input.tel-mdl" href="input.tel.html#input.tel-mdl"><span class="element">input</span>.tel</a> = </span><span>
-      <a class="ref" href="input.tel.html#input.tel.attrs">input.tel.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="input.tel-attr-mdl">
+      <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">
         <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>
@@ -95,9 +87,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="input.tel-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.tel-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#input.tel-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: h4.html
===================================================================
RCS file: /sources/public/html5/markup/h4.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- h4.html	30 Jan 2010 04:44:22 -0000	1.33
+++ h4.html	1 Feb 2010 02:34:51 -0000	1.34
@@ -17,19 +17,9 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#h4-content-model">#</a></h2><div class="content-models">
-        
-      <div id="h4-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="h4-mdl" href="h4.html#h4-mdl" class="element">h4</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="h4.html#h4.attrs">h4.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="h4-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -57,15 +47,10 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="h4-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#h4-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li>
-        <li class="context-mdl"><a href="hgroup.html#hgroup-mdl">hgroup</a> = (<a class="ref" href="h1.html#h1">h1</a>
-    <span class="postfix or">or</span> <a class="ref" href="h2.html#h2">h2</a>
-    <span class="postfix or">or</span> <a class="ref" href="h3.html#h3">h3</a>
-    <span class="postfix or">or</span> <a class="ref" href="h4.html#h4">h4</a>
-    <span class="postfix or">or</span> <a class="ref" href="h5.html#h5">h5</a>
-    <span class="postfix or">or</span> <a class="ref" href="h6.html#h6">h6</a>)<span class="postfix oneormore" title="ONE OR MORE">+</span> </li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#h4-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span>, 
+        <span class="context-mdl"><a href="hgroup.html#hgroup">hgroup</a></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.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- header.html	30 Jan 2010 04:44:22 -0000	1.31
+++ header.html	1 Feb 2010 02:34:51 -0000	1.32
@@ -17,19 +17,9 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#header-content-model">#</a></h2><div class="content-models">
-        
-      <div id="header-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="header-mdl" href="header.html#header-mdl" class="element">header</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="header.html#header.attrs">header.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="header-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></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>
@@ -59,9 +49,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="header-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#header-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#header-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="header-display">

Index: b.html
===================================================================
RCS file: /sources/public/html5/markup/b.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- b.html	30 Jan 2010 04:44:21 -0000	1.28
+++ b.html	1 Feb 2010 02:34:49 -0000	1.29
@@ -20,19 +20,9 @@
     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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#b-content-model">#</a></h2><div class="content-models">
-        
-      <div id="b-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="b-mdl" href="b.html#b-mdl" class="element">b</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="b.html#b.attrs">b.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="b-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -47,9 +37,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="b-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#b-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#b-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="b-display">

Index: img.html
===================================================================
RCS file: /sources/public/html5/markup/img.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- img.html	30 Jan 2010 04:44:22 -0000	1.33
+++ img.html	1 Feb 2010 02:34:51 -0000	1.34
@@ -17,16 +17,7 @@
     <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#img-content-model">#</a></h2><div class="content-models">
-        
-      <div id="img-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="img-mdl" href="img.html#img-mdl" class="element">img</a> = </span><span>
-      empty
-       &amp; <a class="ref" href="img.html#img.attrs">img.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="img-attr-mdl">
+      <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">
         <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>
@@ -139,9 +130,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="img-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#img-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#img-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: bdo.html
===================================================================
RCS file: /sources/public/html5/markup/bdo.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- bdo.html	30 Jan 2010 04:44:21 -0000	1.30
+++ bdo.html	1 Feb 2010 02:34:49 -0000	1.31
@@ -18,19 +18,9 @@
     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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#bdo-content-model">#</a></h2><div class="content-models">
-        
-      <div id="bdo-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="bdo-mdl" href="bdo.html#bdo-mdl" class="element">bdo</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="bdo.html#bdo.attrs">bdo.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="bdo-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -54,9 +44,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="bdo-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#bdo-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#bdo-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: input.number.html
===================================================================
RCS file: /sources/public/html5/markup/input.number.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- input.number.html	31 Jan 2010 06:10:59 -0000	1.29
+++ input.number.html	1 Feb 2010 02:34:51 -0000	1.30
@@ -20,15 +20,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#input.number-content-model">#</a></h2><div class="content-models">
-        
-      <div id="input.number-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="input.number-mdl" href="input.number.html#input.number-mdl"><span class="element">input</span>.number</a> = </span><span>
-      <a class="ref" href="input.number.html#input.number.attrs">input.number.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="input.number-attr-mdl">
+      <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">
         <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>
@@ -109,9 +101,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="input.number-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.number-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#input.number-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: col.html
===================================================================
RCS file: /sources/public/html5/markup/col.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- col.html	30 Jan 2010 04:44:21 -0000	1.28
+++ col.html	1 Feb 2010 02:34:50 -0000	1.29
@@ -19,16 +19,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#col-content-model">#</a></h2><div class="content-models">
-        
-      <div id="col-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="col-mdl" href="col.html#col-mdl" class="element">col</a> = </span><span>
-      empty
-       &amp; <a class="ref" href="col.html#col.attrs">col.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="col-attr-mdl">
+      <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">
         <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>
@@ -77,10 +68,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="col-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#col-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="colgroup.html#colgroup-mdl">colgroup</a> = <a class="ref" href="col.html#col">col</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-   <span class="postfix or">or</span> <a class="ref" href="colgroup.html#colgroup.attrs.span" title="colgroup.attrs.span">span</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#col-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="colgroup.html#colgroup">colgroup</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="col-display">

Index: command.radio.html
===================================================================
RCS file: /sources/public/html5/markup/command.radio.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- command.radio.html	30 Jan 2010 04:44:21 -0000	1.29
+++ command.radio.html	1 Feb 2010 02:34:50 -0000	1.30
@@ -19,16 +19,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#command.radio-content-model">#</a></h2><div class="content-models">
-        
-      <div id="command.radio-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="command.radio-mdl" href="command.radio.html#command.radio-mdl"><span class="element">command</span>.radio</a> = </span><span>
-      empty
-       &amp; <a class="ref" href="command.radio.html#command.radio.attrs">command.radio.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="command.radio-attr-mdl">
+      <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">
         <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>
@@ -80,20 +71,10 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="command.radio-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#command.radio-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.metadata">common.elem.metadata</a> = <a class="ref" href="link.html#link">link</a>
-   <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
-   <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a>
-   <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-   <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a></li>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#command.radio-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.metadata">common.elem.metadata</a></span>, 
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: input.datetime.html
===================================================================
RCS file: /sources/public/html5/markup/input.datetime.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- input.datetime.html	30 Jan 2010 04:44:23 -0000	1.28
+++ input.datetime.html	1 Feb 2010 02:34:51 -0000	1.29
@@ -21,15 +21,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#input.datetime-content-model">#</a></h2><div class="content-models">
-        
-      <div id="input.datetime-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="input.datetime-mdl" href="input.datetime.html#input.datetime-mdl"><span class="element">input</span>.datetime</a> = </span><span>
-      <a class="ref" href="input.datetime.html#input.datetime.attrs">input.datetime.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="input.datetime-attr-mdl">
+      <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">
         <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>
@@ -110,9 +102,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="input.datetime-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.datetime-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#input.datetime-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: input.password.html
===================================================================
RCS file: /sources/public/html5/markup/input.password.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- input.password.html	31 Jan 2010 06:10:59 -0000	1.30
+++ input.password.html	1 Feb 2010 02:34:52 -0000	1.31
@@ -19,15 +19,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#input.password-content-model">#</a></h2><div class="content-models">
-        
-      <div id="input.password-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="input.password-mdl" href="input.password.html#input.password-mdl"><span class="element">input</span>.password</a> = </span><span>
-      <a class="ref" href="input.password.html#input.password.attrs">input.password.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="input.password-attr-mdl">
+      <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">
         <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>
@@ -94,9 +86,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="input.password-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.password-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#input.password-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: embed.html
===================================================================
RCS file: /sources/public/html5/markup/embed.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- embed.html	30 Jan 2010 04:44:22 -0000	1.31
+++ embed.html	1 Feb 2010 02:34:50 -0000	1.32
@@ -17,16 +17,7 @@
     <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#embed-content-model">#</a></h2><div class="content-models">
-        
-      <div id="embed-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="embed-mdl" href="embed.html#embed-mdl" class="element">embed</a> = </span><span>
-      empty
-       &amp; <a class="ref" href=".html#embed.attrs">embed.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="embed-attr-mdl">
+      <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">
         <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> 
@@ -88,9 +79,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="embed-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#embed-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#embed-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       
         <div class="no-number no-toc" id="embed-details">

Index: dd.html
===================================================================
RCS file: /sources/public/html5/markup/dd.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- dd.html	30 Jan 2010 04:44:21 -0000	1.31
+++ dd.html	1 Feb 2010 02:34:50 -0000	1.32
@@ -19,19 +19,9 @@
     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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#dd-content-model">#</a></h2><div class="content-models">
-        
-      <div id="dd-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="dd-mdl" href="dd.html#dd-mdl" class="element">dd</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="dd.html#dd.attrs">dd.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="dd-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></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>
@@ -50,10 +40,9 @@
   
       </div>
       <div class="no-number no-toc" id="dd-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#dd-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="dl.html#dl-mdl">dl</a> = (<a class="ref" href="dt.html#dt">dt</a><span class="postfix oneormore" title="ONE OR MORE">+</span>  <span class="postfix followedby">followed by</span> 
-   <a class="ref" href="dd.html#dd">dd</a><span class="postfix oneormore" title="ONE OR MORE">+</span> )<span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#dd-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="dl.html#dl">dl</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="dd-display">

Index: common-models.html
===================================================================
RCS file: /sources/public/html5/markup/common-models.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- common-models.html	30 Jan 2010 04:44:21 -0000	1.22
+++ common-models.html	1 Feb 2010 02:34:50 -0000	1.23
@@ -19,12 +19,11 @@
               subsections of the per-element documentation in the
               <a href="elements.html">HTML elements</a>
               section.</p>
-      <div id="common-flow" class="section">
-        <h2 class="common-subhead">6.01. Flow elements <a class="hash" href="#common-flow">#</a> <a class="toc-bak" href="Overview.html#common-flow-toc">T</a></h2>
-        <dl class="content-models">
-          <dt class="content-model"><span class="common-pattern-name"><dfn id="common.elem.flow">common.elem.flow</dfn></span> = <a class="hash" href="common-models.html#common.elem.flow">#</a></dt>
-          <dd><a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>
-   <span class="postfix or">or</span> <a class="ref" href="a.html#a.elem.flow">a.elem.flow</a>
+      <div id="common.elem.flow" class="section">
+        <h2 class="common-subhead">6.01. Flow elements <a class="hash" href="#common.elem.flow">#</a> <a class="toc-bak" href="Overview.html#common.elem.flow-toc">T</a></h2>
+        <div class="content-models">
+          <p><a class="ref" href="common-models.html#common.elem.phrasing">phrasing elements</a>
+   <span class="postfix or">or</span> <a class="ref" href="a.html#a">a</a>
    <span class="postfix or">or</span> <a class="ref" href="p.html#p">p</a>
    <span class="postfix or">or</span> <a class="ref" href="hr.html#hr">hr</a>
    <span class="postfix or">or</span> <a class="ref" href="pre.html#pre">pre</a>
@@ -41,33 +40,32 @@
    <span class="postfix or">or</span> <a class="ref" href="hgroup.html#hgroup">hgroup</a>
    <span class="postfix or">or</span> <a class="ref" href="address.html#address">address</a>
    <span class="postfix or">or</span> <a class="ref" href="blockquote.html#blockquote">blockquote</a>
-   <span class="postfix or">or</span> <a class="ref" href="ins.html#ins.elem.flow">ins.elem.flow</a>
-   <span class="postfix or">or</span> <a class="ref" href="del.html#del.elem.flow">del.elem.flow</a>
-   <span class="postfix or">or</span> <a class="ref" href="object.html#object.elem.flow">object.elem.flow</a>
-   <span class="postfix or">or</span> <a class="ref" href="map.html#map.elem.flow">map.elem.flow</a>
-   <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.flow">noscript.elem.flow</a>
+   <span class="postfix or">or</span> <a class="ref" href="ins.html#ins">ins</a>
+   <span class="postfix or">or</span> <a class="ref" href="del.html#del">del</a>
+   <span class="postfix or">or</span> <a class="ref" href="object.html#object">object</a>
+   <span class="postfix or">or</span> <a class="ref" href="map.html#map">map</a>
+   <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript">noscript</a>
    <span class="postfix or">or</span> <a class="ref" href="section.html#section">section</a>
    <span class="postfix or">or</span> <a class="ref" href="nav.html#nav">nav</a>
    <span class="postfix or">or</span> <a class="ref" href="article.html#article">article</a>
    <span class="postfix or">or</span> <a class="ref" href="aside.html#aside">aside</a>
    <span class="postfix or">or</span> <a class="ref" href="header.html#header">header</a>
    <span class="postfix or">or</span> <a class="ref" href="footer.html#footer">footer</a>
-   <span class="postfix or">or</span> <a class="ref" href="video.html#video.elem.flow">video.elem.flow</a>
-   <span class="postfix or">or</span> <a class="ref" href="audio.html#audio.elem.flow">audio.elem.flow</a>
+   <span class="postfix or">or</span> <a class="ref" href="video.html#video">video</a>
+   <span class="postfix or">or</span> <a class="ref" href="audio.html#audio">audio</a>
    <span class="postfix or">or</span> <a class="ref" href="table.html#table">table</a>
    <span class="postfix or">or</span> <a class="ref" href="form.html#form">form</a>
    <span class="postfix or">or</span> <a class="ref" href="fieldset.html#fieldset">fieldset</a>
    <span class="postfix or">or</span> <a class="ref" href="menu.html#menu">menu</a>
-   <span class="postfix or">or</span> <a class="ref" href="canvas.html#canvas.elem.flow">canvas.elem.flow</a>
-          </dd>
-        </dl>
+   <span class="postfix or">or</span> <a class="ref" href="canvas.html#canvas">canvas</a>
+          </p>
+        </div>
       </div>
-      <div id="common-metadata" class="section">
-        <h2 class="common-subhead">6.02. Metadata elements <a class="hash" href="#common-metadata">#</a> <a class="toc-bak" href="Overview.html#common-metadata-toc">T</a></h2>
-        <dl class="content-models">
-          <dt class="content-model"><span class="common-pattern-name"><dfn id="common.elem.metadata">common.elem.metadata</dfn></span> = <a class="hash" href="common-models.html#common.elem.metadata">#</a></dt>
-          <dd><a class="ref" href="link.html#link">link</a>
-   <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a>
+      <div id="common.elem.metadata" class="section">
+        <h2 class="common-subhead">6.02. Metadata elements <a class="hash" href="#common.elem.metadata">#</a> <a class="toc-bak" href="Overview.html#common.elem.metadata-toc">T</a></h2>
+        <div class="content-models">
+          <p><a class="ref" href="link.html#link">link</a>
+   <span class="postfix or">or</span> <a class="ref" href="style.html#style">style</a>
    <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
    <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
    <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
@@ -75,16 +73,15 @@
    <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
    <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
    <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a>
-   <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
+   <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript">noscript</a>
    <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a>
-          </dd>
-        </dl>
+          </p>
+        </div>
       </div>
-      <div id="common-phrasing" class="section">
-        <h2 class="common-subhead">6.03. Phrasing elements <a class="hash" href="#common-phrasing">#</a> <a class="toc-bak" href="Overview.html#common-phrasing-toc">T</a></h2>
-        <dl class="content-models">
-          <dt class="content-model"><span class="common-pattern-name"><dfn id="common.elem.phrasing">common.elem.phrasing</dfn></span> = <a class="hash" href="common-models.html#common.elem.phrasing">#</a></dt>
-          <dd><a class="ref" href="a.html#a.elem.phrasing">a.elem.phrasing</a>
+      <div id="common.elem.phrasing" class="section">
+        <h2 class="common-subhead">6.03. Phrasing elements <a class="hash" href="#common.elem.phrasing">#</a> <a class="toc-bak" href="Overview.html#common.elem.phrasing-toc">T</a></h2>
+        <div class="content-models">
+          <p><a class="ref" href="a.html#a">a</a>
    <span class="postfix or">or</span> <a class="ref" href="em.html#em">em</a>
    <span class="postfix or">or</span> <a class="ref" href="strong.html#strong">strong</a>
    <span class="postfix or">or</span> <a class="ref" href="small.html#small">small</a>
@@ -104,19 +101,19 @@
    <span class="postfix or">or</span> <a class="ref" href="span.html#span">span</a>
    <span class="postfix or">or</span> <a class="ref" href="bdo.html#bdo">bdo</a>
    <span class="postfix or">or</span> <a class="ref" href="br.html#br">br</a>
-   <span class="postfix or">or</span> <a class="ref" href="ins.html#ins.elem.phrasing">ins.elem.phrasing</a>
-   <span class="postfix or">or</span> <a class="ref" href="del.html#del.elem.phrasing">del.elem.phrasing</a>
+   <span class="postfix or">or</span> <a class="ref" href="ins.html#ins">ins</a>
+   <span class="postfix or">or</span> <a class="ref" href="del.html#del">del</a>
    <span class="postfix or">or</span> <a class="ref" href="img.html#img">img</a>
    <span class="postfix or">or</span> <a class="ref" href="embed.html#embed">embed</a>
-   <span class="postfix or">or</span> <a class="ref" href="object.html#object.elem.phrasing">object.elem.phrasing</a>
+   <span class="postfix or">or</span> <a class="ref" href="object.html#object">object</a>
    <span class="postfix or">or</span> <a class="ref" href="iframe.html#iframe">iframe</a>
-   <span class="postfix or">or</span> <a class="ref" href="map.html#map.elem.phrasing">map.elem.phrasing</a>
+   <span class="postfix or">or</span> <a class="ref" href="map.html#map">map</a>
    <span class="postfix or">or</span> <a class="ref" href="area.html#area">area</a>
    <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a>
-   <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.phrasing">noscript.elem.phrasing</a>
+   <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript">noscript</a>
    <span class="postfix or">or</span> <a class="ref" href="ruby.html#ruby">ruby</a>
-   <span class="postfix or">or</span> <a class="ref" href="video.html#video.elem.phrasing">video.elem.phrasing</a>
-   <span class="postfix or">or</span> <a class="ref" href="audio.html#audio.elem.phrasing">audio.elem.phrasing</a>
+   <span class="postfix or">or</span> <a class="ref" href="video.html#video">video</a>
+   <span class="postfix or">or</span> <a class="ref" href="audio.html#audio">audio</a>
    <span class="postfix or">or</span> <a class="ref" href="input.html#input">input</a>
    <span class="postfix or">or</span> <a class="ref" href="textarea.html#textarea">textarea</a>
    <span class="postfix or">or</span> <a class="ref" href="select.html#select">select</a>
@@ -127,11 +124,11 @@
    <span class="postfix or">or</span> <a class="ref" href="keygen.html#keygen">keygen</a>
    <span class="postfix or">or</span> <a class="ref" href="progress.html#progress">progress</a>
    <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a>
-   <span class="postfix or">or</span> <a class="ref" href="canvas.html#canvas.elem.phrasing">canvas.elem.phrasing</a>
+   <span class="postfix or">or</span> <a class="ref" href="canvas.html#canvas">canvas</a>
    <span class="postfix or">or</span> <a class="ref" href="time.html#time">time</a>
    <span class="postfix or">or</span> <a class="ref" href="meter.html#meter">meter</a>
-          </dd>
-        </dl>
+          </p>
+        </div>
       </div>
     </div>
 <hr class="footerbreak"></hr>

Index: ul.html
===================================================================
RCS file: /sources/public/html5/markup/ul.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- ul.html	31 Jan 2010 06:11:01 -0000	1.26
+++ ul.html	1 Feb 2010 02:34:54 -0000	1.27
@@ -23,16 +23,7 @@
     <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#ul-content-model">#</a></h2><div class="content-models">
-        
-      <div id="ul-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="ul-mdl" href="ul.html#ul-mdl" class="element">ul</a> = </span><span>
-      <a class="ref" href="li.html#li-pattern">li</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-       &amp; <a class="ref" href="ul.html#ul.attrs">ul.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="ul-attr-mdl">
+  </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>
@@ -60,9 +51,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="ul-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#ul-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#ul-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="ul-display">

Index: input.time.html
===================================================================
RCS file: /sources/public/html5/markup/input.time.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- input.time.html	31 Jan 2010 06:10:59 -0000	1.29
+++ input.time.html	1 Feb 2010 02:34:52 -0000	1.30
@@ -20,15 +20,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#input.time-content-model">#</a></h2><div class="content-models">
-        
-      <div id="input.time-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="input.time-mdl" href="input.time.html#input.time-mdl"><span class="element">input</span>.time</a> = </span><span>
-      <a class="ref" href="input.time.html#input.time.attrs">input.time.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="input.time-attr-mdl">
+      <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">
         <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>
@@ -110,9 +102,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="input.time-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.time-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#input.time-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: dt.html
===================================================================
RCS file: /sources/public/html5/markup/dt.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- dt.html	30 Jan 2010 04:44:22 -0000	1.31
+++ dt.html	1 Feb 2010 02:34:50 -0000	1.32
@@ -19,19 +19,9 @@
     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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#dt-content-model">#</a></h2><div class="content-models">
-        
-      <div id="dt-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="dt-mdl" href="dt.html#dt-mdl" class="element">dt</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="dt.html#dt.attrs">dt.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="dt-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -49,10 +39,9 @@
   
       </div>
       <div class="no-number no-toc" id="dt-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#dt-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="dl.html#dl-mdl">dl</a> = (<a class="ref" href="dt.html#dt">dt</a><span class="postfix oneormore" title="ONE OR MORE">+</span>  <span class="postfix followedby">followed by</span> 
-   <a class="ref" href="dd.html#dd">dd</a><span class="postfix oneormore" title="ONE OR MORE">+</span> )<span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#dt-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="dl.html#dl">dl</a></span></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.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- strong.html	31 Jan 2010 06:11:01 -0000	1.28
+++ strong.html	1 Feb 2010 02:34:54 -0000	1.29
@@ -17,19 +17,9 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#strong-content-model">#</a></h2><div class="content-models">
-        
-      <div id="strong-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="strong-mdl" href="strong.html#strong-mdl" class="element">strong</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="strong.html#strong.attrs">strong.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="strong-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -44,9 +34,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="strong-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#strong-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#strong-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="strong-display">

Index: q.html
===================================================================
RCS file: /sources/public/html5/markup/q.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- q.html	31 Jan 2010 06:11:00 -0000	1.29
+++ q.html	1 Feb 2010 02:34:53 -0000	1.30
@@ -17,19 +17,9 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#q-content-model">#</a></h2><div class="content-models">
-        
-      <div id="q-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="q-mdl" href="q.html#q-mdl" class="element">q</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="q.html#q.attrs">q.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="q-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -54,9 +44,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="q-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#q-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#q-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="q-display">

Index: li.html
===================================================================
RCS file: /sources/public/html5/markup/li.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- li.html	31 Jan 2010 06:10:59 -0000	1.32
+++ li.html	1 Feb 2010 02:34:52 -0000	1.33
@@ -17,35 +17,11 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#li-content-model">#</a></h2><div class="content-models">
-        
-      <dl id="li-mdls">
-        <dt class="content-model"><span class="element-pattern-name" id="li-pattern"><a class="hash" href="li.html#li-pattern"><span class="element">li</span></a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="li.html#li.attrs">li.attrs</a>
-    </span></dd>
-        <dt class="content-model"><span class="element-pattern-name" id="oli"><a class="hash" href="li.html#oli">o<span class="element">li</span></a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="li.html#oli.attrs">oli.attrs</a>
-    </span></dd>
-        <dt class="content-model"><span class="element-pattern-name" id="mli"><a class="hash" href="li.html#mli">m<span class="element">li</span></a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="li.html#mli.attrs">mli.attrs</a>
-    </span></dd>
-        </dl>
-      </div></div><div class="no-number no-toc" id="li-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></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><span class="pattern" id="li.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p><p><span class="pattern" id="oli.attrs"><a class="ref" href="common-attributes.html">common attributes</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="li.html#oli.attrs.value" title="oli.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p><p><span class="pattern" id="mli.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div>
+        <div class="attr-content-models"><p><a href="common-attributes.html">common attributes</a><span class="postfix required" title="REQUIRED">&#9733;</span></p><p><span class="postfix or">or</span></p><p><a href="common-attributes.html">common attributes</a><span class="postfix required" title="REQUIRED">&#9733;</span> <span class="postfix &amp;">&amp;</span><a href="li.html#oli.attrs.value">value</a><span class="postfix required" title="REQUIRED">&#9733;</span></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">
@@ -77,13 +53,11 @@
   
       </div>
       <div class="no-number no-toc" id="li-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#li-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="ul.html#ul-mdl">ul</a> = <a class="ref" href="li.html#li-pattern">li</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li>
-        <li class="context-mdl"><a href="ol.html#ol-mdl">ol</a> = <a class="ref" href="li.html#oli">oli</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li>
-        <li class="context-mdl"><a href="menu.html#menu-mdl">menu</a> = <a class="ref" href="li.html#mli">mli</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-   <span class="postfix or">or</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#li-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="ul.html#ul">ul</a></span>, 
+        <span class="context-mdl"><a href="ol.html#ol">ol</a></span>, 
+        <span class="context-mdl"><a href="menu.html#menu">menu</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="li-display">

Index: style.html
===================================================================
RCS file: /sources/public/html5/markup/style.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- style.html	31 Jan 2010 06:11:01 -0000	1.33
+++ style.html	1 Feb 2010 02:34:54 -0000	1.34
@@ -21,29 +21,14 @@
   </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>
+      <a href="syntax.html#non-replaceable-character-data">non-replaceable character data</a>
     </p>
-  </div></div><div class="no-number no-toc" id="style-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#style-content-model">#</a></h2><div class="content-models">
-        
-      <dl id="style-mdls">
-        <dt class="content-model"><span class="element-pattern-name" id="style-pattern"><a class="hash" href="style.html#style-pattern"><span class="element">style</span></a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      <a class="ref" href="syntax.html#non-replaceable-character-data">non-replaceable-character-data</a>
-       &amp; <a class="ref" href="style.html#style.attrs">style.attrs</a>
-    </span></dd>
-        <dt class="content-model"><span class="element-pattern-name" id="style.elem.scoped"><a class="hash" href="style.html#style.elem.scoped"><span class="element">style</span>.elem.scoped</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      <a class="ref" href="syntax.html#non-replaceable-character-data">non-replaceable-character-data</a>
-       &amp; <a class="ref" href="style.html#style.scoped.attrs">style.scoped.attrs</a>
-    </span></dd>
-        </dl>
-      </div></div><div class="no-number no-toc" id="style-attr-mdl">
+  </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 &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>
           <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> 
@@ -82,35 +67,14 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="style-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#style-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.metadata">common.elem.metadata</a> = <a class="ref" href="link.html#link">link</a>
-   <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
-   <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a>
-   <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-   <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a></li>
-        <li class="context-mdl"><a href="div.html#div-mdl">div</a> = <a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span>  <span class="postfix followedby">followed by</span> 
-  (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li>
-        <li class="context-mdl"><a href="noscript.html#noscript.elem.head">noscript.elem.head</a> = (<a class="ref" href="link.html#link">link</a>
-    <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-    <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-    <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a>)<span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li>
-        <li class="context-mdl"><a href="section.html#section-mdl">section</a> = <a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span>  <span class="postfix followedby">followed by</span> 
-  (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li>
-        <li class="context-mdl"><a href="article.html#article-mdl">article</a> = <a class="ref" href="style.html#style-pattern">style</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span>  <span class="postfix followedby">followed by</span> 
-  (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li>
-        <li class="context-mdl"><a href="aside.html#aside-mdl">aside</a> = <a class="ref" href="style.html#style-pattern">style</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span>  <span class="postfix followedby">followed by</span> 
-  (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#style-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.metadata">common.elem.metadata</a></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>
       </div>
       
       <div class="no-number no-toc" id="style-display">

Index: del.html
===================================================================
RCS file: /sources/public/html5/markup/del.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- del.html	30 Jan 2010 04:44:22 -0000	1.32
+++ del.html	1 Feb 2010 02:34:50 -0000	1.33
@@ -18,24 +18,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#del-content-model">#</a></h2><div class="content-models">
-        
-      <dl id="del-mdls">
-        <dt class="content-model"><span class="element-pattern-name" id="del.elem.flow"><a class="hash" href="del.html#del.elem.flow"><span class="element">del</span>.elem.flow</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="del.html#del.attrs">del.attrs</a>
-    </span></dd>
-        <dt class="content-model"><span class="element-pattern-name" id="del.elem.phrasing"><a class="hash" href="del.html#del.elem.phrasing"><span class="element">del</span>.elem.phrasing</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="del.html#del.attrs">del.attrs</a>
-    </span></dd>
-        </dl>
-      </div></div><div class="no-number no-toc" id="del-attr-mdl">
+      <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">
         <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>
@@ -66,10 +49,10 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="del-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#del-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#del-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span>, 
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="del-display">

Index: menu.html
===================================================================
RCS file: /sources/public/html5/markup/menu.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- menu.html	31 Jan 2010 06:11:00 -0000	1.34
+++ menu.html	1 Feb 2010 02:34:52 -0000	1.35
@@ -27,18 +27,7 @@
       <a href="syntax.html#normal-character-data">normal character data</a>
       </li>
     </ul>
-  </div></div><div class="no-number no-toc" id="menu-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#menu-content-model">#</a></h2><div class="content-models">
-        
-      <div id="menu-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="menu-mdl" href="menu.html#menu-mdl" class="element">menu</a> = </span><span>
-      (<a class="ref" href="li.html#mli">li</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-   <span class="postfix or">or</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ))
-       &amp; <a class="ref" href="menu.html#menu.attrs">menu.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="menu-attr-mdl">
+  </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>
@@ -95,9 +84,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="menu-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#menu-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#menu-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="menu-display">

Index: input.image.html
===================================================================
RCS file: /sources/public/html5/markup/input.image.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- input.image.html	31 Jan 2010 06:10:59 -0000	1.30
+++ input.image.html	1 Feb 2010 02:34:51 -0000	1.31
@@ -22,15 +22,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#input.image-content-model">#</a></h2><div class="content-models">
-        
-      <div id="input.image-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="input.image-mdl" href="input.image.html#input.image-mdl"><span class="element">input</span>.image</a> = </span><span>
-      <a class="ref" href="input.image.html#input.image.attrs">input.image.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="input.image-attr-mdl">
+      <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">
         <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>
@@ -118,9 +110,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="input.image-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.image-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#input.image-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: code.html
===================================================================
RCS file: /sources/public/html5/markup/code.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- code.html	30 Jan 2010 04:44:21 -0000	1.27
+++ code.html	1 Feb 2010 02:34:50 -0000	1.28
@@ -17,19 +17,9 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#code-content-model">#</a></h2><div class="content-models">
-        
-      <div id="code-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="code-mdl" href="code.html#code-mdl" class="element">code</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="code.html#code.attrs">code.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="code-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -44,9 +34,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="code-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#code-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#code-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="code-display">

Index: h2.html
===================================================================
RCS file: /sources/public/html5/markup/h2.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- h2.html	30 Jan 2010 04:44:22 -0000	1.33
+++ h2.html	1 Feb 2010 02:34:50 -0000	1.34
@@ -17,19 +17,9 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#h2-content-model">#</a></h2><div class="content-models">
-        
-      <div id="h2-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="h2-mdl" href="h2.html#h2-mdl" class="element">h2</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="h2.html#h2.attrs">h2.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="h2-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -57,15 +47,10 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="h2-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#h2-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li>
-        <li class="context-mdl"><a href="hgroup.html#hgroup-mdl">hgroup</a> = (<a class="ref" href="h1.html#h1">h1</a>
-    <span class="postfix or">or</span> <a class="ref" href="h2.html#h2">h2</a>
-    <span class="postfix or">or</span> <a class="ref" href="h3.html#h3">h3</a>
-    <span class="postfix or">or</span> <a class="ref" href="h4.html#h4">h4</a>
-    <span class="postfix or">or</span> <a class="ref" href="h5.html#h5">h5</a>
-    <span class="postfix or">or</span> <a class="ref" href="h6.html#h6">h6</a>)<span class="postfix oneormore" title="ONE OR MORE">+</span> </li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#h2-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span>, 
+        <span class="context-mdl"><a href="hgroup.html#hgroup">hgroup</a></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.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- head.html	30 Jan 2010 04:44:22 -0000	1.26
+++ head.html	1 Feb 2010 02:34:51 -0000	1.27
@@ -26,18 +26,7 @@
     element, followed by any
     <a href="common-metadata">metadata elements</a>
     </p>
-  </div></div><div class="no-number no-toc" id="head-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#head-content-model">#</a></h2><div class="content-models">
-        
-      <div id="head-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="head-mdl" href="head.html#head-mdl" class="element">head</a> = </span><span>
-      <a class="ref" href="title.html#title">title</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="base.html#base">base</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> (<a class="ref" href="common-models.html#common.elem.metadata">common.elem.metadata</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="head.html#head.attrs">head.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="head-attr-mdl">
+  </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>
@@ -69,10 +58,9 @@
   
       </div>
       <div class="no-number no-toc" id="head-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#head-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="html.html#html-mdl">html</a> = <a class="ref" href="head.html#head">head</a> <span class="postfix followedby">followed by</span> 
-  <a class="ref" href="body.html#body">body</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#head-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="html.html#html">html</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="head-display">

Index: p.html
===================================================================
RCS file: /sources/public/html5/markup/p.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- p.html	31 Jan 2010 06:11:00 -0000	1.32
+++ p.html	1 Feb 2010 02:34:53 -0000	1.33
@@ -17,19 +17,9 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#p-content-model">#</a></h2><div class="content-models">
-        
-      <div id="p-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="p-mdl" href="p.html#p-mdl" class="element">p</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="p.html#p.attrs">p.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="p-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -83,9 +73,9 @@
   
       </div>
       <div class="no-number no-toc" id="p-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#p-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#p-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="p-display">

Index: map.html
===================================================================
RCS file: /sources/public/html5/markup/map.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- map.html	31 Jan 2010 06:11:00 -0000	1.32
+++ map.html	1 Feb 2010 02:34:52 -0000	1.33
@@ -18,24 +18,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#map-content-model">#</a></h2><div class="content-models">
-        
-      <dl id="map-mdls">
-        <dt class="content-model"><span class="element-pattern-name" id="map.elem.flow"><a class="hash" href="map.html#map.elem.flow"><span class="element">map</span>.elem.flow</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="map.html#map.attrs">map.attrs</a>
-    </span></dd>
-        <dt class="content-model"><span class="element-pattern-name" id="map.elem.phrasing"><a class="hash" href="map.html#map.elem.phrasing"><span class="element">map</span>.elem.phrasing</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="map.html#map.attrs">map.attrs</a>
-    </span></dd>
-        </dl>
-      </div></div><div class="no-number no-toc" id="map-attr-mdl">
+      <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">
         <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>
@@ -53,13 +36,13 @@
       <div class="no-number no-toc" id="map-constraints">
         <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#map-constraints">#</a></h2>
         <ul class="assertions">
-    <p>If the
+    <li>If the
     <a href="common-attributes.html#common.attrs.id" class="attribute">id</a>
     attribute and
     <a id="map.attrs.name" class="attribute">name</a>
-    attribute specified on the
+    attribute are both specified on the
     <a href="map.html#map" class="element">map</a>
-    element, both attributes must have the same value.</p>
+    element, both attributes must have the same value.</li>
   
           <li><span>
 				A &#8220;map&#8221; element must have a &#8220;name&#8221; attribute.
@@ -79,10 +62,10 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="map-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#map-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#map-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span>, 
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="map-display">

Index: input.file.html
===================================================================
RCS file: /sources/public/html5/markup/input.file.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- input.file.html	30 Jan 2010 04:44:23 -0000	1.28
+++ input.file.html	1 Feb 2010 02:34:51 -0000	1.29
@@ -21,15 +21,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#input.file-content-model">#</a></h2><div class="content-models">
-        
-      <div id="input.file-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="input.file-mdl" href="input.file.html#input.file-mdl"><span class="element">input</span>.file</a> = </span><span>
-      <a class="ref" href="input.file.html#input.file.attrs">input.file.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="input.file-attr-mdl">
+      <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">
         <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>
@@ -93,9 +85,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="input.file-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.file-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#input.file-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: input.radio.html
===================================================================
RCS file: /sources/public/html5/markup/input.radio.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- input.radio.html	31 Jan 2010 06:10:59 -0000	1.30
+++ input.radio.html	1 Feb 2010 02:34:52 -0000	1.31
@@ -20,15 +20,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#input.radio-content-model">#</a></h2><div class="content-models">
-        
-      <div id="input.radio-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="input.radio-mdl" href="input.radio.html#input.radio-mdl"><span class="element">input</span>.radio</a> = </span><span>
-      <a class="ref" href="input.radio.html#input.radio.attrs">input.radio.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="input.radio-attr-mdl">
+      <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">
         <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>
@@ -89,9 +81,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="input.radio-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.radio-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#input.radio-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: command.checkbox.html
===================================================================
RCS file: /sources/public/html5/markup/command.checkbox.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- command.checkbox.html	30 Jan 2010 04:44:21 -0000	1.29
+++ command.checkbox.html	1 Feb 2010 02:34:50 -0000	1.30
@@ -19,16 +19,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#command.checkbox-content-model">#</a></h2><div class="content-models">
-        
-      <div id="command.checkbox-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="command.checkbox-mdl" href="command.checkbox.html#command.checkbox-mdl"><span class="element">command</span>.checkbox</a> = </span><span>
-      empty
-       &amp; <a class="ref" href="command.checkbox.html#command.checkbox.attrs">command.checkbox.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="command.checkbox-attr-mdl">
+      <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">
         <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>
@@ -75,20 +66,10 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="command.checkbox-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#command.checkbox-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.metadata">common.elem.metadata</a> = <a class="ref" href="link.html#link">link</a>
-   <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
-   <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a>
-   <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-   <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a></li>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#command.checkbox-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.metadata">common.elem.metadata</a></span>, 
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: param.html
===================================================================
RCS file: /sources/public/html5/markup/param.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- param.html	31 Jan 2010 06:11:00 -0000	1.32
+++ param.html	1 Feb 2010 02:34:53 -0000	1.33
@@ -17,16 +17,7 @@
     <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#param-content-model">#</a></h2><div class="content-models">
-        
-      <div id="param-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="param-mdl" href="param.html#param-mdl" class="element">param</a> = </span><span>
-      empty
-       &amp; <a class="ref" href="param.html#param.attrs">param.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="param-attr-mdl">
+      <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">
         <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>
@@ -69,14 +60,10 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="param-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#param-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="object.html#object.elem.flow">object.elem.flow</a> = <a class="ref" href="param.html#param">param</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span>  <span class="postfix followedby">followed by</span> 
-  (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li>
-        <li class="context-mdl"><a href="object.html#object.elem.phrasing">object.elem.phrasing</a> = <a class="ref" href="param.html#param">param</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span>  <span class="postfix followedby">followed by</span> 
-  (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#param-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="object.html#object">object</a></span>, 
+        <span class="context-mdl"><a href="object.html#object">object</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="param-display">

Index: span.html
===================================================================
RCS file: /sources/public/html5/markup/span.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- span.html	31 Jan 2010 06:11:01 -0000	1.28
+++ span.html	1 Feb 2010 02:34:53 -0000	1.29
@@ -18,19 +18,9 @@
     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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#span-content-model">#</a></h2><div class="content-models">
-        
-      <div id="span-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="span-mdl" href="span.html#span-mdl" class="element">span</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="span.html#span.attrs">span.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="span-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -45,9 +35,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="span-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#span-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#span-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       
         <div class="no-number no-toc" id="span-details">

Index: input.reset.html
===================================================================
RCS file: /sources/public/html5/markup/input.reset.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- input.reset.html	31 Jan 2010 06:10:59 -0000	1.30
+++ input.reset.html	1 Feb 2010 02:34:52 -0000	1.31
@@ -19,15 +19,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#input.reset-content-model">#</a></h2><div class="content-models">
-        
-      <div id="input.reset-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="input.reset-mdl" href="input.reset.html#input.reset-mdl"><span class="element">input</span>.reset</a> = </span><span>
-      <a class="ref" href="input.reset.html#input.reset.attrs">input.reset.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="input.reset-attr-mdl">
+      <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">
         <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>
@@ -86,9 +78,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="input.reset-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.reset-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#input.reset-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: input.datetime-local.html
===================================================================
RCS file: /sources/public/html5/markup/input.datetime-local.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- input.datetime-local.html	30 Jan 2010 04:44:23 -0000	1.28
+++ input.datetime-local.html	1 Feb 2010 02:34:51 -0000	1.29
@@ -21,15 +21,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <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"><span class="element-pattern-name"><a id="input.datetime-local-mdl" href="input.datetime-local.html#input.datetime-local-mdl"><span class="element">input</span>.datetime-local</a> = </span><span>
-      <a class="ref" href="input.datetime-local.html#input.datetime-local.attrs">input.datetime-local.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="input.datetime-local-attr-mdl">
+      <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">
         <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>
@@ -110,9 +102,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="input.datetime-local-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.datetime-local-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#input.datetime-local-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: input.color.html
===================================================================
RCS file: /sources/public/html5/markup/input.color.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- input.color.html	30 Jan 2010 04:44:23 -0000	1.29
+++ input.color.html	1 Feb 2010 02:34:51 -0000	1.30
@@ -20,15 +20,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#input.color-content-model">#</a></h2><div class="content-models">
-        
-      <div id="input.color-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="input.color-mdl" href="input.color.html#input.color-mdl"><span class="element">input</span>.color</a> = </span><span>
-      <a class="ref" href="input.color.html#input.color.attrs">input.color.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="input.color-attr-mdl">
+      <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">
         <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>
@@ -92,9 +84,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="input.color-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.color-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#input.color-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: option.html
===================================================================
RCS file: /sources/public/html5/markup/option.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- option.html	31 Jan 2010 06:11:00 -0000	1.33
+++ option.html	1 Feb 2010 02:34:53 -0000	1.34
@@ -23,16 +23,7 @@
     <p>
     <a href="syntax.html#normal-character-data">Normal character data</a>
     </p>
-  </div></div><div class="no-number no-toc" id="option-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#option-content-model">#</a></h2><div class="content-models">
-        
-      <div id="option-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="option-mdl" href="option.html#option-mdl" class="element">option</a> = </span><span>
-      <a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-       &amp; <a class="ref" href="option.html#option.attrs">option.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="option-attr-mdl">
+  </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>
@@ -70,14 +61,11 @@
   
       </div>
       <div class="no-number no-toc" id="option-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#option-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="optgroup.html#optgroup-mdl">optgroup</a> = <a class="ref" href="option.html#option">option</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li>
-        <li class="context-mdl"><a href="select.html#select-mdl">select</a> = <a class="ref" href="optgroup.html#optgroup">optgroup</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="option.html#option">option</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li>
-        <li class="context-mdl"><a href="datalist.html#datalist-mdl">datalist</a> = <a class="ref" href="option.html#option">option</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-   <span class="postfix &amp;">&amp;</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#option-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="optgroup.html#optgroup">optgroup</a></span>, 
+        <span class="context-mdl"><a href="select.html#select">select</a></span>, 
+        <span class="context-mdl"><a href="datalist.html#datalist">datalist</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: label.html
===================================================================
RCS file: /sources/public/html5/markup/label.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- label.html	31 Jan 2010 06:10:59 -0000	1.33
+++ label.html	1 Feb 2010 02:34:52 -0000	1.34
@@ -17,19 +17,9 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#label-content-model">#</a></h2><div class="content-models">
-        
-      <div id="label-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="label-mdl" href="label.html#label-mdl" class="element">label</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="label.html#label.attrs">label.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="label-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -81,9 +71,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="label-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#label-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#label-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="label-display">

Index: select.html
===================================================================
RCS file: /sources/public/html5/markup/select.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- select.html	31 Jan 2010 06:11:00 -0000	1.30
+++ select.html	1 Feb 2010 02:34:53 -0000	1.31
@@ -24,17 +24,7 @@
     or
     <a href="optgroup.html#optgroup" class="element">optgroup</a>
     elements.</p>
-  </div></div><div class="no-number no-toc" id="select-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#select-content-model">#</a></h2><div class="content-models">
-        
-      <div id="select-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="select-mdl" href="select.html#select-mdl" class="element">select</a> = </span><span>
-      <a class="ref" href="optgroup.html#optgroup">optgroup</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="option.html#option">option</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-       &amp; <a class="ref" href="select.html#select.attrs">select.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="select-attr-mdl">
+  </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>
@@ -92,9 +82,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="select-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#select-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#select-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: noscript.html
===================================================================
RCS file: /sources/public/html5/markup/noscript.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- noscript.html	31 Jan 2010 06:11:00 -0000	1.32
+++ noscript.html	1 Feb 2010 02:34:53 -0000	1.33
@@ -20,39 +20,20 @@
     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>In a
+    <p>If within a
     <a href="head.html#head" class="element">head</a>
-    element</p>
-    <p>
-    <a href="syntax.html#normal-character-data">Normal character data</a>
-    <a href="common-models.html#common.elem.phrasing">phrasing elements</a>
-    </p>
-  </div></div><div class="no-number no-toc" id="noscript-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#noscript-content-model">#</a></h2><div class="content-models">
-        
-      <dl id="noscript-mdls">
-        <dt class="content-model"><span class="element-pattern-name" id="noscript.elem.head"><a class="hash" href="noscript.html#noscript.elem.head"><span class="element">noscript</span>.elem.head</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      (<a class="ref" href="link.html#link">link</a>
-    <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-    <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-    <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a>)<span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-       &amp; <a class="ref" href="noscript.html#noscript.attrs">noscript.attrs</a>
-    </span></dd>
-        <dt class="content-model"><span class="element-pattern-name" id="noscript.elem.phrasing"><a class="hash" href="noscript.html#noscript.elem.phrasing"><span class="element">noscript</span>.elem.phrasing</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="noscript.html#noscript.attrs">noscript.attrs</a>
-    </span></dd>
-        <dt class="content-model"><span class="element-pattern-name" id="noscript.elem.flow"><a class="hash" href="noscript.html#noscript.elem.flow"><span class="element">noscript</span>.elem.flow</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="noscript.html#noscript.attrs">noscript.attrs</a>
-    </span></dd>
-        </dl>
-      </div></div><div class="no-number no-toc" id="noscript-attr-mdl">
+    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">
         <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>
@@ -79,21 +60,11 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="noscript-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#noscript-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.metadata">common.elem.metadata</a> = <a class="ref" href="link.html#link">link</a>
-   <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
-   <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a>
-   <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-   <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a></li>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#noscript-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.metadata">common.elem.metadata</a></span>, 
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span>, 
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: blockquote.html
===================================================================
RCS file: /sources/public/html5/markup/blockquote.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- blockquote.html	30 Jan 2010 04:44:21 -0000	1.30
+++ blockquote.html	1 Feb 2010 02:34:49 -0000	1.31
@@ -18,19 +18,9 @@
     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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#blockquote-content-model">#</a></h2><div class="content-models">
-        
-      <div id="blockquote-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="blockquote-mdl" href="blockquote.html#blockquote-mdl" class="element">blockquote</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="blockquote.html#blockquote.attrs">blockquote.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="blockquote-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></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>
@@ -54,9 +44,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="blockquote-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#blockquote-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#blockquote-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="blockquote-display">

Index: hr.html
===================================================================
RCS file: /sources/public/html5/markup/hr.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- hr.html	30 Jan 2010 04:44:22 -0000	1.28
+++ hr.html	1 Feb 2010 02:34:51 -0000	1.29
@@ -17,16 +17,7 @@
     <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#hr-content-model">#</a></h2><div class="content-models">
-        
-      <div id="hr-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="hr-mdl" href="hr.html#hr-mdl" class="element">hr</a> = </span><span>
-      empty
-       &amp; <a class="ref" href="hr.html#hr.attrs">hr.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="hr-attr-mdl">
+      <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">
         <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>
@@ -61,9 +52,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="hr-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#hr-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#hr-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="hr-display">

Index: td.html
===================================================================
RCS file: /sources/public/html5/markup/td.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- td.html	31 Jan 2010 06:11:01 -0000	1.33
+++ td.html	1 Feb 2010 02:34:54 -0000	1.34
@@ -17,19 +17,9 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#td-content-model">#</a></h2><div class="content-models">
-        
-      <div id="td-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="td-mdl" href="td.html#td-mdl" class="element">td</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="td.html#td.attrs">td.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="td-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></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>
@@ -120,10 +110,9 @@
   
       </div>
       <div class="no-number no-toc" id="td-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#td-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="tr.html#tr-mdl">tr</a> = (<a class="ref" href="td.html#td">td</a>
-    <span class="postfix or">or</span> <a class="ref" href="th.html#th">th</a>)<span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#td-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="tr.html#tr">tr</a></span></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.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- em.html	30 Jan 2010 04:44:22 -0000	1.28
+++ em.html	1 Feb 2010 02:34:50 -0000	1.29
@@ -17,19 +17,9 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#em-content-model">#</a></h2><div class="content-models">
-        
-      <div id="em-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="em-mdl" href="em.html#em-mdl" class="element">em</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="em.html#em.attrs">em.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="em-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -44,9 +34,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="em-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#em-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#em-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="em-display">

Index: input.hidden.html
===================================================================
RCS file: /sources/public/html5/markup/input.hidden.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- input.hidden.html	31 Jan 2010 06:10:59 -0000	1.30
+++ input.hidden.html	1 Feb 2010 02:34:51 -0000	1.31
@@ -20,15 +20,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#input.hidden-content-model">#</a></h2><div class="content-models">
-        
-      <div id="input.hidden-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="input.hidden-mdl" href="input.hidden.html#input.hidden-mdl"><span class="element">input</span>.hidden</a> = </span><span>
-      <a class="ref" href="input.hidden.html#input.hidden.attrs">input.hidden.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="input.hidden-attr-mdl">
+      <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">
         <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>
@@ -87,9 +79,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="input.hidden-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.hidden-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#input.hidden-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: caption.html
===================================================================
RCS file: /sources/public/html5/markup/caption.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- caption.html	30 Jan 2010 04:44:21 -0000	1.29
+++ caption.html	1 Feb 2010 02:34:50 -0000	1.30
@@ -17,19 +17,9 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#caption-content-model">#</a></h2><div class="content-models">
-        
-      <div id="caption-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="caption-mdl" href="caption.html#caption-mdl" class="element">caption</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="caption.html#caption.attrs">caption.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="caption-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></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>
@@ -53,17 +43,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="caption-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#caption-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="table.html#table-mdl">table</a> = <a class="ref" href="caption.html#caption">caption</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span>  <span class="postfix followedby">followed by</span> 
-  <a class="ref" href="colgroup.html#colgroup">colgroup</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span>  <span class="postfix followedby">followed by</span> 
-  <a class="ref" href="thead.html#thead">thead</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span>  <span class="postfix followedby">followed by</span> 
-  ((<a class="ref" href="tfoot.html#tfoot">tfoot</a> <span class="postfix followedby">followed by</span> 
-    (<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-      <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> ))
-    <span class="postfix or">or</span> ((<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-                                          <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> ) <span class="postfix followedby">followed by</span> 
-                                        <a class="ref" href="tfoot.html#tfoot">tfoot</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ))</li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#caption-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="table.html#table">table</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="caption-display">

Index: kbd.html
===================================================================
RCS file: /sources/public/html5/markup/kbd.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- kbd.html	31 Jan 2010 06:10:59 -0000	1.29
+++ kbd.html	1 Feb 2010 02:34:52 -0000	1.30
@@ -17,19 +17,9 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#kbd-content-model">#</a></h2><div class="content-models">
-        
-      <div id="kbd-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="kbd-mdl" href="kbd.html#kbd-mdl" class="element">kbd</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="kbd.html#kbd.attrs">kbd.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="kbd-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -44,9 +34,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="kbd-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#kbd-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#kbd-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="kbd-display">

Index: base.html
===================================================================
RCS file: /sources/public/html5/markup/base.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- base.html	30 Jan 2010 04:44:21 -0000	1.29
+++ base.html	1 Feb 2010 02:34:49 -0000	1.30
@@ -20,16 +20,7 @@
     <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#base-content-model">#</a></h2><div class="content-models">
-        
-      <div id="base-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="base-mdl" href="base.html#base-mdl" class="element">base</a> = </span><span>
-      empty
-       &amp; <a class="ref" href="base.html#base.attrs">base.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="base-attr-mdl">
+      <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">
         <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>
@@ -60,11 +51,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="base-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#base-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="head.html#head-mdl">head</a> = <a class="ref" href="title.html#title">title</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="base.html#base">base</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> (<a class="ref" href="common-models.html#common.elem.metadata">common.elem.metadata</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#base-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="head.html#head">head</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: canvas.html
===================================================================
RCS file: /sources/public/html5/markup/canvas.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- canvas.html	30 Jan 2010 04:44:21 -0000	1.27
+++ canvas.html	1 Feb 2010 02:34:50 -0000	1.28
@@ -19,24 +19,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#canvas-content-model">#</a></h2><div class="content-models">
-        
-      <dl id="canvas-mdls">
-        <dt class="content-model"><span class="element-pattern-name" id="canvas.elem.flow"><a class="hash" href="canvas.html#canvas.elem.flow"><span class="element">canvas</span>.elem.flow</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="canvas.html#canvas.attrs">canvas.attrs</a>
-    </span></dd>
-        <dt class="content-model"><span class="element-pattern-name" id="canvas.elem.phrasing"><a class="hash" href="canvas.html#canvas.elem.phrasing"><span class="element">canvas</span>.elem.phrasing</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="canvas.html#canvas.attrs">canvas.attrs</a>
-    </span></dd>
-        </dl>
-      </div></div><div class="no-number no-toc" id="canvas-attr-mdl">
+      <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">
         <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>
@@ -66,10 +49,10 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="canvas-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#canvas-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#canvas-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span>, 
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: input.search.html
===================================================================
RCS file: /sources/public/html5/markup/input.search.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- input.search.html	31 Jan 2010 06:10:59 -0000	1.31
+++ input.search.html	1 Feb 2010 02:34:52 -0000	1.32
@@ -20,15 +20,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#input.search-content-model">#</a></h2><div class="content-models">
-        
-      <div id="input.search-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="input.search-mdl" href="input.search.html#input.search-mdl"><span class="element">input</span>.search</a> = </span><span>
-      <a class="ref" href="input.search.html#input.search.attrs">input.search.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="input.search-attr-mdl">
+      <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">
         <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>
@@ -96,9 +88,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="input.search-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.search-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#input.search-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: tfoot.html
===================================================================
RCS file: /sources/public/html5/markup/tfoot.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- tfoot.html	31 Jan 2010 06:11:01 -0000	1.26
+++ tfoot.html	1 Feb 2010 02:34:54 -0000	1.27
@@ -22,16 +22,7 @@
     <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#tfoot-content-model">#</a></h2><div class="content-models">
-        
-      <div id="tfoot-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="tfoot-mdl" href="tfoot.html#tfoot-mdl" class="element">tfoot</a> = </span><span>
-      <a class="ref" href="tr.html#tr">tr</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-       &amp; <a class="ref" href="tfoot.html#tfoot.attrs">tfoot.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="tfoot-attr-mdl">
+  </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>
@@ -68,17 +59,9 @@
   
       </div>
       <div class="no-number no-toc" id="tfoot-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#tfoot-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="table.html#table-mdl">table</a> = <a class="ref" href="caption.html#caption">caption</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span>  <span class="postfix followedby">followed by</span> 
-  <a class="ref" href="colgroup.html#colgroup">colgroup</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span>  <span class="postfix followedby">followed by</span> 
-  <a class="ref" href="thead.html#thead">thead</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span>  <span class="postfix followedby">followed by</span> 
-  ((<a class="ref" href="tfoot.html#tfoot">tfoot</a> <span class="postfix followedby">followed by</span> 
-    (<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-      <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> ))
-    <span class="postfix or">or</span> ((<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-                                          <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> ) <span class="postfix followedby">followed by</span> 
-                                        <a class="ref" href="tfoot.html#tfoot">tfoot</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ))</li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#tfoot-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="table.html#table">table</a></span></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.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- rt.html	31 Jan 2010 06:11:00 -0000	1.28
+++ rt.html	1 Feb 2010 02:34:53 -0000	1.29
@@ -17,19 +17,9 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#rt-content-model">#</a></h2><div class="content-models">
-        
-      <div id="rt-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="rt-mdl" href="rt.html#rt-mdl" class="element">rt</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="rt.html#rt.attrs">rt.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="rt-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -47,14 +37,9 @@
   
       </div>
       <div class="no-number no-toc" id="rt-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#rt-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="ruby.html#ruby-mdl">ruby</a> = ((<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) <span class="postfix followedby">followed by</span> 
-   (<a class="ref" href="rt.html#rt">rt</a>
-     <span class="postfix or">or</span> (<a class="ref" href="rp.html#rp">rp</a> <span class="postfix followedby">followed by</span> 
-                                         <a class="ref" href="rt.html#rt">rt</a> <span class="postfix followedby">followed by</span> 
-                                         <a class="ref" href="rp.html#rp">rp</a>)))<span class="postfix oneormore" title="ONE OR MORE">+</span> </li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#rt-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="ruby.html#ruby">ruby</a></span></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.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- fieldset.html	30 Jan 2010 04:44:22 -0000	1.31
+++ fieldset.html	1 Feb 2010 02:34:50 -0000	1.32
@@ -25,18 +25,7 @@
     and
     <a href="syntax.html#normal-character-data">normal character data</a>
     </p>
-  </div></div><div class="no-number no-toc" id="fieldset-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#fieldset-content-model">#</a></h2><div class="content-models">
-        
-      <div id="fieldset-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="fieldset-mdl" href="fieldset.html#fieldset-mdl" class="element">fieldset</a> = </span><span>
-      <a class="ref" href="legend.html#legend">legend</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span>  <span class="postfix followedby">followed by</span> 
-  (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="fieldset.html#fieldset.attrs">fieldset.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="fieldset-attr-mdl">
+  </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>)
@@ -54,9 +43,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="fieldset-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#fieldset-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#fieldset-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="fieldset-display">

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- spec.html	31 Jan 2010 06:11:01 -0000	1.142
+++ spec.html	1 Feb 2010 02:34:53 -0000	1.143
@@ -625,14 +625,14 @@
 <li id="common-models-toc">
 <span class="toc-section-number"></span><a href="#common-models"><span class="toc-section-number">6.</span> Common content models</a>
 <ul>
-<li id="common-flow-toc">
-<span class="toc-section-number"></span><a href="#common-flow"><span class="toc-section-number">6.01.</span> Flow elements</a>
+<li id="common.elem.flow-toc">
+<span class="toc-section-number"></span><a href="#common.elem.flow"><span class="toc-section-number">6.01.</span> Flow elements</a>
 </li>
-<li id="common-metadata-toc">
-<span class="toc-section-number"></span><a href="#common-metadata"><span class="toc-section-number">6.02.</span> Metadata elements</a>
+<li id="common.elem.metadata-toc">
[...5768 lines suppressed...]
    <span class="postfix or">or</span> <a class="ref" href="#input">input</a>
    <span class="postfix or">or</span> <a class="ref" href="#textarea">textarea</a>
    <span class="postfix or">or</span> <a class="ref" href="#select">select</a>
@@ -16287,12 +14134,12 @@
    <span class="postfix or">or</span> <a class="ref" href="#keygen">keygen</a>
    <span class="postfix or">or</span> <a class="ref" href="#progress">progress</a>
    <span class="postfix or">or</span> <a class="ref" href="#command">command</a>
-   <span class="postfix or">or</span> <a class="ref" href="#canvas.elem.phrasing">canvas.elem.phrasing</a>
+   <span class="postfix or">or</span> <a class="ref" href="#canvas">canvas</a>
    <span class="postfix or">or</span> <a class="ref" href="#time">time</a>
    <span class="postfix or">or</span> <a class="ref" href="#meter">meter</a>
-          </dd>
-        </dl>
-</div>
+          </p>
+        </div>
+      </div>
     </div>
     <div id="common-attributes" class="section">
         <h2>7. Common attributes <a class="hash" href="#common-attributes">#</a> <a class="toc-bak" href="#common-attributes-toc">T</a>

Index: datalist.html
===================================================================
RCS file: /sources/public/html5/markup/datalist.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- datalist.html	30 Jan 2010 04:44:21 -0000	1.32
+++ datalist.html	1 Feb 2010 02:34:50 -0000	1.33
@@ -27,18 +27,7 @@
     and
     <a href="syntax.html#normal-character-data">normal character data</a>
     </p>
-  </div></div><div class="no-number no-toc" id="datalist-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#datalist-content-model">#</a></h2><div class="content-models">
-        
-      <div id="datalist-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="datalist-mdl" href="datalist.html#datalist-mdl" class="element">datalist</a> = </span><span>
-      <a class="ref" href="option.html#option">option</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-   <span class="postfix &amp;">&amp;</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="datalist.html#datalist.attrs">datalist.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="datalist-attr-mdl">
+  </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>
@@ -53,9 +42,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="datalist-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#datalist-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#datalist-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="datalist-display">

Index: h1.html
===================================================================
RCS file: /sources/public/html5/markup/h1.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- h1.html	30 Jan 2010 04:44:22 -0000	1.32
+++ h1.html	1 Feb 2010 02:34:50 -0000	1.33
@@ -17,19 +17,9 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#h1-content-model">#</a></h2><div class="content-models">
-        
-      <div id="h1-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="h1-mdl" href="h1.html#h1-mdl" class="element">h1</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="h1.html#h1.attrs">h1.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="h1-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -57,15 +47,10 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="h1-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#h1-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li>
-        <li class="context-mdl"><a href="hgroup.html#hgroup-mdl">hgroup</a> = (<a class="ref" href="h1.html#h1">h1</a>
-    <span class="postfix or">or</span> <a class="ref" href="h2.html#h2">h2</a>
-    <span class="postfix or">or</span> <a class="ref" href="h3.html#h3">h3</a>
-    <span class="postfix or">or</span> <a class="ref" href="h4.html#h4">h4</a>
-    <span class="postfix or">or</span> <a class="ref" href="h5.html#h5">h5</a>
-    <span class="postfix or">or</span> <a class="ref" href="h6.html#h6">h6</a>)<span class="postfix oneormore" title="ONE OR MORE">+</span> </li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#h1-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span>, 
+        <span class="context-mdl"><a href="hgroup.html#hgroup">hgroup</a></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.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- h3.html	30 Jan 2010 04:44:22 -0000	1.33
+++ h3.html	1 Feb 2010 02:34:50 -0000	1.34
@@ -17,19 +17,9 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#h3-content-model">#</a></h2><div class="content-models">
-        
-      <div id="h3-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="h3-mdl" href="h3.html#h3-mdl" class="element">h3</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="h3.html#h3.attrs">h3.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="h3-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -57,15 +47,10 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="h3-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#h3-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li>
-        <li class="context-mdl"><a href="hgroup.html#hgroup-mdl">hgroup</a> = (<a class="ref" href="h1.html#h1">h1</a>
-    <span class="postfix or">or</span> <a class="ref" href="h2.html#h2">h2</a>
-    <span class="postfix or">or</span> <a class="ref" href="h3.html#h3">h3</a>
-    <span class="postfix or">or</span> <a class="ref" href="h4.html#h4">h4</a>
-    <span class="postfix or">or</span> <a class="ref" href="h5.html#h5">h5</a>
-    <span class="postfix or">or</span> <a class="ref" href="h6.html#h6">h6</a>)<span class="postfix oneormore" title="ONE OR MORE">+</span> </li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#h3-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span>, 
+        <span class="context-mdl"><a href="hgroup.html#hgroup">hgroup</a></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.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- optgroup.html	31 Jan 2010 06:11:00 -0000	1.27
+++ optgroup.html	1 Feb 2010 02:34:53 -0000	1.28
@@ -21,16 +21,7 @@
     <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#optgroup-content-model">#</a></h2><div class="content-models">
-        
-      <div id="optgroup-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="optgroup-mdl" href="optgroup.html#optgroup-mdl" class="element">optgroup</a> = </span><span>
-      <a class="ref" href="option.html#option">option</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-       &amp; <a class="ref" href="optgroup.html#optgroup.attrs">optgroup.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="optgroup-attr-mdl">
+  </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>
@@ -59,10 +50,9 @@
   
       </div>
       <div class="no-number no-toc" id="optgroup-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#optgroup-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="select.html#select-mdl">select</a> = <a class="ref" href="optgroup.html#optgroup">optgroup</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="option.html#option">option</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#optgroup-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="select.html#select">select</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: input.week.html
===================================================================
RCS file: /sources/public/html5/markup/input.week.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- input.week.html	31 Jan 2010 06:10:59 -0000	1.29
+++ input.week.html	1 Feb 2010 02:34:52 -0000	1.30
@@ -20,15 +20,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#input.week-content-model">#</a></h2><div class="content-models">
-        
-      <div id="input.week-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="input.week-mdl" href="input.week.html#input.week-mdl"><span class="element">input</span>.week</a> = </span><span>
-      <a class="ref" href="input.week.html#input.week.attrs">input.week.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="input.week-attr-mdl">
+      <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">
         <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>
@@ -109,9 +101,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="input.week-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.week-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#input.week-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: button.button.html
===================================================================
RCS file: /sources/public/html5/markup/button.button.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- button.button.html	30 Jan 2010 04:44:21 -0000	1.35
+++ button.button.html	1 Feb 2010 02:34:49 -0000	1.36
@@ -19,19 +19,9 @@
     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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#button.button-content-model">#</a></h2><div class="content-models">
-        
-      <div id="button.button-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="button.button-mdl" href="button.button.html#button.button-mdl"><span class="element">button</span>.button</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="button.button.html#button.button.attrs">button.button.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="button.button-attr-mdl">
+                <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">
         <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>
@@ -79,9 +69,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="button.button-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#button.button-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#button.button-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: form.html
===================================================================
RCS file: /sources/public/html5/markup/form.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- form.html	30 Jan 2010 04:44:22 -0000	1.34
+++ form.html	1 Feb 2010 02:34:50 -0000	1.35
@@ -17,19 +17,9 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#form-content-model">#</a></h2><div class="content-models">
-        
-      <div id="form-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="form-mdl" href="form.html#form-mdl" class="element">form</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="form.html#form.attrs">form.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="form-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></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>
@@ -110,9 +100,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="form-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#form-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#form-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="form-display">

Index: small.html
===================================================================
RCS file: /sources/public/html5/markup/small.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- small.html	31 Jan 2010 06:11:00 -0000	1.28
+++ small.html	1 Feb 2010 02:34:53 -0000	1.29
@@ -18,19 +18,9 @@
     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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#small-content-model">#</a></h2><div class="content-models">
-        
-      <div id="small-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="small-mdl" href="small.html#small-mdl" class="element">small</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="small.html#small.attrs">small.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="small-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -45,9 +35,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="small-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#small-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#small-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="small-display">

Index: ruby.html
===================================================================
RCS file: /sources/public/html5/markup/ruby.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- ruby.html	31 Jan 2010 06:11:00 -0000	1.28
+++ ruby.html	1 Feb 2010 02:34:53 -0000	1.29
@@ -35,21 +35,7 @@
       <a href="rp.html#rp" class="element">rp</a>
       </li>
     </ul>
-  </div></div><div class="no-number no-toc" id="ruby-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#ruby-content-model">#</a></h2><div class="content-models">
-        
-      <div id="ruby-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="ruby-mdl" href="ruby.html#ruby-mdl" class="element">ruby</a> = </span><span>
-      ((<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) <span class="postfix followedby">followed by</span> 
-   (<a class="ref" href="rt.html#rt">rt</a>
-     <span class="postfix or">or</span> (<a class="ref" href="rp.html#rp">rp</a> <span class="postfix followedby">followed by</span> 
-                                         <a class="ref" href="rt.html#rt">rt</a> <span class="postfix followedby">followed by</span> 
-                                         <a class="ref" href="rp.html#rp">rp</a>)))<span class="postfix oneormore" title="ONE OR MORE">+</span> 
-       &amp; <a class="ref" href="ruby.html#ruby.attrs">ruby.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="ruby-attr-mdl">
+  </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>
@@ -64,9 +50,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="ruby-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#ruby-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#ruby-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="ruby-display">

Index: ol.html
===================================================================
RCS file: /sources/public/html5/markup/ol.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- ol.html	31 Jan 2010 06:11:00 -0000	1.28
+++ ol.html	1 Feb 2010 02:34:53 -0000	1.29
@@ -23,16 +23,7 @@
     <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#ol-content-model">#</a></h2><div class="content-models">
-        
-      <div id="ol-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="ol-mdl" href="ol.html#ol-mdl" class="element">ol</a> = </span><span>
-      <a class="ref" href="li.html#oli">li</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-       &amp; <a class="ref" href="ol.html#ol.attrs">ol.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="ol-attr-mdl">
+  </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>
@@ -78,9 +69,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="ol-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#ol-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#ol-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="ol-display">

Index: article.html
===================================================================
RCS file: /sources/public/html5/markup/article.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- article.html	30 Jan 2010 04:44:20 -0000	1.34
+++ article.html	1 Feb 2010 02:34:49 -0000	1.35
@@ -19,20 +19,9 @@
     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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#article-content-model">#</a></h2><div class="content-models">
-        
-      <div id="article-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="article-mdl" href="article.html#article-mdl" class="element">article</a> = </span><span>
-      <a class="ref" href="style.html#style-pattern">style</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span>  <span class="postfix followedby">followed by</span> 
-  (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="article.html#article.attrs">article.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="article-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">flow elements</a></p></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>
@@ -56,9 +45,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="article-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#article-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#article-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="article-display">

Index: colgroup.html
===================================================================
RCS file: /sources/public/html5/markup/colgroup.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- colgroup.html	30 Jan 2010 04:44:21 -0000	1.29
+++ colgroup.html	1 Feb 2010 02:34:50 -0000	1.30
@@ -27,17 +27,7 @@
     <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#colgroup-content-model">#</a></h2><div class="content-models">
-        
-      <div id="colgroup-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="colgroup-mdl" href="colgroup.html#colgroup-mdl" class="element">colgroup</a> = </span><span>
-      (<a class="ref" href="col.html#col">col</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-   <span class="postfix or">or</span> <a href=".html#colgroup.attrs.span-mdl"><span class="attr-qualifier">colgroup.attrs.</span>span</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )
-       &amp; <a class="ref" href=".html#colgroup.attrs">colgroup.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="colgroup-attr-mdl">
+  </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="no-number no-toc" id="colgroup-attributes">
@@ -83,17 +73,9 @@
   
       </div>
       <div class="no-number no-toc" id="colgroup-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#colgroup-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="table.html#table-mdl">table</a> = <a class="ref" href="caption.html#caption">caption</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span>  <span class="postfix followedby">followed by</span> 
-  <a class="ref" href="colgroup.html#colgroup">colgroup</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span>  <span class="postfix followedby">followed by</span> 
-  <a class="ref" href="thead.html#thead">thead</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span>  <span class="postfix followedby">followed by</span> 
-  ((<a class="ref" href="tfoot.html#tfoot">tfoot</a> <span class="postfix followedby">followed by</span> 
-    (<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-      <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> ))
-    <span class="postfix or">or</span> ((<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-                                          <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> ) <span class="postfix followedby">followed by</span> 
-                                        <a class="ref" href="tfoot.html#tfoot">tfoot</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ))</li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#colgroup-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="table.html#table">table</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="colgroup-display">

Index: dl.html
===================================================================
RCS file: /sources/public/html5/markup/dl.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- dl.html	30 Jan 2010 04:44:22 -0000	1.30
+++ dl.html	1 Feb 2010 02:34:50 -0000	1.31
@@ -23,17 +23,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#dl-content-model">#</a></h2><div class="content-models">
-        
-      <div id="dl-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="dl-mdl" href="dl.html#dl-mdl" class="element">dl</a> = </span><span>
-      (<a class="ref" href="dt.html#dt">dt</a><span class="postfix oneormore" title="ONE OR MORE">+</span>  <span class="postfix followedby">followed by</span> 
-   <a class="ref" href="dd.html#dd">dd</a><span class="postfix oneormore" title="ONE OR MORE">+</span> )<span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-       &amp; <a class="ref" href="dl.html#dl.attrs">dl.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="dl-attr-mdl">
+  </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>
@@ -57,9 +47,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="dl-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#dl-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#dl-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="dl-display">

Index: thead.html
===================================================================
RCS file: /sources/public/html5/markup/thead.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- thead.html	31 Jan 2010 06:11:01 -0000	1.26
+++ thead.html	1 Feb 2010 02:34:54 -0000	1.27
@@ -24,16 +24,7 @@
     <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#thead-content-model">#</a></h2><div class="content-models">
-        
-      <div id="thead-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="thead-mdl" href="thead.html#thead-mdl" class="element">thead</a> = </span><span>
-      <a class="ref" href="tr.html#tr">tr</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-       &amp; <a class="ref" href="thead.html#thead.attrs">thead.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="thead-attr-mdl">
+  </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>
@@ -70,17 +61,9 @@
   
       </div>
       <div class="no-number no-toc" id="thead-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#thead-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="table.html#table-mdl">table</a> = <a class="ref" href="caption.html#caption">caption</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span>  <span class="postfix followedby">followed by</span> 
-  <a class="ref" href="colgroup.html#colgroup">colgroup</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span>  <span class="postfix followedby">followed by</span> 
-  <a class="ref" href="thead.html#thead">thead</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span>  <span class="postfix followedby">followed by</span> 
-  ((<a class="ref" href="tfoot.html#tfoot">tfoot</a> <span class="postfix followedby">followed by</span> 
-    (<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-      <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> ))
-    <span class="postfix or">or</span> ((<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-                                          <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> ) <span class="postfix followedby">followed by</span> 
-                                        <a class="ref" href="tfoot.html#tfoot">tfoot</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ))</li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#thead-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="table.html#table">table</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="thead-display">

Index: tbody.html
===================================================================
RCS file: /sources/public/html5/markup/tbody.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- tbody.html	31 Jan 2010 06:11:01 -0000	1.26
+++ tbody.html	1 Feb 2010 02:34:54 -0000	1.27
@@ -23,16 +23,7 @@
     <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#tbody-content-model">#</a></h2><div class="content-models">
-        
-      <div id="tbody-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="tbody-mdl" href="tbody.html#tbody-mdl" class="element">tbody</a> = </span><span>
-      <a class="ref" href="tr.html#tr">tr</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-       &amp; <a class="ref" href="tbody.html#tbody.attrs">tbody.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="tbody-attr-mdl">
+  </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>
@@ -72,17 +63,9 @@
   
       </div>
       <div class="no-number no-toc" id="tbody-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#tbody-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="table.html#table-mdl">table</a> = <a class="ref" href="caption.html#caption">caption</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span>  <span class="postfix followedby">followed by</span> 
-  <a class="ref" href="colgroup.html#colgroup">colgroup</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span>  <span class="postfix followedby">followed by</span> 
-  <a class="ref" href="thead.html#thead">thead</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span>  <span class="postfix followedby">followed by</span> 
-  ((<a class="ref" href="tfoot.html#tfoot">tfoot</a> <span class="postfix followedby">followed by</span> 
-    (<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-      <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> ))
-    <span class="postfix or">or</span> ((<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> 
-                                          <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> ) <span class="postfix followedby">followed by</span> 
-                                        <a class="ref" href="tfoot.html#tfoot">tfoot</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ))</li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#tbody-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="table.html#table">table</a></span></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.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- video.html	31 Jan 2010 06:11:01 -0000	1.33
+++ video.html	1 Feb 2010 02:34:54 -0000	1.34
@@ -28,28 +28,7 @@
     <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#video-content-model">#</a></h2><div class="content-models">
-        
-      <dl id="video-mdls">
-        <dt class="content-model"><span class="element-pattern-name" id="video.elem.flow"><a class="hash" href="video.html#video.elem.flow"><span class="element">video</span>.elem.flow</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      (<a class="ref" href="video.html#video.attrs.src">video.attrs.src</a>
-    <span class="postfix or">or</span> <a class="ref" href="source.html#source">source</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) <span class="postfix followedby">followed by</span> 
-  (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="video.html#video.attrs">video.attrs</a>
-    </span></dd>
-        <dt class="content-model"><span class="element-pattern-name" id="video.elem.phrasing"><a class="hash" href="video.html#video.elem.phrasing"><span class="element">video</span>.elem.phrasing</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      (<a class="ref" href="video.html#video.attrs.src">video.attrs.src</a>
-    <span class="postfix or">or</span> <a class="ref" href="source.html#source">source</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) <span class="postfix followedby">followed by</span> 
-  (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="video.html#video.attrs">video.attrs</a>
-    </span></dd>
-        </dl>
-      </div></div><div class="no-number no-toc" id="video-attr-mdl">
+  </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>
@@ -126,10 +105,10 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="video-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#video-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#video-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span>, 
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: source.html
===================================================================
RCS file: /sources/public/html5/markup/source.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- source.html	31 Jan 2010 06:11:01 -0000	1.35
+++ source.html	1 Feb 2010 02:34:53 -0000	1.36
@@ -24,16 +24,7 @@
     <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#source-content-model">#</a></h2><div class="content-models">
-        
-      <div id="source-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="source-mdl" href="source.html#source-mdl" class="element">source</a> = </span><span>
-      empty
-       &amp; <a class="ref" href="source.html#source.attrs">source.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="source-attr-mdl">
+      <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">
         <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>
@@ -84,24 +75,12 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="source-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#source-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="video.html#video.elem.flow">video.elem.flow</a> = (<a class="ref" href="video.html#video.attrs.src">video.attrs.src</a>
-    <span class="postfix or">or</span> <a class="ref" href="source.html#source">source</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) <span class="postfix followedby">followed by</span> 
-  (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li>
-        <li class="context-mdl"><a href="video.html#video.elem.phrasing">video.elem.phrasing</a> = (<a class="ref" href="video.html#video.attrs.src">video.attrs.src</a>
-    <span class="postfix or">or</span> <a class="ref" href="source.html#source">source</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) <span class="postfix followedby">followed by</span> 
-  (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li>
-        <li class="context-mdl"><a href="audio.html#audio.elem.flow">audio.elem.flow</a> = (<a class="ref" href="audio.html#audio.attrs.src">audio.attrs.src</a>
-    <span class="postfix or">or</span> <a class="ref" href="source.html#source">source</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) <span class="postfix followedby">followed by</span> 
-  (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li>
-        <li class="context-mdl"><a href="audio.html#audio.elem.phrasing">audio.elem.phrasing</a> = (<a class="ref" href="audio.html#audio.attrs.src">audio.attrs.src</a>
-    <span class="postfix or">or</span> <a class="ref" href="source.html#source">source</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) <span class="postfix followedby">followed by</span> 
-  (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#source-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="video.html#video">video</a></span>, 
+        <span class="context-mdl"><a href="video.html#video">video</a></span>, 
+        <span class="context-mdl"><a href="audio.html#audio">audio</a></span>, 
+        <span class="context-mdl"><a href="audio.html#audio">audio</a></span></p>
       </div>
       
         <div class="no-number no-toc" id="source-details">

Index: button.reset.html
===================================================================
RCS file: /sources/public/html5/markup/button.reset.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- button.reset.html	30 Jan 2010 04:44:21 -0000	1.35
+++ button.reset.html	1 Feb 2010 02:34:49 -0000	1.36
@@ -19,19 +19,9 @@
     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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#button.reset-content-model">#</a></h2><div class="content-models">
-        
-      <div id="button.reset-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="button.reset-mdl" href="button.reset.html#button.reset-mdl"><span class="element">button</span>.reset</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="button.reset.html#button.reset.attrs">button.reset.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="button.reset-attr-mdl">
+                <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">
         <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>
@@ -79,9 +69,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="button.reset-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#button.reset-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#button.reset-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: meta.charset.html
===================================================================
RCS file: /sources/public/html5/markup/meta.charset.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- meta.charset.html	31 Jan 2010 06:11:00 -0000	1.33
+++ meta.charset.html	1 Feb 2010 02:34:52 -0000	1.34
@@ -19,16 +19,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#meta.charset-content-model">#</a></h2><div class="content-models">
-        
-      <div id="meta.charset-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="meta.charset-mdl" href="meta.charset.html#meta.charset-mdl"><span class="element">meta</span>.charset</a> = </span><span>
-      empty
-       &amp; <a class="ref" href="meta.charset.html#meta.charset.attrs">meta.charset.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="meta.charset-attr-mdl">
+      <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">
         <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>
@@ -48,13 +39,13 @@
       <div class="no-number no-toc" id="meta.charset-constraints">
         <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#meta.charset-constraints">#</a></h2>
         <ul class="assertions">
-    <p>There must not be more than one <a href="meta.html#meta" class="element">meta</a> element per document with a <a href="meta.charset.html#meta.charset.attrs.charset">charset</a>
-    attribute.</p>
-    <p>If a document contains a
+    <li>There must not be more than one <a href="meta.html#meta" class="element">meta</a> element per document with a <a href="meta.charset.html#meta.charset.attrs.charset">charset</a>
+    attribute.</li>
+    <li>If a document contains a
     <a href="meta.html#meta" class="element">meta</a> 
     element with a <a href="meta.charset.html#meta.charset.attrs.charset">charset</a>
     attribute, then the document must not contain a <a href="meta.html#meta" class="element">meta</a> element in the <a href="meta.http-equiv.content-type.html#encoding-declaration-state">encoding declaration
-      state</a>.</p>
+      state</a>.</li>
   
           <li><span>
 				The &#8220;scheme&#8221; attribute on the &#8220;meta&#8221; element is obsolete.
@@ -71,19 +62,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="meta.charset-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#meta.charset-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.metadata">common.elem.metadata</a> = <a class="ref" href="link.html#link">link</a>
-   <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-   <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>
-   <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a>
-   <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-   <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#meta.charset-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.metadata">common.elem.metadata</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: output.html
===================================================================
RCS file: /sources/public/html5/markup/output.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- output.html	31 Jan 2010 06:11:00 -0000	1.31
+++ output.html	1 Feb 2010 02:34:53 -0000	1.32
@@ -17,19 +17,9 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#output-content-model">#</a></h2><div class="content-models">
-        
-      <div id="output-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="output-mdl" href="output.html#output-mdl" class="element">output</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="output.html#output.attrs">output.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="output-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -58,9 +48,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="output-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#output-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#output-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: i.html
===================================================================
RCS file: /sources/public/html5/markup/i.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- i.html	30 Jan 2010 04:44:22 -0000	1.28
+++ i.html	1 Feb 2010 02:34:51 -0000	1.29
@@ -19,19 +19,9 @@
     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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#i-content-model">#</a></h2><div class="content-models">
-        
-      <div id="i-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="i-mdl" href="i.html#i-mdl" class="element">i</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="i.html#i.attrs">i.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="i-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -46,9 +36,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="i-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#i-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#i-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="i-display">

Index: input.submit.html
===================================================================
RCS file: /sources/public/html5/markup/input.submit.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- input.submit.html	31 Jan 2010 06:10:59 -0000	1.30
+++ input.submit.html	1 Feb 2010 02:34:52 -0000	1.31
@@ -19,15 +19,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#input.submit-content-model">#</a></h2><div class="content-models">
-        
-      <div id="input.submit-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="input.submit-mdl" href="input.submit.html#input.submit-mdl"><span class="element">input</span>.submit</a> = </span><span>
-      <a class="ref" href="input.submit.html#input.submit.attrs">input.submit.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="input.submit-attr-mdl">
+      <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">
         <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>
@@ -91,9 +83,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="input.submit-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.submit-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#input.submit-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: input.date.html
===================================================================
RCS file: /sources/public/html5/markup/input.date.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- input.date.html	30 Jan 2010 04:44:23 -0000	1.28
+++ input.date.html	1 Feb 2010 02:34:51 -0000	1.29
@@ -20,15 +20,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#input.date-content-model">#</a></h2><div class="content-models">
-        
-      <div id="input.date-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="input.date-mdl" href="input.date.html#input.date-mdl"><span class="element">input</span>.date</a> = </span><span>
-      <a class="ref" href="input.date.html#input.date.attrs">input.date.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="input.date-attr-mdl">
+      <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">
         <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>
@@ -109,9 +101,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="input.date-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.date-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#input.date-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: var.html
===================================================================
RCS file: /sources/public/html5/markup/var.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- var.html	31 Jan 2010 06:11:01 -0000	1.28
+++ var.html	1 Feb 2010 02:34:54 -0000	1.29
@@ -19,19 +19,9 @@
     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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#var-content-model">#</a></h2><div class="content-models">
-        
-      <div id="var-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="var-mdl" href="var.html#var-mdl" class="element">var</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="var.html#var.attrs">var.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="var-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -46,9 +36,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="var-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#var-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#var-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="var-display">

Index: sub.html
===================================================================
RCS file: /sources/public/html5/markup/sub.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- sub.html	31 Jan 2010 06:11:01 -0000	1.28
+++ sub.html	1 Feb 2010 02:34:54 -0000	1.29
@@ -17,19 +17,9 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#sub-content-model">#</a></h2><div class="content-models">
-        
-      <div id="sub-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="sub-mdl" href="sub.html#sub-mdl" class="element">sub</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="sub.html#sub.attrs">sub.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="sub-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -44,9 +34,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="sub-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#sub-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#sub-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="sub-display">

Index: title.html
===================================================================
RCS file: /sources/public/html5/markup/title.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- title.html	31 Jan 2010 06:11:01 -0000	1.27
+++ title.html	1 Feb 2010 02:34:54 -0000	1.28
@@ -19,18 +19,9 @@
   </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>
+      <a href="syntax.html#replaceable-character-data">replaceable character data</a>
     </p>
-  </div></div><div class="no-number no-toc" id="title-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#title-content-model">#</a></h2><div class="content-models">
-        
-      <div id="title-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="title-mdl" href="title.html#title-mdl" class="element">title</a> = </span><span>
-      <a class="ref" href="syntax.html#replaceable-character-data">replaceable-character-data</a>
-       &amp; <a class="ref" href="title.html#title.attrs">title.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="title-attr-mdl">
+  </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>
@@ -45,11 +36,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="title-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#title-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="head.html#head-mdl">head</a> = <a class="ref" href="title.html#title">title</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="base.html#base">base</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> 
-   <span class="postfix &amp;">&amp;</span> (<a class="ref" href="common-models.html#common.elem.metadata">common.elem.metadata</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#title-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="head.html#head">head</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="title-display">

Index: pre.html
===================================================================
RCS file: /sources/public/html5/markup/pre.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- pre.html	31 Jan 2010 06:11:00 -0000	1.30
+++ pre.html	1 Feb 2010 02:34:53 -0000	1.31
@@ -19,19 +19,9 @@
     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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#pre-content-model">#</a></h2><div class="content-models">
-        
-      <div id="pre-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="pre-mdl" href="pre.html#pre-mdl" class="element">pre</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="pre.html#pre.attrs">pre.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="pre-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -55,9 +45,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="pre-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#pre-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#pre-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="pre-display">

Index: button.submit.html
===================================================================
RCS file: /sources/public/html5/markup/button.submit.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- button.submit.html	30 Jan 2010 04:44:21 -0000	1.35
+++ button.submit.html	1 Feb 2010 02:34:50 -0000	1.36
@@ -19,19 +19,9 @@
     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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#button.submit-content-model">#</a></h2><div class="content-models">
-        
-      <div id="button.submit-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="button.submit-mdl" href="button.submit.html#button.submit-mdl"><span class="element">button</span>.submit</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="button.submit.html#button.submit.attrs">button.submit.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="button.submit-attr-mdl">
+                <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">
         <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>
@@ -84,9 +74,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="button.submit-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#button.submit-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#button.submit-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: rp.html
===================================================================
RCS file: /sources/public/html5/markup/rp.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- rp.html	31 Jan 2010 06:11:00 -0000	1.28
+++ rp.html	1 Feb 2010 02:34:53 -0000	1.29
@@ -19,19 +19,9 @@
     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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#rp-content-model">#</a></h2><div class="content-models">
-        
-      <div id="rp-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="rp-mdl" href="rp.html#rp-mdl" class="element">rp</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="rp.html#rp.attrs">rp.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="rp-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -49,14 +39,9 @@
   
       </div>
       <div class="no-number no-toc" id="rp-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#rp-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="ruby.html#ruby-mdl">ruby</a> = ((<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) <span class="postfix followedby">followed by</span> 
-   (<a class="ref" href="rt.html#rt">rt</a>
-     <span class="postfix or">or</span> (<a class="ref" href="rp.html#rp">rp</a> <span class="postfix followedby">followed by</span> 
-                                         <a class="ref" href="rt.html#rt">rt</a> <span class="postfix followedby">followed by</span> 
-                                         <a class="ref" href="rp.html#rp">rp</a>)))<span class="postfix oneormore" title="ONE OR MORE">+</span> </li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#rp-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="ruby.html#ruby">ruby</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: sup.html
===================================================================
RCS file: /sources/public/html5/markup/sup.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- sup.html	31 Jan 2010 06:11:01 -0000	1.28
+++ sup.html	1 Feb 2010 02:34:54 -0000	1.29
@@ -17,19 +17,9 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#sup-content-model">#</a></h2><div class="content-models">
-        
-      <div id="sup-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="sup-mdl" href="sup.html#sup-mdl" class="element">sup</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="sup.html#sup.attrs">sup.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="sup-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -44,9 +34,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="sup-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#sup-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#sup-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="sup-display">

Index: input.url.html
===================================================================
RCS file: /sources/public/html5/markup/input.url.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- input.url.html	31 Jan 2010 06:10:59 -0000	1.29
+++ input.url.html	1 Feb 2010 02:34:52 -0000	1.30
@@ -20,15 +20,7 @@
     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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#input.url-content-model">#</a></h2><div class="content-models">
-        
-      <div id="input.url-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="input.url-mdl" href="input.url.html#input.url-mdl"><span class="element">input</span>.url</a> = </span><span>
-      <a class="ref" href="input.url.html#input.url.attrs">input.url.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="input.url-attr-mdl">
+      <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">
         <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>
@@ -99,9 +91,9 @@
             element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="input.url-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.url-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#input.url-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.phrasing">phrasing elements</a></span></p>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: hgroup.html
===================================================================
RCS file: /sources/public/html5/markup/hgroup.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- hgroup.html	30 Jan 2010 04:44:22 -0000	1.26
+++ hgroup.html	1 Feb 2010 02:34:51 -0000	1.27
@@ -27,21 +27,7 @@
     and/or
     <a href="h6.html#h6" class="element">h6</a>
     elements</p>
-  </div></div><div class="no-number no-toc" id="hgroup-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#hgroup-content-model">#</a></h2><div class="content-models">
-        
-      <div id="hgroup-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="hgroup-mdl" href="hgroup.html#hgroup-mdl" class="element">hgroup</a> = </span><span>
-      (<a class="ref" href="h1.html#h1">h1</a>
-    <span class="postfix or">or</span> <a class="ref" href="h2.html#h2">h2</a>
-    <span class="postfix or">or</span> <a class="ref" href="h3.html#h3">h3</a>
-    <span class="postfix or">or</span> <a class="ref" href="h4.html#h4">h4</a>
-    <span class="postfix or">or</span> <a class="ref" href="h5.html#h5">h5</a>
-    <span class="postfix or">or</span> <a class="ref" href="h6.html#h6">h6</a>)<span class="postfix oneormore" title="ONE OR MORE">+</span> 
-       &amp; <a class="ref" href="hgroup.html#hgroup.attrs">hgroup.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="hgroup-attr-mdl">
+  </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>
@@ -56,9 +42,9 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="hgroup-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#hgroup-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#hgroup-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span></p>
       </div>
       
         <div class="no-number no-toc" id="hgroup-details">

Index: h5.html
===================================================================
RCS file: /sources/public/html5/markup/h5.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- h5.html	30 Jan 2010 04:44:22 -0000	1.33
+++ h5.html	1 Feb 2010 02:34:51 -0000	1.34
@@ -17,19 +17,9 @@
     <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>
+      <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-content-model">
-        <h2 class="element-subhead">Content model <a class="hash" href="#h5-content-model">#</a></h2><div class="content-models">
-        
-      <div id="h5-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="h5-mdl" href="h5.html#h5-mdl" class="element">h5</a> = </span><span>
-      (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-   <span class="postfix &amp;">&amp;</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )
-       &amp; <a class="ref" href="h5.html#h5.attrs">h5.attrs</a>
-    </span></p>
-        </div>
-      </div></div><div class="no-number no-toc" id="h5-attr-mdl">
+                <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></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>
@@ -57,15 +47,10 @@
             <span title="syntax-end-tag">end tag</span>.</p>
       </div>
       <div class="no-number no-toc" id="h5-context">
-        <h2 class="element-subhead">Permitted contexts <a class="hash" href="#h5-context">#</a></h2>
-        <ul>
-        <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li>
-        <li class="context-mdl"><a href="hgroup.html#hgroup-mdl">hgroup</a> = (<a class="ref" href="h1.html#h1">h1</a>
-    <span class="postfix or">or</span> <a class="ref" href="h2.html#h2">h2</a>
-    <span class="postfix or">or</span> <a class="ref" href="h3.html#h3">h3</a>
-    <span class="postfix or">or</span> <a class="ref" href="h4.html#h4">h4</a>
-    <span class="postfix or">or</span> <a class="ref" href="h5.html#h5">h5</a>
-    <span class="postfix or">or</span> <a class="ref" href="h6.html#h6">h6</a>)<span class="postfix oneormore" title="ONE OR MORE">+</span> </li></ul>
+        <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#h5-context">#</a></h2>
+        <p>
+        <span class="context-mdl"><a href="common-models.html#common.elem.flow">flow elements</a></span>, 
+        <span class="context-mdl"><a href="hgroup.html#hgroup">hgroup</a></span></p>
       </div>
       
       <div class="no-number no-toc" id="h5-display">
Received on Monday, 1 February 2010 02:35:08 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Monday, 1 February 2010 02:35:08 GMT