W3C home > Mailing lists > Public > public-html-diffs@w3.org > August 2009

mike: added explanations for all RNC symbols, and turned all instances of RNC symbols in element and attribute definitions into hyperlinks; filled out intros for a number of other sections that were missing them

From: poot <cvsmail@w3.org>
Date: Sun, 16 Aug 2009 19:53:57 +0900 (JST)
To: public-html-diffs@w3.org
Message-Id: <20090816105358.0F3602BCC2@toro.w3.mag.keio.ac.jp>
mike: added explanations for all RNC symbols, and turned all instances
of RNC symbols in element and attribute definitions into hyperlinks;
filled out intros for a number of other sections that were missing them

http://dev.w3.org/cvsweb/html5/markup/Overview.html?r1=1.348&r2=1.349&f=h

===================================================================
RCS file: /sources/public/html5/markup/body.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- body.html	2 Aug 2009 07:07:42 -0000	1.15
+++ body.html	16 Aug 2009 10:53:40 -0000	1.16
@@ -23,27 +23,27 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="body.html#body.attrs">body.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="body.html#body.attrs">body.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="body-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#body-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="body.html#body.attrs">body.attrs</a> = <span class="pattern" id="body.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="body.html#body.attrs.onafterprint" title="body.attrs.onafterprint">onafterprint</a>?
-  &amp; <a class="ref" href="body.html#body.attrs.onbeforeprint" title="body.attrs.onbeforeprint">onbeforeprint</a>?
-  &amp; <a class="ref" href="body.html#body.attrs.onbeforeunload" title="body.attrs.onbeforeunload">onbeforeunload</a>?
-  &amp; <a class="ref" href="body.html#body.attrs.onhashchange" title="body.attrs.onhashchange">onhashchange</a>?
-  &amp; <a class="ref" href="body.html#body.attrs.onmessage" title="body.attrs.onmessage">onmessage</a>?
-  &amp; <a class="ref" href="body.html#body.attrs.onoffline" title="body.attrs.onoffline">onoffline</a>?
-  &amp; <a class="ref" href="body.html#body.attrs.ononline" title="body.attrs.ononline">ononline</a>?
-  &amp; <a class="ref" href="body.html#body.attrs.onpopstate" title="body.attrs.onpopstate">onpopstate</a>?
-  &amp; <a class="ref" href="body.html#body.attrs.onredo" title="body.attrs.onredo">onredo</a>?
-  &amp; <a class="ref" href="body.html#body.attrs.onresize" title="body.attrs.onresize">onresize</a>?
-  &amp; <a class="ref" href="body.html#body.attrs.onstorage" title="body.attrs.onstorage">onstorage</a>?
-  &amp; <a class="ref" href="body.html#body.attrs.onundo" title="body.attrs.onundo">onundo</a>?
-  &amp; <a class="ref" href="body.html#body.attrs.onunload" title="body.attrs.onunload">onunload</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="body.html#body.attrs.onafterprint" title="body.attrs.onafterprint">onafterprint</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="body.html#body.attrs.onbeforeprint" title="body.attrs.onbeforeprint">onbeforeprint</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="body.html#body.attrs.onbeforeunload" title="body.attrs.onbeforeunload">onbeforeunload</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="body.html#body.attrs.onhashchange" title="body.attrs.onhashchange">onhashchange</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="body.html#body.attrs.onmessage" title="body.attrs.onmessage">onmessage</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="body.html#body.attrs.onoffline" title="body.attrs.onoffline">onoffline</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="body.html#body.attrs.ononline" title="body.attrs.ononline">ononline</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="body.html#body.attrs.onpopstate" title="body.attrs.onpopstate">onpopstate</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="body.html#body.attrs.onredo" title="body.attrs.onredo">onredo</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="body.html#body.attrs.onresize" title="body.attrs.onresize">onresize</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="body.html#body.attrs.onstorage" title="body.attrs.onstorage">onstorage</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="body.html#body.attrs.onundo" title="body.attrs.onundo">onundo</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="body.html#body.attrs.onunload" title="body.attrs.onunload">onunload</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="body-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#body-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -106,7 +106,7 @@
       <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>,
+        <li class="context-mdl"><a href="html.html#html-mdl">html</a> = <a class="ref" href="head.html#head">head</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   <a class="ref" href="body.html#body">body</a></li></ul>
       </div>
       

Index: legend.html
===================================================================
RCS file: /sources/public/html5/markup/legend.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- legend.html	29 Jul 2009 11:23:45 -0000	1.13
+++ legend.html	16 Aug 2009 10:53:43 -0000	1.14
@@ -24,8 +24,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="legend.html#legend.attrs">legend.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="legend.html#legend.attrs">legend.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="legend-attr-mdl">
@@ -46,18 +46,18 @@
       <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="figure.html#figure-mdl">figure</a> = (<a class="ref" href="legend.html#legend">legend</a>,
+        <li class="context-mdl"><a href="figure.html#figure-mdl">figure</a> = (<a class="ref" href="legend.html#legend">legend</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
    (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*))
-  | ((<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*),
-     <a class="ref" href="legend.html#legend">legend</a>?)</li>
-        <li class="context-mdl"><a href="fieldset.html#fieldset-mdl">fieldset</a> = <a class="ref" href="legend.html#legend">legend</a>?,
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>))
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> ((<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)<a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+                                                                       <a class="ref" href="legend.html#legend">legend</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)</li>
+        <li class="context-mdl"><a href="fieldset.html#fieldset-mdl">fieldset</a> = <a class="ref" href="legend.html#legend">legend</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li>
-        <li class="context-mdl"><a href="details.html#details-mdl">details</a> = <a class="ref" href="legend.html#legend">legend</a>,
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)</li>
+        <li class="context-mdl"><a href="details.html#details-mdl">details</a> = <a class="ref" href="legend.html#legend">legend</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li></ul>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)</li></ul>
       </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.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- address.html	2 Aug 2009 11:48:34 -0000	1.14
+++ address.html	16 Aug 2009 10:53:40 -0000	1.15
@@ -22,8 +22,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="address.html#address.attrs">address.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="address.html#address.attrs">address.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="address-attr-mdl">

Index: button.html
===================================================================
RCS file: /sources/public/html5/markup/button.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- button.html	20 Jul 2009 14:56:50 -0000	1.6
+++ button.html	16 Aug 2009 10:53:41 -0000	1.7
@@ -15,8 +15,8 @@
       <h2 class="element-head"><span class="element">button</span> <a class="hash" href="#button">#</a> <a class="toc-bak" href="Overview.html#button-toc">T</a></h2>
       <div>
       <dl><dt class="content-model"><span class="element-pattern-name" id="button"><a href="button.html#button"><span class="element">button</span></a> = </span></dt><dd class="elem-mdl"><a class="ref" href="button.submit.html#button.submit">button.submit</a>
-  | <a class="ref" href="button.reset.html#button.reset">button.reset</a>
-  | <a class="ref" href="button.button.html#button.button">button.button</a></dd></dl>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="button.reset.html#button.reset">button.reset</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="button.button.html#button.button">button.button</a></dd></dl>
       <p>A <span class="element">button</span> element with
                 no <span class="attribute">type</span> attribute
                 specified represents the same thing as a <a href="button.submit.html#button.submit">button element with its type

Index: th.html
===================================================================
RCS file: /sources/public/html5/markup/th.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- th.html	2 Aug 2009 08:15:42 -0000	1.15
+++ th.html	16 Aug 2009 10:53:45 -0000	1.16
@@ -22,26 +22,26 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="th.html#th.attrs">th.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="th.html#th.attrs">th.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="th-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#th-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="th.html#th.attrs">th.attrs</a> = <span class="pattern" id="th.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="th.html#th.attrs.scope" title="th.attrs.scope">scope</a>?
-  &amp; <a class="ref" href="th.html#th.attrs.colspan" title="th.attrs.colspan">colspan</a>?
-  &amp; <a class="ref" href="th.html#th.attrs.rowspan" title="th.attrs.rowspan">rowspan</a>?
-  &amp; <a class="ref" href="th.html#th.attrs.headers" title="th.attrs.headers">headers</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="th.html#th.attrs.scope" title="th.attrs.scope">scope</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="th.html#th.attrs.colspan" title="th.attrs.colspan">colspan</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="th.html#th.attrs.rowspan" title="th.attrs.rowspan">rowspan</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="th.html#th.attrs.headers" title="th.attrs.headers">headers</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="th-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#th-attributes">#</a></h2>
         <dl class="attr-defs">
             <dt><a class="attribute-name" id="th.attrs.scope" title="th.attrs.scope" href="th.html#th.attrs.scope">scope</a> = <span class="attr-values">
        "row"
-      |  "col"
-      |  "rowgroup"
-      |  "colgroup"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  "col"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  "rowgroup"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  "colgroup"
     </span> </dt>
             <dd>Specifies what set of cells the
         <a href="th.html#th" class="element">th</a>
@@ -91,7 +91,7 @@
         <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>
-   | <a class="ref" href="th.html#th">th</a>)*</li></ul>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="th.html#th">th</a>)<a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a></li></ul>
       </div>
       
       <div class="no-number no-toc" id="th-display">

Index: bb.html
===================================================================
RCS file: /sources/public/html5/markup/bb.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- bb.html	2 Aug 2009 11:48:35 -0000	1.14
+++ bb.html	16 Aug 2009 10:53:40 -0000	1.15
@@ -22,15 +22,15 @@
         <div class="content-models" id="bb-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="bb-mdl" href="bb.html#bb-mdl" class="element">bb</a> = </span><span>
       (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="bb.html#bb.attrs">bb.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="bb.html#bb.attrs">bb.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="bb-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#bb-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="bb.html#bb.attrs">bb.attrs</a> = <span class="pattern" id="bb.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="bb.html#bb.attrs.type" title="bb.attrs.type">type</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="bb.html#bb.attrs.type" title="bb.attrs.type">type</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="bb-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#bb-attributes">#</a></h2>
         <dl class="attr-defs">

Index: mark.html
===================================================================
RCS file: /sources/public/html5/markup/mark.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- mark.html	29 Jul 2009 11:23:45 -0000	1.12
+++ mark.html	16 Aug 2009 10:53:43 -0000	1.13
@@ -24,8 +24,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="mark.html#mark.attrs">mark.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="mark.html#mark.attrs">mark.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="mark-attr-mdl">

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -d -r1.348 -r1.349
--- Overview.html	9 Aug 2009 15:15:19 -0000	1.348
+++ Overview.html	16 Aug 2009 10:53:40 -0000	1.349
@@ -9,7 +9,7 @@
 <body>
 <div class="head">
 <h1>HTML 5: The Markup Language</h1>
-<h2>Editor&#8217;s Draft <em>9 August 2009</em>
+<h2>Editor&#8217;s Draft <em>16 August 2009</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -42,7 +42,7 @@
     
     
     <p>
-        This document is the 9 August 2009 Editor&#8217;s Draft of 
+        This document is the 16 August 2009 Editor&#8217;s Draft of 
         <cite>HTML 5: The Markup Language</cite>.
       </p>
     <p>
@@ -103,37 +103,31 @@
 </h2>
     <ul>
 <li>
-<span class="toc-section-number">&#8199;</span><a href="intro.html#intro"><span class="toc-section-number">1.</span> Introduction and Scope</a>
-</li>
-<li>
-<span class="toc-section-number">&#8199;</span><a href="conformance.html#conformance"><span class="toc-section-number">2.</span> Conformance requirements</a>
-</li>
-<li>
-<span class="toc-section-number">&#8199;</span><a href="structure.html#structure"><span class="toc-section-number">3.</span> Structure of this specification</a>
+<span class="toc-section-number"></span><a href="intro.html#intro"><span class="toc-section-number">1.</span> Introduction</a>
 </li>
 <li>
-<span class="toc-section-number">&#8199;</span><a href="terminology.html#terminology"><span class="toc-section-number">4.</span> Terminology</a>
+<span class="toc-section-number"></span><a href="terminology.html#terminology"><span class="toc-section-number">2.</span> Terminology and symbols</a>
 </li>
 <li>
-<span class="toc-section-number">&#8199;</span><a href="documents.html#documents"><span class="toc-section-number">5.</span> Documents</a>
+<span class="toc-section-number"></span><a href="documents.html#documents"><span class="toc-section-number">3.</span> Documents</a>
 </li>
 <li>
-<span class="toc-section-number">&#8199;</span><a href="syntax.html#syntax"><span class="toc-section-number">6.</span> HTML syntax</a>
+<span class="toc-section-number"></span><a href="syntax.html#syntax"><span class="toc-section-number">4.</span> HTML syntax</a>
 </li>
 <li>
-<span class="toc-section-number">&#8199;</span><a href="elements.html#elements"><span class="toc-section-number">7.</span> HTML elements</a>
+<span class="toc-section-number"></span><a href="elements.html#elements"><span class="toc-section-number">5.</span> HTML elements</a>
 </li>
 <li>
-<span class="toc-section-number">&#8199;</span><a href="common-models.html#common-models"><span class="toc-section-number">8.</span> Common content models</a>
+<span class="toc-section-number"></span><a href="common-models.html#common-models"><span class="toc-section-number">6.</span> Common content models</a>
 </li>
 <li>
-<span class="toc-section-number">&#8199;</span><a href="common-attributes.html#common-attributes"><span class="toc-section-number">9.</span> Common attributes</a>
+<span class="toc-section-number"></span><a href="common-attributes.html#common-attributes"><span class="toc-section-number">7.</span> Common attributes</a>
 </li>
 <li>
-<span class="toc-section-number"></span><a href="forms-attributes.html#forms-attributes"><span class="toc-section-number">10.</span> Forms attributes</a>
+<span class="toc-section-number"></span><a href="forms-attributes.html#forms-attributes"><span class="toc-section-number">8.</span> Forms attributes</a>
 </li>
 <li>
-<span class="toc-section-number"></span><a href="datatypes.html#datatypes"><span class="toc-section-number">11.</span> Datatypes</a>
+<span class="toc-section-number"></span><a href="datatypes.html#datatypes"><span class="toc-section-number">9.</span> Datatypes</a>
 </li>
 </ul>
 <ul>
@@ -151,79 +145,73 @@
 </h2>
     <ul>
 <li id="intro-toc">
-<span class="toc-section-number">&#8199;</span><a href="intro.html#intro"><span class="toc-section-number">1.</span> Introduction and Scope</a>
-<ul>
-<li id="scope-toc">
-<span class="toc-section-number"></span><a href="intro.html#scope"><span class="toc-section-number">1.01.</span> Scope</a>
+<span class="toc-section-number"></span><a href="intro.html#intro"><span class="toc-section-number">1.</span> Introduction</a>
 </li>
-<li id="out-of-scope-toc">
-<span class="toc-section-number"></span><a href="intro.html#out-of-scope"><span class="toc-section-number">1.02.</span> Out of scope</a>
+<li id="terminology-toc">
+<span class="toc-section-number"></span><a href="terminology.html#terminology"><span class="toc-section-number">2.</span> Terminology and symbols</a>
+<ul>
+<li id="terms-toc">
+<span class="toc-section-number"></span><a href="terminology.html#terms"><span class="toc-section-number">2.01.</span> Terms used in other parts of the specification</a>
 </li>
-<li id="audience-toc">
-<span class="toc-section-number"></span><a href="intro.html#audience"><span class="toc-section-number">1.03.</span> Intended audience</a>
+<li id="rnc-symbols-toc">
+<span class="toc-section-number"></span><a href="terminology.html#rnc-symbols"><span class="toc-section-number">2.02.</span> Symbols used in content models</a>
 </li>
 </ul>
 </li>
-<li id="conformance-toc">
-<span class="toc-section-number">&#8199;</span><a href="conformance.html#conformance"><span class="toc-section-number">2.</span> Conformance requirements</a>
-</li>
-<li id="structure-toc">
-<span class="toc-section-number">&#8199;</span><a href="structure.html#structure"><span class="toc-section-number">3.</span> Structure of this specification</a>
-</li>
-<li id="terminology-toc">
-<span class="toc-section-number">&#8199;</span><a href="terminology.html#terminology"><span class="toc-section-number">4.</span> Terminology</a>
-</li>
 <li id="documents-toc">
-<span class="toc-section-number">&#8199;</span><a href="documents.html#documents"><span class="toc-section-number">5.</span> Documents</a>
+<span class="toc-section-number"></span><a href="documents.html#documents"><span class="toc-section-number">3.</span> Documents</a>
 <ul>
+<li id="language-and-syntax-toc">
+<span class="toc-section-number"></span><a href="documents.html#language-and-syntax"><span class="toc-section-number">3.01.</span> The HTML language and HTML and XML syntaxes</a>
+</li>
 <li id="mime-types-toc">
-<span class="toc-section-number"></span><a href="documents.html#mime-types"><span class="toc-section-number">5.01.</span> The HTML namespace and MIME types</a>
+<span class="toc-section-number"></span><a href="documents.html#mime-types"><span class="toc-section-number">3.02.</span> The HTML namespace and MIME types</a>
 </li>
 <li id="conformant-documents-toc">
-<span class="toc-section-number"></span><a href="documents.html#conformant-documents"><span class="toc-section-number">5.02.</span> Conformant documents</a>
+<span class="toc-section-number"></span><a href="documents.html#conformant-documents"><span class="toc-section-number">3.03.</span> Conformant documents</a>
 </li>
 <li id="case-insensitivity-toc">
-<span class="toc-section-number"></span><a href="documents.html#case-insensitivity"><span class="toc-section-number">5.03.</span> Case insensitivity in tag names and attribute names</a>
+<span class="toc-section-number"></span><a href="documents.html#case-insensitivity"><span class="toc-section-number">3.04.</span> Case insensitivity in tag names and attribute names</a>
 </li>
 </ul>
 </li>
 <li id="syntax-toc">
-<span class="toc-section-number">&#8199;</span><a href="syntax.html#syntax"><span class="toc-section-number">6.</span> HTML syntax</a>
+<span class="toc-section-number"></span><a href="syntax.html#syntax"><span class="toc-section-number">4.</span> HTML syntax</a>
 <ul>
 <li id="doctype-syntax-toc">
-<span class="toc-section-number"></span><a href="syntax.html#doctype-syntax"><span class="toc-section-number">6.01.</span> The doctype</a>
+<span class="toc-section-number"></span><a href="syntax.html#doctype-syntax"><span class="toc-section-number">4.01.</span> The doctype</a>
 </li>
 <li id="character-encoding-toc">
-<span class="toc-section-number"></span><a href="syntax.html#character-encoding"><span class="toc-section-number">6.02.</span> Character encoding declaration</a>
+<span class="toc-section-number"></span><a href="syntax.html#character-encoding"><span class="toc-section-number">4.02.</span> Character encoding declaration</a>
 </li>
 <li id="syntax-elements-toc">
-<span class="toc-section-number"></span><a href="syntax.html#syntax-elements"><span class="toc-section-number">6.03.</span> Elements</a>
+<span class="toc-section-number"></span><a href="syntax.html#syntax-elements"><span class="toc-section-number">4.03.</span> Elements</a>
 </li>
 <li id="syntax-attributes-toc">
-<span class="toc-section-number"></span><a href="syntax.html#syntax-attributes"><span class="toc-section-number">6.04.</span> Attributes</a>
+<span class="toc-section-number"></span><a href="syntax.html#syntax-attributes"><span class="toc-section-number">4.04.</span> Attributes</a>
 </li>
 <li id="text-syntax-toc">
-<span class="toc-section-number"></span><a href="syntax.html#text-syntax"><span class="toc-section-number">6.05.</span> Text and character data</a>
+<span class="toc-section-number"></span><a href="syntax.html#text-syntax"><span class="toc-section-number">4.05.</span> Text and character data</a>
 </li>
 <li id="character-references-toc">
-<span class="toc-section-number"></span><a href="syntax.html#character-references"><span class="toc-section-number">6.06.</span> Character references</a>
+<span class="toc-section-number"></span><a href="syntax.html#character-references"><span class="toc-section-number">4.06.</span> Character references</a>
 </li>
 <li id="comments-toc">
-<span class="toc-section-number"></span><a href="syntax.html#comments"><span class="toc-section-number">6.07.</span> Comments</a>
+<span class="toc-section-number"></span><a href="syntax.html#comments"><span class="toc-section-number">4.07.</span> Comments</a>
 </li>
 <li id="escaping-text-span-toc">
-<span class="toc-section-number"></span><a href="syntax.html#escaping-text-span"><span class="toc-section-number">6.08.</span> Escaping text spans</a>
+<span class="toc-section-number"></span><a href="syntax.html#escaping-text-span"><span class="toc-section-number">4.08.</span> Escaping text spans</a>
 </li>
 <li id="svg-mathml-toc">
-<span class="toc-section-number"></span><a href="syntax.html#svg-mathml"><span class="toc-section-number">6.09.</span> SVG and MathML elements in HTML documents</a>
+<span class="toc-section-number"></span><a href="syntax.html#svg-mathml"><span class="toc-section-number">4.09.</span> SVG and MathML elements in HTML documents</a>
 </li>
 <li id="cdata-sections-toc">
-<span class="toc-section-number"></span><a href="syntax.html#cdata-sections"><span class="toc-section-number">6.10.</span> CDATA sections in SVG and MathML contents</a>
+<span class="toc-section-number"></span><a href="syntax.html#cdata-sections"><span class="toc-section-number">4.10.</span> CDATA sections in SVG and MathML contents</a>
 </li>
 </ul>
 </li>
 <li id="elements-toc">
-<span class="toc-section-number">&#8199;</span><a href="elements.html#elements"><span class="toc-section-number">7.</span> HTML elements</a>
+<span class="toc-section-number"></span><a href="elements.html#elements"><span class="toc-section-number">5.</span> HTML elements</a>
 <ul>
 <li id="a-toc">
 <span class="toc-section-number"></span><a href="a.html#a"><span class="toc-section-number"></span> <span class="element">a</span> &#8211; <span class="shortdesc">hyperlink</span></a>
@@ -622,7 +610,7 @@
 <span class="toc-section-number"></span><a href="th.html#th"><span class="toc-section-number"></span> <span class="element">th</span> &#8211; <span class="shortdesc">table header cell</span></a>
 </li>
 <li id="thead-toc">
-<span class="toc-section-number"></span><a href="thead.html#thead"><span class="toc-section-number"></span> <span class="element">thead</span> &#8211; <span class="shortdesc">table header row group</span></a>
+<span class="toc-section-number"></span><a href="thead.html#thead"><span class="toc-section-number"></span> <span class="element">thead</span> &#8211; <span class="shortdesc">table heading group</span></a>
 </li>
 <li id="time-toc">
 <span class="toc-section-number"></span><a href="time.html#time"><span class="toc-section-number"></span> <span class="element">time</span> &#8211; <span class="shortdesc">date and/or time</span></a>
@@ -645,38 +633,38 @@
 </ul>
 </li>
 <li id="common-models-toc">
-<span class="toc-section-number">&#8199;</span><a href="common-models.html#common-models"><span class="toc-section-number">8.</span> Common content models</a>
+<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">8.01.</span> Flow elements</a>
+<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>
 <li id="common-metadata-toc">
-<span class="toc-section-number"></span><a href="common-models.html#common-metadata"><span class="toc-section-number">8.02.</span> Metadata elements</a>
+<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>
 <li id="common-phrasing-toc">
-<span class="toc-section-number"></span><a href="common-models.html#common-phrasing"><span class="toc-section-number">8.03.</span> Phrasing elements</a>
+<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>
 </ul>
 </li>
 <li id="common-attributes-toc">
-<span class="toc-section-number">&#8199;</span><a href="common-attributes.html#common-attributes"><span class="toc-section-number">9.</span> Common attributes</a>
+<span class="toc-section-number"></span><a href="common-attributes.html#common-attributes"><span class="toc-section-number">7.</span> Common attributes</a>
 <ul>
 <li id="core-attrs-toc">
-<span class="toc-section-number"></span><a href="common-attributes.html#core-attrs"><span class="toc-section-number">9.01.</span> Core attributes</a>
+<span class="toc-section-number"></span><a href="common-attributes.html#core-attrs"><span class="toc-section-number">7.01.</span> Core attributes</a>
 </li>
 <li id="event-handler-attrs-toc">
-<span class="toc-section-number"></span><a href="common-attributes.html#event-handler-attrs"><span class="toc-section-number">9.02.</span> Event-handler attributes</a>
+<span class="toc-section-number"></span><a href="common-attributes.html#event-handler-attrs"><span class="toc-section-number">7.02.</span> Event-handler attributes</a>
 </li>
 <li id="xml-attrs-toc">
-<span class="toc-section-number"></span><a href="common-attributes.html#xml-attrs"><span class="toc-section-number">9.03.</span> XML attributes</a>
+<span class="toc-section-number"></span><a href="common-attributes.html#xml-attrs"><span class="toc-section-number">7.03.</span> XML attributes</a>
 </li>
 </ul>
 </li>
 <li id="forms-attributes-toc">
-<span class="toc-section-number"></span><a href="forms-attributes.html#forms-attributes"><span class="toc-section-number">10.</span> Forms attributes</a>
+<span class="toc-section-number"></span><a href="forms-attributes.html#forms-attributes"><span class="toc-section-number">8.</span> Forms attributes</a>
 </li>
 <li id="datatypes-toc">
-<span class="toc-section-number"></span><a href="datatypes.html#datatypes"><span class="toc-section-number">11.</span> Datatypes</a>
+<span class="toc-section-number"></span><a href="datatypes.html#datatypes"><span class="toc-section-number">9.</span> Datatypes</a>
 </li>
 </ul>
 <ul>
@@ -691,8 +679,6 @@
 <div id="this_sections">
       
       
-      
-      
     
     
         

Index: br.html
===================================================================
RCS file: /sources/public/html5/markup/br.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- br.html	29 Jul 2009 11:23:42 -0000	1.8
+++ br.html	16 Aug 2009 10:53:40 -0000	1.9
@@ -21,7 +21,8 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#br-content">#</a></h2>
         <div class="content-models" 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>
+      empty
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="br.html#br.attrs">br.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="br-attr-mdl">

Index: input.email.html
===================================================================
RCS file: /sources/public/html5/markup/input.email.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- input.email.html	2 Aug 2009 07:07:43 -0000	1.11
+++ input.email.html	16 Aug 2009 10:53:42 -0000	1.12
@@ -31,22 +31,22 @@
         <h2 class="element-subhead">Attribute model <a class="hash" href="#input.email-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="input.email.html#input.email.attrs">input.email.attrs</a> = <span class="pattern" id="input.email.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-  &amp; <a class="ref" href="input.email.html#input.email.attrs.type" title="input.email.attrs.type">type</a>
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a>?
-  &amp; ((<a class="ref" href="forms-attributes.html#input.attrs.multiple" title="input.attrs.multiple">multiple</a>
-          &amp; <a class="ref" href="input.email.html#input.email.attrs.value.multiple" title="input.email.attrs.value.multiple">value.multiple</a>?)
-         | <a class="ref" href="input.email.html#input.email.attrs.value.single" title="input.email.attrs.value.single">value.single</a>?)?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.email.html#input.email.attrs.type" title="input.email.attrs.type">type</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> ((<a class="ref" href="forms-attributes.html#input.attrs.multiple" title="input.attrs.multiple">multiple</a>
+                                                                                        <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.email.html#input.email.attrs.value.multiple" title="input.email.attrs.value.multiple">value.multiple</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)
+                                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="input.email.html#input.email.attrs.value.single" title="input.email.attrs.value.single">value.single</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)<a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="input.email-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#input.email-attributes">#</a></h2>
         <dl class="attr-defs">

Index: tr.html
===================================================================
RCS file: /sources/public/html5/markup/tr.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- tr.html	29 Jul 2009 11:23:46 -0000	1.9
+++ tr.html	16 Aug 2009 10:53:45 -0000	1.10
@@ -22,8 +22,8 @@
         <div class="content-models" 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>
-   | <a class="ref" href="th.html#th">th</a>)*
-      &amp; <a class="ref" href="tr.html#tr.attrs">tr.attrs</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="th.html#th">th</a>)<a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="tr.html#tr.attrs">tr.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="tr-attr-mdl">
@@ -47,18 +47,18 @@
       <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>?,
-  <a class="ref" href="colgroup.html#colgroup">colgroup</a>*,
-  <a class="ref" href="thead.html#thead">thead</a>?,
-  ((<a class="ref" href="tfoot.html#tfoot">tfoot</a>,
-    (<a class="ref" href="tbody.html#tbody">tbody</a>*
-     | <a class="ref" href="tr.html#tr">tr</a>+))
-   | ((<a class="ref" href="tbody.html#tbody">tbody</a>*
-       | <a class="ref" href="tr.html#tr">tr</a>+),
-      <a class="ref" href="tfoot.html#tfoot">tfoot</a>?))</li>
-        <li class="context-mdl"><a href="thead.html#thead-mdl">thead</a> = <a class="ref" href="tr.html#tr">tr</a>*</li>
-        <li class="context-mdl"><a href="tfoot.html#tfoot-mdl">tfoot</a> = <a class="ref" href="tr.html#tr">tr</a>*</li>
-        <li class="context-mdl"><a href="tbody.html#tbody-mdl">tbody</a> = <a class="ref" href="tr.html#tr">tr</a>*</li></ul>
+        <li class="context-mdl"><a href="table.html#table-mdl">table</a> = <a class="ref" href="caption.html#caption">caption</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+  <a class="ref" href="colgroup.html#colgroup">colgroup</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+  <a class="ref" href="thead.html#thead">thead</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+  ((<a class="ref" href="tfoot.html#tfoot">tfoot</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+    (<a class="ref" href="tbody.html#tbody">tbody</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+     <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="tr.html#tr">tr</a><a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a>))
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> ((<a class="ref" href="tbody.html#tbody">tbody</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+                                                                         <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="tr.html#tr">tr</a><a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a>)<a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+                                                                        <a class="ref" href="tfoot.html#tfoot">tfoot</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>))</li>
+        <li class="context-mdl"><a href="thead.html#thead-mdl">thead</a> = <a class="ref" href="tr.html#tr">tr</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a></li>
+        <li class="context-mdl"><a href="tfoot.html#tfoot-mdl">tfoot</a> = <a class="ref" href="tr.html#tr">tr</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a></li>
+        <li class="context-mdl"><a href="tbody.html#tbody-mdl">tbody</a> = <a class="ref" href="tr.html#tr">tr</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a></li></ul>
       </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.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- input.month.html	2 Aug 2009 07:07:43 -0000	1.11
+++ input.month.html	16 Aug 2009 10:53:43 -0000	1.12
@@ -31,19 +31,19 @@
         <h2 class="element-subhead">Attribute model <a class="hash" href="#input.month-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="input.month.html#input.month.attrs">input.month.attrs</a> = <span class="pattern" id="input.month.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-  &amp; <a class="ref" href="input.month.html#input.month.attrs.type" title="input.month.attrs.type">type</a>
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a>?
-  &amp; <a class="ref" href="input.month.html#input.month.attrs.min" title="input.month.attrs.min">min</a>?
-  &amp; <a class="ref" href="input.month.html#input.month.attrs.max" title="input.month.attrs.max">max</a>?
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.step.integer" title="input.attrs.step.integer">step.integer</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a>?
-  &amp; <a class="ref" href="input.month.html#input.month.attrs.value" title="input.month.attrs.value">value</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.month.html#input.month.attrs.type" title="input.month.attrs.type">type</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.month.html#input.month.attrs.min" title="input.month.attrs.min">min</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.month.html#input.month.attrs.max" title="input.month.attrs.max">max</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.step.integer" title="input.attrs.step.integer">step.integer</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.month.html#input.month.attrs.value" title="input.month.attrs.value">value</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="input.month-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#input.month-attributes">#</a></h2>
         <dl class="attr-defs">

Index: iframe.html
===================================================================
RCS file: /sources/public/html5/markup/iframe.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- iframe.html	8 Aug 2009 14:02:58 -0000	1.20
+++ iframe.html	16 Aug 2009 10:53:42 -0000	1.21
@@ -22,19 +22,19 @@
         <div class="content-models" 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>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="iframe.html#iframe.attrs">iframe.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="iframe-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#iframe-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="iframe.html#iframe.attrs">iframe.attrs</a> = <span class="pattern" id="iframe.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="iframe.html#iframe.attrs.src" title="iframe.attrs.src">src</a>?
-  &amp; <a class="ref" href="iframe.html#iframe.attrs.name" title="iframe.attrs.name">name</a>?
-  &amp; <a class="ref" href="iframe.html#iframe.attrs.width" title="iframe.attrs.width">width</a>?
-  &amp; <a class="ref" href="iframe.html#iframe.attrs.height" title="iframe.attrs.height">height</a>?
-  &amp; <a class="ref" href="iframe.html#iframe.attrs.sandbox" title="iframe.attrs.sandbox">sandbox</a>?
-  &amp; <a class="ref" href="iframe.html#iframe.attrs.seamless" title="iframe.attrs.seamless">seamless</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="iframe.html#iframe.attrs.src" title="iframe.attrs.src">src</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="iframe.html#iframe.attrs.name" title="iframe.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="iframe.html#iframe.attrs.width" title="iframe.attrs.width">width</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="iframe.html#iframe.attrs.height" title="iframe.attrs.height">height</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="iframe.html#iframe.attrs.sandbox" title="iframe.attrs.sandbox">sandbox</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="iframe.html#iframe.attrs.seamless" title="iframe.attrs.seamless">seamless</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="iframe-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#iframe-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -67,7 +67,10 @@
             <dd>Instructs the UA to enable a set of extra restrictions on any
         content hosted by the <code><a href="iframe.html#iframe">iframe</a></code>.</dd>
           
-            <dt><a class="attribute-name" id="iframe.attrs.seamless" title="iframe.attrs.seamless" href="iframe.html#iframe.attrs.seamless">seamless</a> = <span class="attr-values">  "seamless" |  "" </span> </dt>
+            <dt><a class="attribute-name" id="iframe.attrs.seamless" title="iframe.attrs.seamless" href="iframe.html#iframe.attrs.seamless">seamless</a> = <span class="attr-values">
+       "seamless"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
+    </span> </dt>
             <dd>Instructs the UA that the <code><a href="iframe.html#iframe">iframe</a></code> element's <a href="terminology.html#context">browsing context</a> is to be rendered
         in a manner that makes it appear to be part of the
         containing document (seamlessly included in the parent

Index: datagrid.html
===================================================================
RCS file: /sources/public/html5/markup/datagrid.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- datagrid.html	2 Aug 2009 07:07:42 -0000	1.17
+++ datagrid.html	16 Aug 2009 10:53:41 -0000	1.18
@@ -23,24 +23,30 @@
         <div class="content-models" id="datagrid-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="datagrid-mdl" href="datagrid.html#datagrid-mdl" class="element">datagrid</a> = </span><span>
       (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="datagrid.html#datagrid.attrs">datagrid.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="datagrid.html#datagrid.attrs">datagrid.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="datagrid-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#datagrid-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="datagrid.html#datagrid.attrs">datagrid.attrs</a> = <span class="pattern" id="datagrid.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="datagrid.html#datagrid.attrs.multiple" title="datagrid.attrs.multiple">multiple</a>?
-  &amp; <a class="ref" href="datagrid.html#datagrid.attrs.disabled" title="datagrid.attrs.disabled">disabled</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="datagrid.html#datagrid.attrs.multiple" title="datagrid.attrs.multiple">multiple</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="datagrid.html#datagrid.attrs.disabled" title="datagrid.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="datagrid-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#datagrid-attributes">#</a></h2>
         <dl class="attr-defs">
-            <dt><a class="attribute-name" id="datagrid.attrs.multiple" title="datagrid.attrs.multiple" href="datagrid.html#datagrid.attrs.multiple">multiple</a> = <span class="attr-values">  "multiple" |  "" </span> </dt>
+            <dt><a class="attribute-name" id="datagrid.attrs.multiple" title="datagrid.attrs.multiple" href="datagrid.html#datagrid.attrs.multiple">multiple</a> = <span class="attr-values">
+       "multiple"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
+    </span> </dt>
             <dd>Specifies that the user must be able to select any
         number of rows (zero or more).</dd>
           
-            <dt><a class="attribute-name" id="datagrid.attrs.disabled" title="datagrid.attrs.disabled" href="datagrid.html#datagrid.attrs.disabled">disabled</a> = <span class="attr-values">  "disabled" |  "" </span> </dt>
+            <dt><a class="attribute-name" id="datagrid.attrs.disabled" title="datagrid.attrs.disabled" href="datagrid.html#datagrid.attrs.disabled">disabled</a> = <span class="attr-values">
+       "disabled"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
+    </span> </dt>
             <dd>Instructs the UA to disable the <a href="datagrid.html#datagrid">datagrid</a>, preventing the user from
       interacting with it.</dd>
           

Index: ins.html
===================================================================
RCS file: /sources/public/html5/markup/ins.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ins.html	2 Aug 2009 07:07:44 -0000	1.17
+++ ins.html	16 Aug 2009 10:53:43 -0000	1.18
@@ -24,22 +24,22 @@
         <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>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="ins.html#ins.attrs">ins.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="ins.html#ins.attrs">ins.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="ins.html#ins.attrs">ins.attrs</a>
     </span></dd>
         </dl>
       </div><div class="no-number no-toc" id="ins-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#ins-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="ins.html#ins.attrs">ins.attrs</a> = <span class="pattern" id="ins.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="ins.html#ins.attrs.cite" title="ins.attrs.cite">cite</a>?
-  &amp; <a class="ref" href="ins.html#ins.attrs.datetime" title="ins.attrs.datetime">datetime</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="ins.html#ins.attrs.cite" title="ins.attrs.cite">cite</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="ins.html#ins.attrs.datetime" title="ins.attrs.datetime">datetime</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="ins-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#ins-attributes">#</a></h2>
         <dl class="attr-defs">

Index: abbr.html
===================================================================
RCS file: /sources/public/html5/markup/abbr.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- abbr.html	2 Aug 2009 11:48:34 -0000	1.13
+++ abbr.html	16 Aug 2009 10:53:40 -0000	1.14
@@ -23,8 +23,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="abbr.html#abbr.attrs">abbr.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="abbr.html#abbr.attrs">abbr.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="abbr-attr-mdl">

Index: div.html
===================================================================
RCS file: /sources/public/html5/markup/div.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- div.html	2 Aug 2009 11:48:35 -0000	1.14
+++ div.html	16 Aug 2009 10:53:41 -0000	1.15
@@ -22,10 +22,10 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#div-content">#</a></h2>
         <div class="content-models" 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>*,
+      <a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="div.html#div.attrs">div.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="div.html#div.attrs">div.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="div-attr-mdl">

Index: meta.name.html
===================================================================
RCS file: /sources/public/html5/markup/meta.name.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- meta.name.html	2 Aug 2009 07:07:44 -0000	1.11
+++ meta.name.html	16 Aug 2009 10:53:43 -0000	1.12
@@ -23,15 +23,15 @@
         <div class="content-models" 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>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="meta.name.html#meta.name.attrs">meta.name.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="meta.name-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#meta.name-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="meta.name.html#meta.name.attrs">meta.name.attrs</a> = <span class="pattern" id="meta.name.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="meta.name.html#meta.name.attrs.name" title="meta.name.attrs.name">name</a>
-  &amp; <a class="ref" href="meta.name.html#meta.name.attrs.content" title="meta.name.attrs.content">content</a></span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="meta.name.html#meta.name.attrs.name" title="meta.name.attrs.name">name</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="meta.name.html#meta.name.attrs.content" title="meta.name.attrs.content">content</a></span></p></div></div>
       <div class="no-number no-toc" id="meta.name-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#meta.name-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -96,16 +96,17 @@
         <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>
-  | <a class="ref" href="style.html#style-pattern">style</a>
-  | <a class="ref" href="meta.name.html#meta.name">meta.name</a>
-  | <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-  | <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-  | <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  | (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-     | <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
-  | <a class="ref" href="script.html#script">script</a>
-  | <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  | (<a class="ref" href="command.html#command">command</a>)</li></ul>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="style.html#style-pattern">style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>
+                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> notAllowed)</li></ul>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: dt.html
===================================================================
RCS file: /sources/public/html5/markup/dt.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- dt.html	2 Aug 2009 11:48:35 -0000	1.14
+++ dt.html	16 Aug 2009 10:53:41 -0000	1.15
@@ -26,8 +26,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="dt.html#dt.attrs">dt.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="dt.html#dt.attrs">dt.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="dt-attr-mdl">
@@ -51,10 +51,10 @@
       <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>+,
-   <a class="ref" href="dd.html#dd">dd</a>+)*</li>
-        <li class="context-mdl"><a href="dialog.html#dialog-mdl">dialog</a> = (<a class="ref" href="dt.html#dt">dt</a>,
-   <a class="ref" href="dd.html#dd">dd</a>)*</li></ul>
+        <li class="context-mdl"><a href="dl.html#dl-mdl">dl</a> = (<a class="ref" href="dt.html#dt">dt</a><a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+   <a class="ref" href="dd.html#dd">dd</a><a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a>)<a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a></li>
+        <li class="context-mdl"><a href="dialog.html#dialog-mdl">dialog</a> = (<a class="ref" href="dt.html#dt">dt</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+   <a class="ref" href="dd.html#dd">dd</a>)<a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a></li></ul>
       </div>
       
       <div class="no-number no-toc" id="dt-display">

Index: table.html
===================================================================
RCS file: /sources/public/html5/markup/table.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- table.html	2 Aug 2009 07:07:45 -0000	1.13
+++ table.html	16 Aug 2009 10:53:45 -0000	1.14
@@ -22,23 +22,23 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#table-content">#</a></h2>
         <div class="content-models" 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>?,
-  <a class="ref" href="colgroup.html#colgroup">colgroup</a>*,
-  <a class="ref" href="thead.html#thead">thead</a>?,
-  ((<a class="ref" href="tfoot.html#tfoot">tfoot</a>,
-    (<a class="ref" href="tbody.html#tbody">tbody</a>*
-     | <a class="ref" href="tr.html#tr">tr</a>+))
-   | ((<a class="ref" href="tbody.html#tbody">tbody</a>*
-       | <a class="ref" href="tr.html#tr">tr</a>+),
-      <a class="ref" href="tfoot.html#tfoot">tfoot</a>?))
-      &amp; <a class="ref" href="table.html#table.attrs">table.attrs</a>
+      <a class="ref" href="caption.html#caption">caption</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+  <a class="ref" href="colgroup.html#colgroup">colgroup</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+  <a class="ref" href="thead.html#thead">thead</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+  ((<a class="ref" href="tfoot.html#tfoot">tfoot</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+    (<a class="ref" href="tbody.html#tbody">tbody</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+     <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="tr.html#tr">tr</a><a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a>))
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> ((<a class="ref" href="tbody.html#tbody">tbody</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+                                                                         <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="tr.html#tr">tr</a><a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a>)<a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+                                                                        <a class="ref" href="tfoot.html#tfoot">tfoot</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>))
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="table.html#table.attrs">table.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="table-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#table-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="table.html#table.attrs">table.attrs</a> = <span class="pattern" id="table.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="table.html#table.attrs.summary" title="table.attrs.summary">summary</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="table.html#table.attrs.summary" title="table.attrs.summary">summary</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="table-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#table-attributes">#</a></h2>
         <dl class="attr-defs">

Index: nav.html
===================================================================
RCS file: /sources/public/html5/markup/nav.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- nav.html	2 Aug 2009 11:48:35 -0000	1.15
+++ nav.html	16 Aug 2009 10:53:43 -0000	1.16
@@ -24,8 +24,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="nav.html#nav.attrs">nav.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="nav.html#nav.attrs">nav.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="nav-attr-mdl">

Index: html.html
===================================================================
RCS file: /sources/public/html5/markup/html.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- html.html	2 Aug 2009 07:07:43 -0000	1.10
+++ html.html	16 Aug 2009 10:53:42 -0000	1.11
@@ -21,16 +21,16 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#html-content">#</a></h2>
         <div class="content-models" 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>,
+      <a class="ref" href="head.html#head">head</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   <a class="ref" href="body.html#body">body</a>
-      &amp; <a class="ref" href="html.html#html.attrs">html.attrs</a>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="html.html#html.attrs">html.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="html-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#html-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="html.html#html.attrs">html.attrs</a> = <span class="pattern" id="html.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="html.html#html.attrs.manifest" title="html.attrs.manifest">manifest</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="html.html#html.attrs.manifest" title="html.attrs.manifest">manifest</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="html-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#html-attributes">#</a></h2>
         <dl class="attr-defs">

Index: meta.http-equiv.content-type.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.content-type.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- meta.http-equiv.content-type.html	2 Aug 2009 11:48:35 -0000	1.13
+++ meta.http-equiv.content-type.html	16 Aug 2009 10:53:43 -0000	1.14
@@ -24,15 +24,15 @@
         <div class="content-models" 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>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <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 class="no-number no-toc" id="meta.http-equiv.content-type-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#meta.http-equiv.content-type-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="meta.http-equiv.content-type.html#meta.http-equiv.content-type.attrs">meta.http-equiv.content-type.attrs</a> = <span class="pattern" id="meta.http-equiv.content-type.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.attrs.http-equiv.content-type" title="meta.http-equiv.attrs.http-equiv.content-type">http-equiv.content-type</a>
-  &amp; <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.attrs.content.content-type" title="meta.http-equiv.attrs.content.content-type">content.content-type</a></span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.attrs.http-equiv.content-type" title="meta.http-equiv.attrs.http-equiv.content-type">http-equiv.content-type</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.attrs.content.content-type" title="meta.http-equiv.attrs.content.content-type">content.content-type</a></span></p></div></div>
       <div class="no-number no-toc" id="meta.http-equiv.content-type-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#meta.http-equiv.content-type-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -77,16 +77,17 @@
         <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>
-  | <a class="ref" href="style.html#style-pattern">style</a>
-  | <a class="ref" href="meta.name.html#meta.name">meta.name</a>
-  | <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-  | <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-  | <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  | (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-     | <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
-  | <a class="ref" href="script.html#script">script</a>
-  | <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  | (<a class="ref" href="command.html#command">command</a>)</li></ul>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="style.html#style-pattern">style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>
+                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> notAllowed)</li></ul>
       </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.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- footer.html	2 Aug 2009 11:48:35 -0000	1.15
+++ footer.html	16 Aug 2009 10:53:42 -0000	1.16
@@ -22,8 +22,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="footer.html#footer.attrs">footer.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="footer.html#footer.attrs">footer.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="footer-attr-mdl">

Index: meta.http-equiv.content-language.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.content-language.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- meta.http-equiv.content-language.html	2 Aug 2009 07:07:44 -0000	1.6
+++ meta.http-equiv.content-language.html	16 Aug 2009 10:53:43 -0000	1.7
@@ -24,15 +24,15 @@
         <div class="content-models" 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>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <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 class="no-number no-toc" id="meta.http-equiv.content-language-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#meta.http-equiv.content-language-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="meta.http-equiv.content-language.html#meta.http-equiv.content-language.attrs">meta.http-equiv.content-language.attrs</a> = <span class="pattern" id="meta.http-equiv.content-language.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.attrs.http-equiv.content-language" title="meta.http-equiv.attrs.http-equiv.content-language">http-equiv.content-language</a>
-  &amp; <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.attrs.content.content-language" title="meta.http-equiv.attrs.content.content-language">content.content-language</a></span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.attrs.http-equiv.content-language" title="meta.http-equiv.attrs.http-equiv.content-language">http-equiv.content-language</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.attrs.content.content-language" title="meta.http-equiv.attrs.content.content-language">content.content-language</a></span></p></div></div>
       <div class="no-number no-toc" id="meta.http-equiv.content-language-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#meta.http-equiv.content-language-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -63,16 +63,17 @@
         <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>
-  | <a class="ref" href="style.html#style-pattern">style</a>
-  | <a class="ref" href="meta.name.html#meta.name">meta.name</a>
-  | <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-  | <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-  | <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  | (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-     | <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
-  | <a class="ref" href="script.html#script">script</a>
-  | <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  | (<a class="ref" href="command.html#command">command</a>)</li></ul>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="style.html#style-pattern">style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>
+                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> notAllowed)</li></ul>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: script.html
===================================================================
RCS file: /sources/public/html5/markup/script.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- script.html	2 Aug 2009 07:07:44 -0000	1.16
+++ script.html	16 Aug 2009 10:53:44 -0000	1.17
@@ -24,12 +24,12 @@
         <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="script.html#script.attrs.embedded" title="script.attrs.embedded">script.attrs.embedded</a>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="script.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>
       empty
-      &amp; <a class="ref" href="script.html#script.attrs.imported" title="script.attrs.imported">script.attrs.imported</a>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="script.html#script.attrs.imported" title="script.attrs.imported">script.attrs.imported</a>
     </span></dd>
         </dl>
       </div><div class="no-number no-toc" id="script-attr-mdl">
@@ -37,16 +37,16 @@
         <dl class="attr-content-models">
           <dt class="attr-content-model"><span class="attribute-pattern-name" id="script.attrs.embedded">script.attrs.embedded =
                 </span></dt><dd><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="script.html#script.attrs.type" title="script.attrs.type">type</a>?
-  &amp; <a class="ref" href="script.html#script.attrs.language" title="script.attrs.language">language</a>?</dd>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="script.html#script.attrs.type" title="script.attrs.type">type</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="script.html#script.attrs.language" title="script.attrs.language">language</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></dd>
           <dt class="attr-content-model"><span class="attribute-pattern-name" id="script.attrs.imported">script.attrs.imported =
                 </span></dt><dd><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="script.html#script.attrs.src" title="script.attrs.src">src</a>
-  &amp; <a class="ref" href="script.html#script.attrs.defer" title="script.attrs.defer">defer</a>?
-  &amp; <a class="ref" href="script.html#script.attrs.async" title="script.attrs.async">async</a>?
-  &amp; <a class="ref" href="script.html#script.attrs.type" title="script.attrs.type">type</a>?
-  &amp; <a class="ref" href="script.html#script.attrs.charset" title="script.attrs.charset">charset</a>?
-  &amp; <a class="ref" href="script.html#script.attrs.language" title="script.attrs.language">language</a>?</dd>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="script.html#script.attrs.src" title="script.attrs.src">src</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="script.html#script.attrs.defer" title="script.attrs.defer">defer</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="script.html#script.attrs.async" title="script.attrs.async">async</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="script.html#script.attrs.type" title="script.attrs.type">type</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="script.html#script.attrs.charset" title="script.attrs.charset">charset</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="script.html#script.attrs.language" title="script.attrs.language">language</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></dd>
         </dl></div>
       <div class="no-number no-toc" id="script-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#script-attributes">#</a></h2>
@@ -66,11 +66,17 @@
     </span> </dt>
             <dd>The address of the external script to use.</dd>
           
-            <dt><a class="attribute-name" id="script.attrs.defer" title="script.attrs.defer" href="script.html#script.attrs.defer">defer</a> = <span class="attr-values">  "defer" |  "" </span> </dt>
+            <dt><a class="attribute-name" id="script.attrs.defer" title="script.attrs.defer" href="script.html#script.attrs.defer">defer</a> = <span class="attr-values">
+       "defer"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
+    </span> </dt>
             <dd>Specifies that script should be executed after the
         document has been parsed.</dd>
           
-            <dt><a class="attribute-name" id="script.attrs.async" title="script.attrs.async" href="script.html#script.attrs.async">async</a> = <span class="attr-values">  "async" |  "" </span> </dt>
+            <dt><a class="attribute-name" id="script.attrs.async" title="script.attrs.async" href="script.html#script.attrs.async">async</a> = <span class="attr-values">
+       "async"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
+    </span> </dt>
             <dd>Specifies that the script should be executed
         asynchronously, as soon as it becomes available.</dd>
           
@@ -105,16 +111,17 @@
         <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>
-  | <a class="ref" href="style.html#style-pattern">style</a>
-  | <a class="ref" href="meta.name.html#meta.name">meta.name</a>
-  | <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-  | <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-  | <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  | (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-     | <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
-  | <a class="ref" href="script.html#script">script</a>
-  | <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  | (<a class="ref" href="command.html#command">command</a>)</li>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="style.html#style-pattern">style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>
+                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> notAllowed)</li>
         <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
       </div>
       

Index: input.range.html
===================================================================
RCS file: /sources/public/html5/markup/input.range.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- input.range.html	2 Aug 2009 07:07:43 -0000	1.11
+++ input.range.html	16 Aug 2009 10:53:43 -0000	1.12
@@ -31,17 +31,17 @@
         <h2 class="element-subhead">Attribute model <a class="hash" href="#input.range-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="input.range.html#input.range.attrs">input.range.attrs</a> = <span class="pattern" id="input.range.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-  &amp; <a class="ref" href="input.range.html#input.range.attrs.type" title="input.range.attrs.type">type</a>
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a>?
-  &amp; <a class="ref" href="input.range.html#input.range.attrs.min" title="input.range.attrs.min">min</a>?
-  &amp; <a class="ref" href="input.range.html#input.range.attrs.max" title="input.range.attrs.max">max</a>?
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a>?
-  &amp; <a class="ref" href="input.range.html#input.range.attrs.value" title="input.range.attrs.value">value</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.range.html#input.range.attrs.type" title="input.range.attrs.type">type</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.range.html#input.range.attrs.min" title="input.range.attrs.min">min</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.range.html#input.range.attrs.max" title="input.range.attrs.max">max</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.range.html#input.range.attrs.value" title="input.range.attrs.value">value</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="input.range-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#input.range-attributes">#</a></h2>
         <dl class="attr-defs">

Index: audio.html
===================================================================
RCS file: /sources/public/html5/markup/audio.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- audio.html	2 Aug 2009 07:07:42 -0000	1.16
+++ audio.html	16 Aug 2009 10:53:40 -0000	1.17
@@ -23,28 +23,28 @@
         <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>
-   | <a class="ref" href="source.html#source">source</a>*),
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="source.html#source">source</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)<a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="audio.html#audio.attrs">audio.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <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>
-   | <a class="ref" href="source.html#source">source</a>*),
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="source.html#source">source</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)<a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="audio.html#audio.attrs">audio.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="audio.html#audio.attrs">audio.attrs</a>
     </span></dd>
         </dl>
       </div><div class="no-number no-toc" id="audio-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#audio-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="audio.html#audio.attrs">audio.attrs</a> = <span class="pattern" id="audio.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="audio.html#audio.attrs.autoplay" title="audio.attrs.autoplay">autoplay</a>?
-  &amp; <a class="ref" href="audio.html#audio.attrs.autobuffer" title="audio.attrs.autobuffer">autobuffer</a>?
-  &amp; <a class="ref" href="audio.html#audio.attrs.controls" title="audio.attrs.controls">controls</a>?
-  &amp; <a class="ref" href="audio.html#audio.attrs.loop" title="audio.attrs.loop">loop</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="audio.html#audio.attrs.autoplay" title="audio.attrs.autoplay">autoplay</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="audio.html#audio.attrs.autobuffer" title="audio.attrs.autobuffer">autobuffer</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="audio.html#audio.attrs.controls" title="audio.attrs.controls">controls</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="audio.html#audio.attrs.loop" title="audio.attrs.loop">loop</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="audio-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#audio-attributes">#</a></h2>
         <dl class="attr-defs">

Index: time.html
===================================================================
RCS file: /sources/public/html5/markup/time.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- time.html	2 Aug 2009 07:07:45 -0000	1.13
+++ time.html	16 Aug 2009 10:53:45 -0000	1.14
@@ -22,15 +22,15 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="time.html#time.attrs">time.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="time.html#time.attrs">time.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="time-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#time-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="time.html#time.attrs">time.attrs</a> = <span class="pattern" id="time.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="time.html#time.attrs.datetime" title="time.attrs.datetime">datetime</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="time.html#time.attrs.datetime" title="time.attrs.datetime">datetime</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="time-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#time-attributes">#</a></h2>
         <dl class="attr-defs">

Index: meta.http-equiv.default-style.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.default-style.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- meta.http-equiv.default-style.html	2 Aug 2009 07:07:44 -0000	1.12
+++ meta.http-equiv.default-style.html	16 Aug 2009 10:53:43 -0000	1.13
@@ -24,15 +24,15 @@
         <div class="content-models" 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>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <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 class="no-number no-toc" id="meta.http-equiv.default-style-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#meta.http-equiv.default-style-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="meta.http-equiv.default-style.html#meta.http-equiv.default-style.attrs">meta.http-equiv.default-style.attrs</a> = <span class="pattern" id="meta.http-equiv.default-style.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.attrs.http-equiv.default-style" title="meta.http-equiv.attrs.http-equiv.default-style">http-equiv.default-style</a>
-  &amp; <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.attrs.content.default-style" title="meta.http-equiv.attrs.content.default-style">content.default-style</a></span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.attrs.http-equiv.default-style" title="meta.http-equiv.attrs.http-equiv.default-style">http-equiv.default-style</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.attrs.content.default-style" title="meta.http-equiv.attrs.content.default-style">content.default-style</a></span></p></div></div>
       <div class="no-number no-toc" id="meta.http-equiv.default-style-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#meta.http-equiv.default-style-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -72,20 +72,21 @@
         <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>
-  | <a class="ref" href="style.html#style-pattern">style</a>
-  | <a class="ref" href="meta.name.html#meta.name">meta.name</a>
-  | <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-  | <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-  | <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  | (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-     | <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
-  | <a class="ref" href="script.html#script">script</a>
-  | <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  | (<a class="ref" href="command.html#command">command</a>)</li>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="style.html#style-pattern">style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>
+                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> notAllowed)</li>
         <li class="context-mdl"><a href="noscript.html#noscript.elem.head">noscript.elem.head</a> = (<a class="ref" href="link.html#link">link</a>
-   | <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-   | <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-   | <a class="ref" href="style.html#style-pattern">style</a>)*</li></ul>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="style.html#style-pattern">style</a>)<a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a></li></ul>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: input.html
===================================================================
RCS file: /sources/public/html5/markup/input.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- input.html	20 Jul 2009 14:56:52 -0000	1.7
+++ input.html	16 Aug 2009 10:53:42 -0000	1.8
@@ -15,28 +15,28 @@
       <h2 class="element-head"><span class="element">input</span> <a class="hash" href="#input">#</a> <a class="toc-bak" href="Overview.html#input-toc">T</a></h2>
       <div>
       <dl><dt class="content-model"><span class="element-pattern-name" id="input"><a href="input.html#input"><span class="element">input</span></a> = </span></dt><dd class="elem-mdl"><a class="ref" href="input.text.html#input.text">input.text</a>
-  | <a class="ref" href="input.password.html#input.password">input.password</a>
-  | <a class="ref" href="input.checkbox.html#input.checkbox">input.checkbox</a>
-  | <a class="ref" href="input.radio.html#input.radio">input.radio</a>
-  | <a class="ref" href="input.button.html#input.button">input.button</a>
-  | <a class="ref" href="input.submit.html#input.submit">input.submit</a>
-  | <a class="ref" href="input.reset.html#input.reset">input.reset</a>
-  | <a class="ref" href="input.file.html#input.file">input.file</a>
-  | <a class="ref" href="input.hidden.html#input.hidden">input.hidden</a>
-  | <a class="ref" href="input.image.html#input.image">input.image</a>
-  | <a class="ref" href="input.datetime.html#input.datetime">input.datetime</a>
-  | <a class="ref" href="input.datetime-local.html#input.datetime-local">input.datetime-local</a>
-  | <a class="ref" href="input.date.html#input.date">input.date</a>
-  | <a class="ref" href="input.month.html#input.month">input.month</a>
-  | <a class="ref" href="input.time.html#input.time">input.time</a>
-  | <a class="ref" href="input.week.html#input.week">input.week</a>
-  | <a class="ref" href="input.number.html#input.number">input.number</a>
-  | <a class="ref" href="input.range.html#input.range">input.range</a>
-  | <a class="ref" href="input.email.html#input.email">input.email</a>
-  | <a class="ref" href="input.url.html#input.url">input.url</a>
-  | <a class="ref" href="input.search.html#input.search">input.search</a>
-  | <a class="ref" href="input.tel.html#input.tel">input.tel</a>
-  | <a class="ref" href="input.color.html#input.color">input.color</a></dd></dl>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="input.password.html#input.password">input.password</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="input.checkbox.html#input.checkbox">input.checkbox</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="input.radio.html#input.radio">input.radio</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="input.button.html#input.button">input.button</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="input.submit.html#input.submit">input.submit</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="input.reset.html#input.reset">input.reset</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="input.file.html#input.file">input.file</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="input.hidden.html#input.hidden">input.hidden</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="input.image.html#input.image">input.image</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="input.datetime.html#input.datetime">input.datetime</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="input.datetime-local.html#input.datetime-local">input.datetime-local</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="input.date.html#input.date">input.date</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="input.month.html#input.month">input.month</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="input.time.html#input.time">input.time</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="input.week.html#input.week">input.week</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="input.number.html#input.number">input.number</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="input.range.html#input.range">input.range</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="input.email.html#input.email">input.email</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="input.url.html#input.url">input.url</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="input.search.html#input.search">input.search</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="input.tel.html#input.tel">input.tel</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="input.color.html#input.color">input.color</a></dd></dl>
       <p>An <span class="element">input</span> element with
                 no <span class="attribute">type</span> attribute
                 specified represents the same thing as a <a href="input.text.html#input.text">input element with its type

Index: command.html
===================================================================
RCS file: /sources/public/html5/markup/command.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- command.html	20 Jul 2009 14:56:50 -0000	1.6
+++ command.html	16 Aug 2009 10:53:41 -0000	1.7
@@ -15,8 +15,8 @@
       <h2 class="element-head"><span class="element">command</span> <a class="hash" href="#command">#</a> <a class="toc-bak" href="Overview.html#command-toc">T</a></h2>
       <div>
       <dl><dt class="content-model"><span class="element-pattern-name" id="command"><a href="command.html#command"><span class="element">command</span></a> = </span></dt><dd class="elem-mdl"><a class="ref" href="command.command.html#command.command">command.command</a>
-  | <a class="ref" href="command.radio.html#command.radio">command.radio</a>
-  | <a class="ref" href="command.checkbox.html#command.checkbox">command.checkbox</a></dd></dl>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="command.radio.html#command.radio">command.radio</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="command.checkbox.html#command.checkbox">command.checkbox</a></dd></dl>
       <p>A <span class="element">command</span> element with
                 no <span class="attribute">type</span> attribute
                 specified represents the same thing as a <a href="command.command.html#command.command">command element with its type

Index: keygen.html
===================================================================
RCS file: /sources/public/html5/markup/keygen.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- keygen.html	2 Aug 2009 07:07:44 -0000	1.13
+++ keygen.html	16 Aug 2009 10:53:43 -0000	1.14
@@ -22,19 +22,20 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#keygen-content">#</a></h2>
         <div class="content-models" 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>
+      empty
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="keygen.html#keygen.attrs">keygen.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="keygen-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#keygen-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="keygen.html#keygen.attrs">keygen.attrs</a> = <span class="pattern" id="keygen.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="keygen.html#keygen.attrs.challenge" title="keygen.attrs.challenge">challenge</a>?
-  &amp; <a class="ref" href="keygen.html#keygen.attrs.keytype" title="keygen.attrs.keytype">keytype</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>??</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="keygen.html#keygen.attrs.challenge" title="keygen.attrs.challenge">challenge</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="keygen.html#keygen.attrs.keytype" title="keygen.attrs.keytype">keytype</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="keygen-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#keygen-attributes">#</a></h2>
         <dl class="attr-defs">

Index: command.command.html
===================================================================
RCS file: /sources/public/html5/markup/command.command.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- command.command.html	2 Aug 2009 07:07:42 -0000	1.12
+++ command.command.html	16 Aug 2009 10:53:41 -0000	1.13
@@ -24,17 +24,17 @@
         <div class="content-models" 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>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="command.command.html#command.command.attrs">command.command.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="command.command-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#command.command-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="command.command.html#command.command.attrs">command.command.attrs</a> = <span class="pattern" id="command.command.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="command.command.html#command.command.attrs.type" title="command.command.attrs.type">type</a>?
-  &amp; <a class="ref" href="command.command.html#command.command.attrs.label" title="command.command.attrs.label">label</a>?
-  &amp; <a class="ref" href="command.command.html#command.command.attrs.icon" title="command.command.attrs.icon">icon</a>?
-  &amp; <a class="ref" href="command.command.html#command.command.attrs.disabled" title="command.command.attrs.disabled">disabled</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="command.command.html#command.command.attrs.type" title="command.command.attrs.type">type</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="command.command.html#command.command.attrs.label" title="command.command.attrs.label">label</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="command.command.html#command.command.attrs.icon" title="command.command.attrs.icon">icon</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="command.command.html#command.command.attrs.disabled" title="command.command.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="command.command-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#command.command-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -50,7 +50,10 @@
     </span> </dt>
             <dd>A URL for an image that represents the command.</dd>
           
-            <dt><a class="attribute-name" id="command.command.attrs.disabled" title="command.command.attrs.disabled" href="command.command.html#command.command.attrs.disabled">disabled</a> = <span class="attr-values">  "disabled" |  "" </span> </dt>
+            <dt><a class="attribute-name" id="command.command.attrs.disabled" title="command.command.attrs.disabled" href="command.command.html#command.command.attrs.disabled">disabled</a> = <span class="attr-values">
+       "disabled"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
+    </span> </dt>
             <dd>Specifies that the command is not currently
         available.</dd>
           
@@ -69,16 +72,17 @@
         <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>
-  | <a class="ref" href="style.html#style-pattern">style</a>
-  | <a class="ref" href="meta.name.html#meta.name">meta.name</a>
-  | <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-  | <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-  | <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  | (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-     | <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
-  | <a class="ref" href="script.html#script">script</a>
-  | <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  | (<a class="ref" href="command.html#command">command</a>)</li>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="style.html#style-pattern">style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>
+                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> notAllowed)</li>
         <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
       </div>
       </div>

Index: progress.html
===================================================================
RCS file: /sources/public/html5/markup/progress.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- progress.html	2 Aug 2009 07:07:44 -0000	1.14
+++ progress.html	16 Aug 2009 10:53:44 -0000	1.15
@@ -22,16 +22,16 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="progress.html#progress.attrs">progress.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="progress.html#progress.attrs">progress.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="progress-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#progress-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="progress.html#progress.attrs">progress.attrs</a> = <span class="pattern" id="progress.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="progress.html#progress.attrs.value" title="progress.attrs.value">value</a>?
-  &amp; <a class="ref" href="progress.html#progress.attrs.max" title="progress.attrs.max">max</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="progress.html#progress.attrs.value" title="progress.attrs.value">value</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="progress.html#progress.attrs.max" title="progress.attrs.max">max</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="progress-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#progress-attributes">#</a></h2>
         <dl class="attr-defs">

Index: dfn.html
===================================================================
RCS file: /sources/public/html5/markup/dfn.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- dfn.html	29 Jul 2009 11:23:43 -0000	1.12
+++ dfn.html	16 Aug 2009 10:53:41 -0000	1.13
@@ -22,8 +22,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="dfn.html#dfn.attrs">dfn.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="dfn.html#dfn.attrs">dfn.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="dfn-attr-mdl">

Index: intro.html
===================================================================
RCS file: /sources/public/html5/markup/intro.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- intro.html	6 Aug 2009 10:34:35 -0000	1.10
+++ intro.html	16 Aug 2009 10:53:43 -0000	1.11
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>HTML5: Introduction and Scope</title>
+<title>HTML5: Introduction</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="W3C-ED.css" type="text/css"></link>
 </head>
@@ -9,63 +9,40 @@
 <h2 class="chunkpagetitle"><a href="Overview.html">HTML5: The Markup Language</a></h2>
 <div class="nav">
 
-<span class="nav-next"><a href="conformance.html">conformance &#187;</a></span>
+<span class="nav-next"><a href="terminology.html">terminology &#187;</a></span>
 </div>
 <div id="intro" class="section">
-  <h2>1. Introduction and Scope <a class="hash" href="#intro">#</a> <a class="toc-bak" href="Overview.html#intro-toc">T</a></h2>
-  <p>This section primarily describes the scope of this
-  specification. In describing the scope, this section
-  relies on making a distinction between the following
-  two major classes:</p>
-  <dl>
-    <dt><dfn id="html-producer" title="html-producer">HTML producers</dfn></dt>
-    <dd>HTML authors (that is, people) and applications
-    (such as editors and content management systems)
-    that produce HTML content.</dd>
-    <dt><dfn id="html-consumer" title="html-consumer">HTML consumers</dfn></dt>
-    <dd>HTML user agents; that is, applications (such as
-    Web browsers) which consume HTML content</dd>
-  </dl>
-  <div id="scope" class="section">
-    <h2>1.01. Scope <a class="hash" href="#scope">#</a> <a class="toc-bak" href="Overview.html#scope-toc">T</a></h2>
-    <p>This specification limits its scope to providing
-    the details necessary for HTML producers to create
-    <a href="documents.html#conformant-documents">conformant documents</a>.
-    It is designed:</p>
-    <ul>
-      <li>to describe the syntax, structure, and
-      semantics of the HTML language</li>
-      <li>to be clear and unambiguous</li>
-      <li>to be as concise and readable as possible</li>
-      <li>&#8230;</li>
-    </ul>
-  </div>
-  <div id="out-of-scope" class="section">
-    <h2>1.02. Out of scope <a class="hash" href="#out-of-scope">#</a> <a class="toc-bak" href="Overview.html#out-of-scope-toc">T</a></h2>
-    <p>This specification, by design:</p>
-    <ul>
-      <li>does not provide any conformance
-      criteria for HTML consumers; in particular, it
-      does not attempt to define how Web browsers and
-      other user agents process documents</li>
-      <li>does not define any APIs related to processing
-      of HTML content by HTML consumers.</li>
-      <li>does not attempt to be a tutorial or &#8220;how
-      to&#8221; authoring guide</li>
-    </ul>
-  </div>
-  <div id="audience" class="section">
-    <h2>1.03. Intended audience <a class="hash" href="#audience">#</a> <a class="toc-bak" href="Overview.html#audience-toc">T</a></h2>
-    <p>This specification is intended for producers of documents
-    intended to conform to the requirements it describes, and
-    individuals wishing to establish the correctness of documents
-    with respect to the requirements it describes.</p>
-  </div>
+  <h2>1. Introduction <a class="hash" href="#intro">#</a> <a class="toc-bak" href="Overview.html#intro-toc">T</a></h2>
+  <p>This specification provides the details necessary for
+  <a href="terminology.html#html-producer">producers of HTML content</a>
+  to create
+  <a href="documents.html#conformant-documents">conformant documents</a>,
+  and for others to check the conformance of existing documents.
+  It is designed:</p>
+  <ul>
+    <li>to describe the syntax, structure, and semantics of the
+    <a href="documents.html#html-language">HTML language</a></li>
+    <li>to be clear and unambiguous</li>
+    <li>to be as concise and readable as possible</li>
+  </ul>
+  <p>Certain purposes are intentionally out of scope for this
+  specification; in particular, it:</p>
+  <ul>
+    <li>does not provide any conformance criteria for
+    <a href="terminology.html#html-consumer">HTML consumers</a>;
+    in particular, it does not attempt to define how Web browsers
+    and other user agents process documents</li>
+    <li>does not define any APIs related to processing of HTML
+    content by
+    <a href="terminology.html#html-consumer">HTML consumers</a>.</li>
+    <li>does not attempt to be a tutorial or &#8220;how to&#8221; authoring
+    guide</li>
+  </ul>
 </div>
 <hr class="footerbreak"></hr>
 <div class="nav">
 
-<span class="nav-next"><a href="conformance.html">conformance &#187;</a></span>
+<span class="nav-next"><a href="terminology.html">terminology &#187;</a></span>
 </div>
 </body>
 </html>

Index: textarea.html
===================================================================
RCS file: /sources/public/html5/markup/textarea.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- textarea.html	2 Aug 2009 11:48:35 -0000	1.15
+++ textarea.html	16 Aug 2009 10:53:45 -0000	1.16
@@ -23,26 +23,26 @@
         <div class="content-models" 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>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="textarea.html#textarea.attrs">textarea.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="textarea-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#textarea-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="textarea.html#textarea.attrs">textarea.attrs</a> = <span class="pattern" id="textarea.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-   &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-   &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a>?)
-  &amp; (<a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a>?
-         &amp; <a class="ref" href="textarea.html#textarea.attrs.rows" title="textarea.attrs.rows">rows</a>?
-         &amp; ((<a class="ref" href="textarea.html#textarea.attrs.wrap.hard" title="textarea.attrs.wrap.hard">wrap.hard</a>
-                 &amp; <a class="ref" href="textarea.html#textarea.attrs.cols" title="textarea.attrs.cols">cols</a>)
-                | (<a class="ref" href="textarea.html#textarea.attrs.wrap.soft" title="textarea.attrs.wrap.soft">wrap.soft</a>?
-                   &amp; <a class="ref" href="textarea.html#textarea.attrs.cols" title="textarea.attrs.cols">cols</a>?)))</span></p></div></div>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> (<a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="textarea.html#textarea.attrs.rows" title="textarea.attrs.rows">rows</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> ((<a class="ref" href="textarea.html#textarea.attrs.wrap.hard" title="textarea.attrs.wrap.hard">wrap.hard</a>
+                                                                                                                                                                             <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="textarea.html#textarea.attrs.cols" title="textarea.attrs.cols">cols</a>)
+                                                                                                                                                                            <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="textarea.html#textarea.attrs.wrap.soft" title="textarea.attrs.wrap.soft">wrap.soft</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                                                                                                                                                                                 <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="textarea.html#textarea.attrs.cols" title="textarea.attrs.cols">cols</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)))</span></p></div></div>
       <div class="no-number no-toc" id="textarea-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#textarea-attributes">#</a></h2>
         <dl class="attr-defs">

Index: cite.html
===================================================================
RCS file: /sources/public/html5/markup/cite.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- cite.html	29 Jul 2009 11:23:42 -0000	1.13
+++ cite.html	16 Aug 2009 10:53:41 -0000	1.14
@@ -24,8 +24,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="cite.html#cite.attrs">cite.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="cite.html#cite.attrs">cite.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="cite-attr-mdl">

Index: meter.html
===================================================================
RCS file: /sources/public/html5/markup/meter.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- meter.html	2 Aug 2009 07:07:44 -0000	1.15
+++ meter.html	16 Aug 2009 10:53:43 -0000	1.16
@@ -23,20 +23,20 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="meter.html#meter.attrs">meter.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="meter.html#meter.attrs">meter.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="meter-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#meter-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="meter.html#meter.attrs">meter.attrs</a> = <span class="pattern" id="meter.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="meter.html#meter.attrs.value" title="meter.attrs.value">value</a>?
-  &amp; <a class="ref" href="meter.html#meter.attrs.min" title="meter.attrs.min">min</a>?
-  &amp; <a class="ref" href="meter.html#meter.attrs.low" title="meter.attrs.low">low</a>?
-  &amp; <a class="ref" href="meter.html#meter.attrs.high" title="meter.attrs.high">high</a>?
-  &amp; <a class="ref" href="meter.html#meter.attrs.max" title="meter.attrs.max">max</a>?
-  &amp; <a class="ref" href="meter.html#meter.attrs.optimum" title="meter.attrs.optimum">optimum</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="meter.html#meter.attrs.value" title="meter.attrs.value">value</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="meter.html#meter.attrs.min" title="meter.attrs.min">min</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="meter.html#meter.attrs.low" title="meter.attrs.low">low</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="meter.html#meter.attrs.high" title="meter.attrs.high">high</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="meter.html#meter.attrs.max" title="meter.attrs.max">max</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="meter.html#meter.attrs.optimum" title="meter.attrs.optimum">optimum</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="meter-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#meter-attributes">#</a></h2>
         <dl class="attr-defs">

Index: input.button.html
===================================================================
RCS file: /sources/public/html5/markup/input.button.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- input.button.html	2 Aug 2009 07:07:43 -0000	1.12
+++ input.button.html	16 Aug 2009 10:53:42 -0000	1.13
@@ -30,12 +30,12 @@
         <h2 class="element-subhead">Attribute model <a class="hash" href="#input.button-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="input.button.html#input.button.attrs">input.button.attrs</a> = <span class="pattern" id="input.button.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-   &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-   &amp; <a class="ref" href="input.button.html#input.button.attrs.type" title="input.button.attrs.type">type</a>
-   &amp; <a class="ref" href="input.button.html#input.button.attrs.value" title="input.button.attrs.value">value</a>?)
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?</span></p></div></div>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.button.html#input.button.attrs.type" title="input.button.attrs.type">type</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.button.html#input.button.attrs.value" title="input.button.attrs.value">value</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="input.button-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#input.button-attributes">#</a></h2>
         <dl class="attr-defs">

Index: aside.html
===================================================================
RCS file: /sources/public/html5/markup/aside.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- aside.html	2 Aug 2009 11:48:34 -0000	1.15
+++ aside.html	16 Aug 2009 10:53:40 -0000	1.16
@@ -22,10 +22,10 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#aside-content">#</a></h2>
         <div class="content-models" 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>*,
+      <a class="ref" href="style.html#style-pattern">style</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="aside.html#aside.attrs">aside.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="aside.html#aside.attrs">aside.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="aside-attr-mdl">

Index: syntax.html
===================================================================
RCS file: /sources/public/html5/markup/syntax.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- syntax.html	8 Aug 2009 14:02:58 -0000	1.26
+++ syntax.html	16 Aug 2009 10:53:45 -0000	1.27
@@ -12,7 +12,19 @@
 <span class="nav-next"><a href="elements.html">elements &#187;</a></span>
 </div>
 <div id="syntax" class="section">
-  <h2>6. HTML syntax <a class="hash" href="#syntax">#</a> <a class="toc-bak" href="Overview.html#syntax-toc">T</a></h2>
+  <h2>4. HTML syntax <a class="hash" href="#syntax">#</a> <a class="toc-bak" href="Overview.html#syntax-toc">T</a></h2>
+  <p>This section describes the
+  <a href="documents.html#html-syntax">the HTML syntax</a>
+  in detail. In places, it also notes differences between the
+  <a href="documents.html#html-syntax">the HTML syntax</a>
+  and
+  <a href="documents.html#xml-syntax">the XML syntax</a>,
+  but it does not describe the XML syntax in detail (the XML
+  syntax is instead defined by rules in the XML specification
+  <a href="references.html#refsXML">[XML]</a>
+  and in the Namespaces in XML 1.0 specification
+  <a href="references.html#refsXML">[XMLNS]</a>).</p>
+  <p>This section is divided into the following parts:</p>
   <div class="toc">
 <ul>
 <li id="doctype-syntax-toc"><span class="toc-section-number">&#8199;</span><a href="syntax.html#doctype-syntax"><span class="toc-section-number">1.</span> The doctype</a>
@@ -38,7 +50,7 @@
 </ul>
 </div>
   <div id="doctype-syntax" class="section">
-    <h2>6.01. The doctype <a class="hash" href="#doctype-syntax">#</a> <a class="toc-bak" href="Overview.html#doctype-syntax-toc">T</a></h2>
+    <h2>4.01. The doctype <a class="hash" href="#doctype-syntax">#</a> <a class="toc-bak" href="Overview.html#doctype-syntax-toc">T</a></h2>
     <p>A
     <dfn id="doctype" title="doctype">doctype</dfn>
     (sometimes capitalized as &#8220;DOCTYPE&#8221;) is an special instruction
@@ -57,14 +69,14 @@
       "<code title="U+0021 EXCLAMATION MARK">!</code>"
       character.</li>
       <li>Any
-      <a href="terminology.html#ascii-case-insensitive">ASCII case-insensitive</a>
-      match for the string
+      <a href="terminology.html#case-insensitive">case-insensitive match</a>
+      for the string
       "<code>DOCTYPE</code>".</li>
       <li>One or more
       <a href="terminology.html#space">space characters</a>.</li>
       <li>Any
-      <a href="terminology.html#ascii-case-insensitive">ASCII case-insensitive</a>
-      match for the string
+      <a href="terminology.html#case-insensitive">case-insensitive match</a>
+      for the string
       "<code>HTML</code>".</li>
       <li>Optionally, a
       <a href="syntax.html#doctype-legacy-string">doctype legacy string</a>.</li>
@@ -82,8 +94,8 @@
       <li>One or more
       <a href="terminology.html#space">space characters</a>.</li>
       <li>Any
-      <a href="terminology.html#ascii-case-insensitive">ASCII case-insensitive</a>
-      match for the string
+      <a href="terminology.html#case-insensitive">case-insensitive match</a>
+      for the string
       "<code>SYSTEM</code>".</li>
       <li>One or more
       <a href="terminology.html#space">space characters</a></li>
@@ -119,9 +131,9 @@
     <ul>
       <li>The
       <a href="syntax.html#doctype-declaration">document type declaration&#8217;s</a>
-      name part is an
-      <a href="terminology.html#ascii-case-insensitive">ASCII case-insensitive</a>
-      match for the string
+      name part is a
+      <a href="terminology.html#case-insensitive">case-insensitive match</a>
+      for the string
       "<code>HTML</code>",
       its public identifier is an exact match for the literal string
       "<code>-//W3C//DTD HTML 4.0//EN</code>",
@@ -130,9 +142,9 @@
       "<code>http://www.w3.org/TR/REC-html40/strict.dtd</code>".</li>
       <li>The
       <a href="syntax.html#doctype-declaration">document type declaration&#8217;s</a>
-      name part is an
-      <a href="terminology.html#ascii-case-insensitive">ASCII case-insensitive</a>
-      match for the string
+      name part is a
+      <a href="terminology.html#case-insensitive">case-insensitive match</a>
+      for the string
       "<code>HTML</code>",
       its public identifier is an exact match for the literal string
       "<code>-//W3C//DTD HTML 4.01//EN</code>",
@@ -141,9 +153,9 @@
       "<code>http://www.w3.org/TR/html4/strict.dtd</code>".</li>
       <li>The
       <a href="syntax.html#doctype-declaration">document type declaration&#8217;s</a>
-      name part is an
-      <a href="terminology.html#ascii-case-insensitive">ASCII case-insensitive</a>
-      match for the string
+      name part is a
+      <a href="terminology.html#case-insensitive">case-insensitive match</a>
+      for the string
       "<code>HTML</code>",
       its public identifier is an exact match for the literal string
       "<code>-//W3C//DTD XHTML 1.0 Strict//EN</code>",
@@ -152,9 +164,9 @@
       "<code>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</code>".</li>
       <li>The
       <a href="syntax.html#doctype-declaration">document type declaration&#8217;s</a>
-      name part is an
-      <a href="terminology.html#ascii-case-insensitive">ASCII case-insensitive</a>
-      match for the string
+      name part is a
+      <a href="terminology.html#case-insensitive">case-insensitive match</a>
+      for the string
       "<code>HTML</code>",
       its public identifier is an exact match for the literal string
       "<code>-//W3C//DTD XHTML 1.1//EN</code>",
@@ -172,7 +184,7 @@
     </div>
   </div>
   <div id="character-encoding" class="section">
-    <h2>6.02. Character encoding declaration <a class="hash" href="#character-encoding">#</a> <a class="toc-bak" href="Overview.html#character-encoding-toc">T</a></h2>
+    <h2>4.02. Character encoding declaration <a class="hash" href="#character-encoding">#</a> <a class="toc-bak" href="Overview.html#character-encoding-toc">T</a></h2>
     <p>A
     <dfn id="encoding-declaration" title="encoding-declaration">character encoding declaration</dfn>
     is a mechanism for specifying the character encoding used to store
@@ -241,7 +253,7 @@
     necessary.</p>
   </div>
   <div id="syntax-elements" class="section">
-    <h2>6.03. Elements <a class="hash" href="#syntax-elements">#</a> <a class="toc-bak" href="Overview.html#syntax-elements-toc">T</a></h2>
+    <h2>4.03. Elements <a class="hash" href="#syntax-elements">#</a> <a class="toc-bak" href="Overview.html#syntax-elements-toc">T</a></h2>
     <p>An element&#8217;s
     <dfn id="content-model" title="content-model">content model</dfn>
     defines the element&#8217;s structure: What
@@ -379,7 +391,7 @@
         implied in certain cases</a>).</li>
     </ul>
     <div id="misnesting" class="section">
-      <h2>6.3.01. Misnested tags <a class="hash" href="#misnesting">#</a></h2>
+      <h2>4.3.01. Misnested tags <a class="hash" href="#misnesting">#</a></h2>
       <p>If an
       <a href="syntax.html#syntax-elements">element</a>
       has both a
@@ -416,7 +428,7 @@
     </div>
   </div>
     <div id="syntax-attributes" class="section">
-      <h2>6.04. Attributes <a class="hash" href="#syntax-attributes">#</a> <a class="toc-bak" href="Overview.html#syntax-attributes-toc">T</a></h2>
+      <h2>4.04. Attributes <a class="hash" href="#syntax-attributes">#</a> <a class="toc-bak" href="Overview.html#syntax-attributes-toc">T</a></h2>
       <p>
       <dfn id="attribute" title="syntax-attributes">Attributes</dfn>
       for an element are expressed inside the element&#8217;s start
@@ -425,9 +437,9 @@
       and a
       <a href="syntax.html#syntax-attribute-value">value</a>.</p>
       <p>There must never be two or more attributes on the same
-      start tag whose names are an
-      <a href="terminology.html#ascii-case-insensitive">ASCII case-insensitive</a>
-      match for each other.</p>
+      start tag whose names are a
+      <a href="terminology.html#case-insensitive">case-insensitive match</a>
+      for each other.</p>
       <p id="elements-xml-syntax">The following list describes syntax
         rules for attributes in 
         <a href="documents.html#syntax-document-html">documents in the HTML syntax</a>.
@@ -454,9 +466,9 @@
       the XML specification <a href="references.html#refsXML">[XML]</a>
       and that contain no
       "<code title="U+003A COLON">:</code>"
-      characters, and whose first three characters are not an
-      <a href="terminology.html#ascii-case-insensitive">ASCII case-insensitive</a>
-      match for the string "<code>xml</code>".</li>
+      characters, and whose first three characters are not a
+      <a href="terminology.html#case-insensitive">case-insensitive match</a>
+      for the string "<code>xml</code>".</li>
       <li>
       <dfn id="syntax-attribute-value">Attribute values</dfn>, in
       general, are
@@ -624,7 +636,7 @@
       </dl>
     </div>
   <div id="text-syntax" class="section">
-    <h2>6.05. Text and character data <a class="hash" href="#text-syntax">#</a> <a class="toc-bak" href="Overview.html#text-syntax-toc">T</a></h2>
+    <h2>4.05. Text and character data <a class="hash" href="#text-syntax">#</a> <a class="toc-bak" href="Overview.html#text-syntax-toc">T</a></h2>
     <p><dfn id="syntax-text" title="syntax-text">Text</dfn>
     in
       <a href="syntax.html#contents">element contents</a>
@@ -702,10 +714,10 @@
           <a href="syntax.html#syntax-ambiguous-ampersand">ambiguous ampersands</a></li>
           <li>must not contain any occurrences of the string
           "<code title="U+003C LESS-THAN SIGN, U+002F SOLIDUS">&lt;/</code>"
-          followed by characters that
-          case-insensitively match the tag name of the
-          element containing the replaceable character data
-          (for example,
+          followed by characters that are a
+          <a href="terminology.html#case-insensitive">case-insensitive match</a>
+          for the tag name of the element containing the
+          replaceable character data (for example,
           "<code>&lt;/title</code>" or
           "<code>&lt;/textarea</code>"),
           followed by one of
@@ -754,9 +766,10 @@
           <li>must not contain <a href="syntax.html#syntax-charref">character references</a></li>
           <li>must not contain any occurrences of the string
           "<code title="U+003C LESS-THAN SIGN, U+002F SOLIDUS">&lt;/</code>",
-          followed by characters that case-insensitively match the
-          tag name of the element containing the replaceable
-          character data (for example,
+          followed by characters that are a
+          <a href="terminology.html#case-insensitive">case-insensitive match</a>
+          for the tag name of the element containing the
+          replaceable character data (for example,
           "<code>&lt;/script</code>"
           or
           "<code>&lt;/style</code>",
@@ -785,7 +798,7 @@
     </dl>
   </div>
   <div id="character-references" class="section">
-    <h2>6.06. Character references <a class="hash" href="#character-references">#</a> <a class="toc-bak" href="Overview.html#character-references-toc">T</a></h2>
+    <h2>4.06. Character references <a class="hash" href="#character-references">#</a> <a class="toc-bak" href="Overview.html#character-references-toc">T</a></h2>
     <p><dfn id="syntax-charref">Character references</dfn> are a form
     of markup for representing single individual characters. There
     are three types of character references:</p>
@@ -909,7 +922,7 @@
     character.</p>
   </div>
   <div id="comments" class="section">
-    <h2>6.07. Comments <a class="hash" href="#comments">#</a> <a class="toc-bak" href="Overview.html#comments-toc">T</a></h2>
+    <h2>4.07. Comments <a class="hash" href="#comments">#</a> <a class="toc-bak" href="Overview.html#comments-toc">T</a></h2>
     <p>
     <dfn id="syntax-comments" title="syntax-comments">Comments</dfn>
     consist of the following parts, in exactly the following
@@ -943,7 +956,7 @@
     </div>
   </div>
   <div id="escaping-text-span" class="section">
-    <h2>6.08. Escaping text spans <a class="hash" href="#escaping-text-span">#</a> <a class="toc-bak" href="Overview.html#escaping-text-span-toc">T</a></h2>
+    <h2>4.08. Escaping text spans <a class="hash" href="#escaping-text-span">#</a> <a class="toc-bak" href="Overview.html#escaping-text-span-toc">T</a></h2>
     <p>An
       <dfn id="syntax-escape">escaping text span</dfn>
       is a span of
@@ -1027,7 +1040,7 @@
     </div>
  </div>
  <div id="svg-mathml" class="section">
-   <h2>6.09. SVG and MathML elements in HTML documents <a class="hash" href="#svg-mathml">#</a> <a class="toc-bak" href="Overview.html#svg-mathml-toc">T</a></h2>
+   <h2>4.09. SVG and MathML elements in HTML documents <a class="hash" href="#svg-mathml">#</a> <a class="toc-bak" href="Overview.html#svg-mathml-toc">T</a></h2>
    <p id="elements-svg-mathml">
    <dfn id="svg-mathml-elements" title="svg-mathml-elements">SVG and MathML elements</dfn>
    are elements from the SVG and MathML namespaces.
@@ -1077,7 +1090,7 @@
    </ul>
  </div>
  <div id="cdata-sections" class="section">
-   <h2>6.10. CDATA sections in SVG and MathML contents <a class="hash" href="#cdata-sections">#</a> <a class="toc-bak" href="Overview.html#cdata-sections-toc">T</a></h2>
+   <h2>4.10. CDATA sections in SVG and MathML contents <a class="hash" href="#cdata-sections">#</a> <a class="toc-bak" href="Overview.html#cdata-sections-toc">T</a></h2>
    <p>
    <dfn id="syntax-cdata-sections" title="syntax-cdata-sections">CDATA sections in SVG and MathML contents</dfn>
    in 

Index: section.html
===================================================================
RCS file: /sources/public/html5/markup/section.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- section.html	2 Aug 2009 07:07:45 -0000	1.17
+++ section.html	16 Aug 2009 10:53:44 -0000	1.18
@@ -22,17 +22,17 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#section-content">#</a></h2>
         <div class="content-models" 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>*,
+      <a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="section.html#section.attrs">section.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="section.html#section.attrs">section.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="section-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#section-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="section.html#section.attrs">section.attrs</a> = <span class="pattern" id="section.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="section.html#section.attrs.cite" title="section.attrs.cite">cite</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="section.html#section.attrs.cite" title="section.attrs.cite">cite</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="section-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#section-attributes">#</a></h2>
         <dl class="attr-defs">

Index: link.html
===================================================================
RCS file: /sources/public/html5/markup/link.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- link.html	2 Aug 2009 07:07:44 -0000	1.12
+++ link.html	16 Aug 2009 10:53:43 -0000	1.13
@@ -23,19 +23,20 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#link-content">#</a></h2>
         <div class="content-models" 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>
+      empty
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="link.html#link.attrs">link.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="link-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#link-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="link.html#link.attrs">link.attrs</a> = <span class="pattern" id="link.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="link.html#link.attrs.href" title="link.attrs.href">href</a>
-  &amp; <a class="ref" href="link.html#link.attrs.rel" title="link.attrs.rel">rel</a>
-  &amp; <a class="ref" href="link.html#link.attrs.hreflang" title="link.attrs.hreflang">hreflang</a>?
-  &amp; <a class="ref" href="link.html#link.attrs.media" title="link.attrs.media">media</a>?
-  &amp; <a class="ref" href="link.html#link.attrs.type" title="link.attrs.type">type</a>?
-  &amp; <a class="ref" href="link.html#link.attrs.sizes" title="link.attrs.sizes">sizes</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="link.html#link.attrs.href" title="link.attrs.href">href</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="link.html#link.attrs.rel" title="link.attrs.rel">rel</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="link.html#link.attrs.hreflang" title="link.attrs.hreflang">hreflang</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="link.html#link.attrs.media" title="link.attrs.media">media</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="link.html#link.attrs.type" title="link.attrs.type">type</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="link.html#link.attrs.sizes" title="link.attrs.sizes">sizes</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="link-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#link-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -75,7 +76,7 @@
           
             <dt><a class="attribute-name" id="link.attrs.sizes" title="link.attrs.sizes" href="link.html#link.attrs.sizes">sizes</a> = <span class="attr-values">
        "any"
-      | <a class="ref" href="datatypes.html#common.data.sizes" title="common.data.sizes">sizes</a>
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="datatypes.html#common.data.sizes" title="common.data.sizes">sizes</a>
     </span> </dt>
             <dd>The sizes of icons for visual media.</dd>
           
@@ -94,20 +95,21 @@
         <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>
-  | <a class="ref" href="style.html#style-pattern">style</a>
-  | <a class="ref" href="meta.name.html#meta.name">meta.name</a>
-  | <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-  | <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-  | <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  | (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-     | <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
-  | <a class="ref" href="script.html#script">script</a>
-  | <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  | (<a class="ref" href="command.html#command">command</a>)</li>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="style.html#style-pattern">style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>
+                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> notAllowed)</li>
         <li class="context-mdl"><a href="noscript.html#noscript.elem.head">noscript.elem.head</a> = (<a class="ref" href="link.html#link">link</a>
-   | <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-   | <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-   | <a class="ref" href="style.html#style-pattern">style</a>)*</li></ul>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="style.html#style-pattern">style</a>)<a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a></li></ul>
       </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.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- meta.http-equiv.refresh.html	2 Aug 2009 07:07:44 -0000	1.10
+++ meta.http-equiv.refresh.html	16 Aug 2009 10:53:43 -0000	1.11
@@ -28,15 +28,15 @@
         <div class="content-models" 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>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <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 class="no-number no-toc" id="meta.http-equiv.refresh-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#meta.http-equiv.refresh-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="meta.http-equiv.refresh.html#meta.http-equiv.refresh.attrs">meta.http-equiv.refresh.attrs</a> = <span class="pattern" id="meta.http-equiv.refresh.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.attrs.http-equiv.refresh" title="meta.http-equiv.attrs.http-equiv.refresh">http-equiv.refresh</a>
-  &amp; <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.attrs.content.refresh" title="meta.http-equiv.attrs.content.refresh">content.refresh</a></span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.attrs.http-equiv.refresh" title="meta.http-equiv.attrs.http-equiv.refresh">http-equiv.refresh</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.attrs.content.refresh" title="meta.http-equiv.attrs.content.refresh">content.refresh</a></span></p></div></div>
       <div class="no-number no-toc" id="meta.http-equiv.refresh-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#meta.http-equiv.refresh-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -76,20 +76,21 @@
         <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>
-  | <a class="ref" href="style.html#style-pattern">style</a>
-  | <a class="ref" href="meta.name.html#meta.name">meta.name</a>
-  | <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-  | <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-  | <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  | (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-     | <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
-  | <a class="ref" href="script.html#script">script</a>
-  | <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  | (<a class="ref" href="command.html#command">command</a>)</li>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="style.html#style-pattern">style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>
+                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> notAllowed)</li>
         <li class="context-mdl"><a href="noscript.html#noscript.elem.head">noscript.elem.head</a> = (<a class="ref" href="link.html#link">link</a>
-   | <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-   | <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-   | <a class="ref" href="style.html#style-pattern">style</a>)*</li></ul>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="style.html#style-pattern">style</a>)<a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a></li></ul>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: area.html
===================================================================
RCS file: /sources/public/html5/markup/area.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- area.html	4 Aug 2009 15:46:32 -0000	1.16
+++ area.html	16 Aug 2009 10:53:40 -0000	1.17
@@ -24,7 +24,8 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#area-content">#</a></h2>
         <div class="content-models" 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>
+      empty
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="area.html#area.attrs">area.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="area-attr-mdl">
@@ -32,21 +33,21 @@
         <div class="attr-content-models"><p><a href="area.html#area.attrs">area.attrs</a>
                     =
                   <span class="pattern" id="area.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; (<a class="ref" href="area.html#area.attrs.alt" title="area.attrs.alt">alt</a>
-         &amp; <a class="ref" href="area.html#area.attrs.href" title="area.attrs.href">href</a>)?
-  &amp; <a class="ref" href="area.html#area.attrs.target" title="area.attrs.target">target</a>?
-  &amp; <a class="ref" href="area.html#area.attrs.ping" title="area.attrs.ping">ping</a>?
-  &amp; <a class="ref" href="area.html#area.attrs.rel" title="area.attrs.rel">rel</a>?
-  &amp; <a class="ref" href="area.html#area.attrs.media" title="area.attrs.media">media</a>?
-  &amp; <a class="ref" href="area.html#area.attrs.hreflang" title="area.attrs.hreflang">hreflang</a>?
-  &amp; <a class="ref" href="area.html#area.attrs.type" title="area.attrs.type">type</a>?
-  &amp; <br></br>(<a class="ref" href="area.html#area.attrs.shape.rect" title="area.attrs.shape.rect">shape.rect</a>?
-   &amp; <a class="ref" href="area.html#area.attrs.coords.rect" title="area.attrs.coords.rect">coords.rect</a>)
-  | (<a class="ref" href="area.html#area.attrs.shape.circle" title="area.attrs.shape.circle">shape.circle</a>
-     &amp; <a class="ref" href="area.html#area.attrs.coords.circle" title="area.attrs.coords.circle">coords.circle</a>)
-  | (<a class="ref" href="area.html#area.attrs.shape.poly" title="area.attrs.shape.poly">shape.poly</a>
-     &amp; <a class="ref" href="area.html#area.attrs.coords.poly" title="area.attrs.coords.poly">coords.poly</a>)
-  | <a class="ref" href="area.html#area.attrs.shape.default" title="area.attrs.shape.default">shape.default</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> (<a class="ref" href="area.html#area.attrs.alt" title="area.attrs.alt">alt</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="area.html#area.attrs.href" title="area.attrs.href">href</a>)<a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="area.html#area.attrs.target" title="area.attrs.target">target</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="area.html#area.attrs.ping" title="area.attrs.ping">ping</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="area.html#area.attrs.rel" title="area.attrs.rel">rel</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="area.html#area.attrs.media" title="area.attrs.media">media</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="area.html#area.attrs.hreflang" title="area.attrs.hreflang">hreflang</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="area.html#area.attrs.type" title="area.attrs.type">type</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <br></br>(<a class="ref" href="area.html#area.attrs.shape.rect" title="area.attrs.shape.rect">shape.rect</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="area.html#area.attrs.coords.rect" title="area.attrs.coords.rect">coords.rect</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="area.html#area.attrs.shape.circle" title="area.attrs.shape.circle">shape.circle</a>
+                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="area.html#area.attrs.coords.circle" title="area.attrs.coords.circle">coords.circle</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="area.html#area.attrs.shape.poly" title="area.attrs.shape.poly">shape.poly</a>
+                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="area.html#area.attrs.coords.poly" title="area.attrs.coords.poly">coords.poly</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="area.html#area.attrs.shape.default" title="area.attrs.shape.default">shape.default</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="area-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#area-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -104,15 +105,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"> &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>
+            <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="terminology.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>
             <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"> &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>
+            <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="terminology.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>
             <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"> &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>
+            <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="terminology.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>
             <dd>Specifies that the shape of the area of this hyperlink
         on the image map is a polygon.</dd>
           

Index: input.text.html
===================================================================
RCS file: /sources/public/html5/markup/input.text.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- input.text.html	2 Aug 2009 07:07:43 -0000	1.12
+++ input.text.html	16 Aug 2009 10:53:43 -0000	1.13
@@ -30,20 +30,20 @@
         <h2 class="element-subhead">Attribute model <a class="hash" href="#input.text-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="input.text.html#input.text.attrs">input.text.attrs</a> = <span class="pattern" id="input.text.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-   &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-   &amp; <a class="ref" href="input.text.html#input.text.attrs.type" title="input.text.attrs.type">type</a>?
-   &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a>?
-   &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a>?
-   &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a>?
-   &amp; <a class="ref" href="input.text.html#input.text.attrs.value" title="input.text.attrs.value">value</a>?)
-  &amp; (<a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?
-         &amp; <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a>?)</span></p></div></div>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.text.html#input.text.attrs.type" title="input.text.attrs.type">type</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.text.html#input.text.attrs.value" title="input.text.attrs.value">value</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> (<a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)</span></p></div></div>
       <div class="no-number no-toc" id="input.text-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#input.text-attributes">#</a></h2>
         <dl class="attr-defs">

Index: Makefile
===================================================================
RCS file: /sources/public/html5/markup/Makefile,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- Makefile	29 Jul 2009 10:01:29 -0000	1.75
+++ Makefile	16 Aug 2009 10:53:40 -0000	1.76
@@ -112,7 +112,7 @@
 html.spec.src.html: $(HTML_COMPILED_RNG) html.rnc.spec.html \
   tools/generate-spec-source.xsl $(HTML_RNC_SOURCE)/assertions.sch \
   src/head.html src/header.src.html src/intro-scope.html \
-  src/conformance.html src/structure.html src/terms.html src/syntax.html src/documents.html \
+  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 $< > $@

Index: samp.html
===================================================================
RCS file: /sources/public/html5/markup/samp.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- samp.html	29 Jul 2009 11:23:45 -0000	1.13
+++ samp.html	16 Aug 2009 10:53:44 -0000	1.14
@@ -23,8 +23,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="samp.html#samp.attrs">samp.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="samp.html#samp.attrs">samp.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="samp-attr-mdl">

Index: h6.html
===================================================================
RCS file: /sources/public/html5/markup/h6.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- h6.html	29 Jul 2009 11:23:43 -0000	1.15
+++ h6.html	16 Aug 2009 10:53:42 -0000	1.16
@@ -22,8 +22,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="h6.html#h6.attrs">h6.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="h6.html#h6.attrs">h6.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="h6-attr-mdl">
@@ -58,11 +58,11 @@
         <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>
-   | <a class="ref" href="h2.html#h2">h2</a>
-   | <a class="ref" href="h3.html#h3">h3</a>
-   | <a class="ref" href="h4.html#h4">h4</a>
-   | <a class="ref" href="h5.html#h5">h5</a>
-   | <a class="ref" href="h6.html#h6">h6</a>)+</li></ul>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h2.html#h2">h2</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h3.html#h3">h3</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h4.html#h4">h4</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h5.html#h5">h5</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h6.html#h6">h6</a>)<a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a></li></ul>
       </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.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- input.checkbox.html	2 Aug 2009 07:07:43 -0000	1.12
+++ input.checkbox.html	16 Aug 2009 10:53:42 -0000	1.13
@@ -30,14 +30,14 @@
         <h2 class="element-subhead">Attribute model <a class="hash" href="#input.checkbox-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="input.checkbox.html#input.checkbox.attrs">input.checkbox.attrs</a> = <span class="pattern" id="input.checkbox.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-   &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-   &amp; <a class="ref" href="input.checkbox.html#input.checkbox.attrs.type" title="input.checkbox.attrs.type">type</a>
-   &amp; <a class="ref" href="forms-attributes.html#input.attrs.checked" title="input.attrs.checked">checked</a>?
-   &amp; <a class="ref" href="input.checkbox.html#input.checkbox.attrs.value" title="input.checkbox.attrs.value">value</a>?)
-  &amp; (<a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a>?)</span></p></div></div>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.checkbox.html#input.checkbox.attrs.type" title="input.checkbox.attrs.type">type</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.checked" title="input.attrs.checked">checked</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.checkbox.html#input.checkbox.attrs.value" title="input.checkbox.attrs.value">value</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> (<a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)</span></p></div></div>
       <div class="no-number no-toc" id="input.checkbox-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#input.checkbox-attributes">#</a></h2>
         <dl class="attr-defs">

Index: a.html
===================================================================
RCS file: /sources/public/html5/markup/a.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- a.html	4 Aug 2009 15:46:32 -0000	1.20
+++ a.html	16 Aug 2009 10:53:40 -0000	1.21
@@ -24,28 +24,28 @@
         <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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="a.html#a.attrs">a.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <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>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="a.html#a.attrs">a.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="a.html#a.attrs">a.attrs</a>
     </span></dd>
         </dl>
       </div><div class="no-number no-toc" id="a-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#a-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="a.html#a.attrs">a.attrs</a> = <span class="pattern" id="a.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="a.html#a.attrs.name" title="a.attrs.name">name</a>?
-  &amp; <a class="ref" href="a.html#a.attrs.href" title="a.attrs.href">href</a>?
-  &amp; <a class="ref" href="a.html#a.attrs.target" title="a.attrs.target">target</a>?
-  &amp; <a class="ref" href="a.html#a.attrs.rel" title="a.attrs.rel">rel</a>?
-  &amp; <a class="ref" href="a.html#a.attrs.hreflang" title="a.attrs.hreflang">hreflang</a>?
-  &amp; <a class="ref" href="a.html#a.attrs.media" title="a.attrs.media">media</a>?
-  &amp; <a class="ref" href="a.html#a.attrs.type" title="a.attrs.type">type</a>?
-  &amp; <a class="ref" href="a.html#a.attrs.ping" title="a.attrs.ping">ping</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="a.html#a.attrs.name" title="a.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="a.html#a.attrs.href" title="a.attrs.href">href</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="a.html#a.attrs.target" title="a.attrs.target">target</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="a.html#a.attrs.rel" title="a.attrs.rel">rel</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="a.html#a.attrs.hreflang" title="a.attrs.hreflang">hreflang</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="a.html#a.attrs.media" title="a.attrs.media">media</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="a.html#a.attrs.type" title="a.attrs.type">type</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="a.html#a.attrs.ping" title="a.attrs.ping">ping</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="a-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#a-attributes">#</a></h2>
         <dl class="attr-defs">

Index: object.html
===================================================================
RCS file: /sources/public/html5/markup/object.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- object.html	4 Aug 2009 15:46:33 -0000	1.19
+++ object.html	16 Aug 2009 10:53:44 -0000	1.20
@@ -22,31 +22,31 @@
         <dl class="content-models" 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>*,
+      <a class="ref" href="param.html#param">param</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="object.html#object.attrs">object.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <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>*,
+      <a class="ref" href="param.html#param">param</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="object.html#object.attrs">object.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="object.html#object.attrs">object.attrs</a>
     </span></dd>
         </dl>
       </div><div class="no-number no-toc" id="object-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#object-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="object.html#object.attrs">object.attrs</a> = <span class="pattern" id="object.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; ((<a class="ref" href="object.html#object.attrs.data" title="object.attrs.data">data</a>
-          &amp; <a class="ref" href="object.html#object.attrs.type" title="object.attrs.type">type</a>?)
-         | <a class="ref" href="object.html#object.attrs.type" title="object.attrs.type">type</a>)
-  &amp; <a class="ref" href="object.html#object.attrs.height" title="object.attrs.height">height</a>?
-  &amp; <a class="ref" href="object.html#object.attrs.width" title="object.attrs.width">width</a>?
-  &amp; <a class="ref" href="object.html#object.attrs.usemap" title="object.attrs.usemap">usemap</a>?
-  &amp; <a class="ref" href="object.html#object.attrs.name" title="object.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> ((<a class="ref" href="object.html#object.attrs.data" title="object.attrs.data">data</a>
+                                                                                        <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="object.html#object.attrs.type" title="object.attrs.type">type</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)
+                                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="object.html#object.attrs.type" title="object.attrs.type">type</a>)
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="object.html#object.attrs.height" title="object.attrs.height">height</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="object.html#object.attrs.width" title="object.attrs.width">width</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="object.html#object.attrs.usemap" title="object.attrs.usemap">usemap</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="object.html#object.attrs.name" title="object.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="object-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#object-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -74,7 +74,7 @@
       <a class="ref" href="datatypes.html#common.data.hash-name" title="common.data.hash-name">hash-name</a>
     </span> </dt>
             <dd>A <a href="datatypes.html#hash-name">hash-name reference</a> to a <a href="map.html#map">map</a> element with which to associate the
-        image.</dd>
+        object.</dd>
           
             <dt><a class="attribute-name" id="object.attrs.name" title="object.attrs.name" href="object.html#object.attrs.name">name</a> = <span class="attr-values">
       <a class="ref" href="datatypes.html#common.data.browsing-context-name" title="common.data.browsing-context-name">browsing-context-name</a>

Index: terminology.html
===================================================================
RCS file: /sources/public/html5/markup/terminology.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- terminology.html	4 Aug 2009 15:46:34 -0000	1.14
+++ terminology.html	16 Aug 2009 10:53:45 -0000	1.15
@@ -1,52 +1,73 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>HTML5: Terminology</title>
+<title>HTML5: Terminology and symbols</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="W3C-ED.css" type="text/css"></link>
 </head>
 <body>
 <h2 class="chunkpagetitle"><a href="Overview.html">HTML5: The Markup Language</a></h2>
 <div class="nav">
-<span class="nav-prev"><a href="structure.html">&#171; structure</a></span>
+<span class="nav-prev"><a href="intro.html">&#171; intro</a></span>
 <span class="nav-next"><a href="documents.html">documents &#187;</a></span>
 </div>
 <div id="terminology" class="section">
-  <h2>4. Terminology <a class="hash" href="#terminology">#</a> <a class="toc-bak" href="Overview.html#terminology-toc">T</a></h2>
-  <p>This section defines terms used in other parts of this
-  specification.</p>
+  <h2>2. Terminology and symbols <a class="hash" href="#terminology">#</a> <a class="toc-bak" href="Overview.html#terminology-toc">T</a></h2>
+  <p>This section defines the following:</p>
+  <div class="toc">
+<ul>
+<li id="terms-toc"><span class="toc-section-number"></span><a href="terminology.html#terms"><span class="toc-section-number">1.</span> Terms used in other parts of the specification</a>
+</li>
+<li id="rnc-symbols-toc"><span class="toc-section-number"></span><a href="terminology.html#rnc-symbols"><span class="toc-section-number">2.</span> Symbols used in content models</a>
+</li>
+</ul>
+</div>
+  <div id="terms" class="section">
+    <h2>2.01. Terms used in other parts of the specification <a class="hash" href="#terms">#</a> <a class="toc-bak" href="Overview.html#terms-toc">T</a></h2>
+    <p>The following is a list of terms that are common to various
+    other sections in this specification.</p>
   <dl>
-    <dt><dfn id="ascii-case-insensitive">ASCII case-insensitive</dfn></dt>
-    <dd>Comparing two strings in an <a href="terminology.html#ascii-case-insensitive">ASCII case-insensitive</a>
-      manner means comparing them exactly, codepoint for
-      codepoint, except that the characters in the range U+0041 ..
-      U+005A (that is, LATIN CAPITAL LETTER A to LATIN CAPITAL
-      LETTER Z) and the corresponding characters in the range
-      U+0061 .. U+007A (that is, LATIN SMALL LETTER A to LATIN
-    SMALL LETTER Z) are considered to also match.</dd>
     <dt><dfn id="context">browsing context</dfn></dt>
     <dd>A <a href="terminology.html#context">browsing context</a> is a collection
       of one or more documents and one or more <a href="terminology.html#view">views</a>.</dd>
-    <dt><dfn id="case-insensitive">case-insensitive</dfn></dt>
-    <dd>The term <a href="terminology.html#case-insensitive">case-insensitive</a>
-      is used throughout this specification to mean case
-      insensitivity only for characters in the ranges U+0041 ..
-      U+005A (LATIN CAPITAL LETTER A to LATIN CAPITAL LETTER Z)
-      and U+0061 .. U+007A (LATIN SMALL LETTER A to LATIN SMALL
-      LETTER Z). Many strings in the HTML syntax (for example, the
-      names of elements and their attributes) are <a href="terminology.html#case-insensitive">case-insensitive</a>.
-    </dd>
-    <dd>For <a href="documents.html#syntax-document-xml">documents in the XML
-        syntax</a>, <a href="syntax.html#character-data">character data</a>
-      is as defined in the XML specification <a href="references.html#refsXML">[XML]</a>.</dd>
+    <dt><dfn id="case-insensitive">case-insensitive match</dfn></dt>
+    <dd>For the purposes of this specification,
+      performing a
+      <a href="terminology.html#case-insensitive">case-insensitive match</a>
+      between two strings means comparing the strings exactly,
+      codepoint for codepoint, except that the characters in the
+      range
+      <code title="U+0041 LATIN CAPITAL LETTER A&#8211;U+005A LATIN CAPITAL LETTER Z">A-Z</code>
+      and the corresponding characters in the range
+      <code title="U+0061 LATIN SMALL LETTER A&#8211;U+007A LATIN SMALL LETTER Z">a-z</code>
+      are considered to also match.</dd>
     <dt><dfn id="fallback">fallback content</dfn></dt>
     <dd>Some embedded content elements can have fallback content:
       content that is to be used when the embedded content cannot
       be used (for example, when it is of an unsupported format).</dd>
+    <dt><dfn id="group" title="group">group</dfn></dt>
+    <dd>A
+      <a href="terminology.html#group">group</a>
+      is any combination of names and symbols in definitions in the
+    <a href="elements.html">HTML elements</a>,
+    <a href="common-models.html">Common content models</a>,
+    <a href="common-attributes.html">Common attributes</a>,
+    or 
+    <a href="forms-attributes.html">Forms attributes</a>
+    that are delimited by a set of matching
+    "<code>(</code>" and "<code>)</code>"
+    (parentheses) symbols.</dd>
     <dt><dfn id="identify">identify</dfn></dt>
     <dd>To <a href="terminology.html#identify">identify</a> a particular element
       means to reference that element by means of its
       <a href="common-attributes.html#common.attrs.id">id</a> attribute.</dd>
+    <dt><dfn id="html-producer" title="html-producer">HTML producers</dfn></dt>
+    <dd>HTML authors (that is, people) and applications
+    (such as editors and content management systems)
+    that produce HTML content.</dd>
+    <dt><dfn id="html-consumer" title="html-consumer">HTML consumers</dfn></dt>
+    <dd>HTML user agents; that is, applications (such as
+    Web browsers) which consume HTML content</dd>
     <dt><dfn id="newlines">newline</dfn></dt>
     <dd>A <a href="terminology.html#newlines">newline</a> may be represented as any
       of the following:
@@ -57,6 +78,17 @@
         LINE FEED (LF) character</li>
       </ul>
     </dd>
+    <dt><dfn id="pattern-name" title="pattern-name">pattern name</dfn></dt>
+    <dd>A
+      <a href="terminology.html#pattern-name">pattern name</a>
+      is any name used in definitions in the
+    <a href="elements.html">HTML elements</a>,
+    <a href="common-models.html">Common content models</a>,
+    <a href="common-attributes.html">Common attributes</a>,
+    or 
+    <a href="forms-attributes.html">Forms attributes</a>
+    sections of this specification that is not an element name or
+    an attribute name.</dd>
     <dt><dfn id="space">space</dfn></dt>
     <dd>A <a href="terminology.html#space">space character</a> is any of the
       following:
@@ -72,10 +104,80 @@
     <dd>A <a href="terminology.html#view">view</a> is as defined in <cite>Document
         Object Model (DOM) Level 2 Views</cite> <a href="references.html#refsDOM2VIEWS">[DOM2VIEWS]</a>.</dd>
   </dl>
+  </div>
+  <div id="rnc-symbols" class="section">
+    <h2>2.02. Symbols used in content models <a class="hash" href="#rnc-symbols">#</a> <a class="toc-bak" href="Overview.html#rnc-symbols-toc">T</a></h2>
+    <p>This section provides explanations for the symbols used in
+    the <i>Content model</i> and <i>Attribute model</i>
+    subsections of the per-element documentation in the
+    <a href="elements.html">HTML elements</a>
+    section and in the
+    <a href="common-models.html">Common content models</a>,
+    <a href="common-attributes.html">Common attributes</a>,
+    and
+    <a href="forms-attributes.html">Forms attributes</a>
+    sections.</p>
+    <dl id="rnc-symbol-list">
+      <dt id="optional"><span class="rnc-symbol">?</span> (optional)</dt>
+      <dd>The "<code>?</code>" (question mark) symbol after an
+        element name, attribute name,
+        <a href="terminology.html#pattern-name">pattern name</a>,
+        or
+        <a href="terminology.html#group">group</a>
+        indicates that it is optional &#8212; meaning that it can either
+        not occur at all, or it can occur exactly once.</dd>
+      <dt id="zero-or-more"><span class="rnc-symbol">*</span> (zero or more)</dt>
+      <dd>The "<code>*</code>" (asterisk) symbol after an element
+        name,
+        <a href="terminology.html#pattern-name">pattern name</a>,
+        or
+        <a href="terminology.html#group">group</a>
+        indicates that it may occur
+        any number of times, including not occurring at all.</dd>
+      <dt id="one-or-more"><span class="rnc-symbol">+</span> (one or more)</dt>
+      <dd>The "<code>+</code>" (plus sign) symbol after an element
+        name,
+        <a href="terminology.html#pattern-name">pattern name</a>,
+        or
+        <a href="terminology.html#group">group</a>
+        indicates that is must occur
+        at least once, and can occur more than once.</dd>
+      <dt id="choice"><span class="rnc-symbol">|</span> (either/or choice)</dt>
+      <dd>The "<code>|</code>" (vertical line) symbol between
+        element names, attribute names,
+        <a href="terminology.html#pattern-name">pattern names</a>,
+        and
+        <a href="terminology.html#group">groups</a>
+        indicates an either/or alternative relationship between
+        the two items it separates; that it, it indicates that
+        either the item before the "<code>|</code>" symbol can
+        occur, or the item after the symbol can occur.</dd>
+      <dt id="in-order"><span class="rnc-symbol">,</span> (in the order shown)</dt>
+      <dd>The "<code>,</code>" (comma) symbol between element
+        names,
+        <a href="terminology.html#pattern-name">pattern names</a>,
+        and
+        <a href="terminology.html#group">groups</a>
+        indicates that the two
+        items it separates can only occur in the order shown.</dd>
+      <dt id="interleave"><span class="rnc-symbol">&amp;</span> (interleaved in any order)</dt>
+      <dd>The "<code>&amp;</code>" (ampersand) symbol between
+        element names, attribute names,
+        <a href="terminology.html#pattern-name">pattern names</a>,
+        and
+        <a href="terminology.html#group">groups</a>
+        indicates that the two items it separates can occur in any
+        order.</dd>
+      <dt id="parentheses"><span class="rnc-symbol">(</span> and <span class="rnc-symbol">)</span> (grouping)</dt>
+      <dd>The "<code>(</code>" and "<code>)</code>" (parentheses)
+        symbols are used to delimit multiple items such that they
+        are treated as a group.</dd>
+    </dl>
+  </div>
 </div>
 <hr class="footerbreak"></hr>
 <div class="nav">
-<span class="nav-prev"><a href="structure.html">&#171; structure</a></span>
+<span class="nav-prev"><a href="intro.html">&#171; intro</a></span>
 <span class="nav-next"><a href="documents.html">documents &#187;</a></span>
 </div>
 </body>

Index: input.tel.html
===================================================================
RCS file: /sources/public/html5/markup/input.tel.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- input.tel.html	2 Aug 2009 07:07:43 -0000	1.10
+++ input.tel.html	16 Aug 2009 10:53:43 -0000	1.11
@@ -30,20 +30,20 @@
         <h2 class="element-subhead">Attribute model <a class="hash" href="#input.tel-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="input.tel.html#input.tel.attrs">input.tel.attrs</a> = <span class="pattern" id="input.tel.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-  &amp; <a class="ref" href="input.tel.html#input.tel.attrs.type" title="input.tel.attrs.type">type</a>
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a>?
-  &amp; <a class="ref" href="input.tel.html#input.tel.attrs.value" title="input.tel.attrs.value">value</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.tel.html#input.tel.attrs.type" title="input.tel.attrs.type">type</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.tel.html#input.tel.attrs.value" title="input.tel.attrs.value">value</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="input.tel-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#input.tel-attributes">#</a></h2>
         <dl class="attr-defs">

Index: h4.html
===================================================================
RCS file: /sources/public/html5/markup/h4.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- h4.html	29 Jul 2009 11:23:43 -0000	1.15
+++ h4.html	16 Aug 2009 10:53:42 -0000	1.16
@@ -22,8 +22,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="h4.html#h4.attrs">h4.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="h4.html#h4.attrs">h4.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="h4-attr-mdl">
@@ -58,11 +58,11 @@
         <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>
-   | <a class="ref" href="h2.html#h2">h2</a>
-   | <a class="ref" href="h3.html#h3">h3</a>
-   | <a class="ref" href="h4.html#h4">h4</a>
-   | <a class="ref" href="h5.html#h5">h5</a>
-   | <a class="ref" href="h6.html#h6">h6</a>)+</li></ul>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h2.html#h2">h2</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h3.html#h3">h3</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h4.html#h4">h4</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h5.html#h5">h5</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h6.html#h6">h6</a>)<a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a></li></ul>
       </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.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- header.html	2 Aug 2009 11:48:35 -0000	1.15
+++ header.html	16 Aug 2009 10:53:42 -0000	1.16
@@ -22,8 +22,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="header.html#header.attrs">header.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="header.html#header.attrs">header.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="header-attr-mdl">

Index: b.html
===================================================================
RCS file: /sources/public/html5/markup/b.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- b.html	29 Jul 2009 11:23:42 -0000	1.13
+++ b.html	16 Aug 2009 10:53:40 -0000	1.14
@@ -25,8 +25,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="b.html#b.attrs">b.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="b.html#b.attrs">b.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="b-attr-mdl">

Index: img.html
===================================================================
RCS file: /sources/public/html5/markup/img.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- img.html	2 Aug 2009 07:07:43 -0000	1.16
+++ img.html	16 Aug 2009 10:53:42 -0000	1.17
@@ -21,20 +21,21 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#img-content">#</a></h2>
         <div class="content-models" 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>
+      empty
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="img.html#img.attrs">img.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="img-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#img-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="img.html#img.attrs">img.attrs</a> = <span class="pattern" id="img.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="img.html#img.attrs.src" title="img.attrs.src">src</a>
-  &amp; <a class="ref" href="img.html#img.attrs.alt" title="img.attrs.alt">alt</a>?
-  &amp; <a class="ref" href="img.html#img.attrs.height" title="img.attrs.height">height</a>?
-  &amp; <a class="ref" href="img.html#img.attrs.width" title="img.attrs.width">width</a>?
-  &amp; <a class="ref" href="img.html#img.attrs.usemap" title="img.attrs.usemap">usemap</a>?
-  &amp; <a class="ref" href="img.html#img.attrs.ismap" title="img.attrs.ismap">ismap</a>?
-  &amp; <a class="ref" href="img.html#img.attrs.border" title="img.attrs.border">border</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="img.html#img.attrs.src" title="img.attrs.src">src</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="img.html#img.attrs.alt" title="img.attrs.alt">alt</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="img.html#img.attrs.height" title="img.attrs.height">height</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="img.html#img.attrs.width" title="img.attrs.width">width</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="img.html#img.attrs.usemap" title="img.attrs.usemap">usemap</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="img.html#img.attrs.ismap" title="img.attrs.ismap">ismap</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="img.html#img.attrs.border" title="img.attrs.border">border</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="img-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#img-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -68,7 +69,10 @@
         element with which to associate the
         image.</dd>
           
-            <dt><a class="attribute-name" id="img.attrs.ismap" title="img.attrs.ismap" href="img.html#img.attrs.ismap">ismap</a> = <span class="attr-values">  "ismap" |  "" </span> </dt>
+            <dt><a class="attribute-name" id="img.attrs.ismap" title="img.attrs.ismap" href="img.html#img.attrs.ismap">ismap</a> = <span class="attr-values">
+       "ismap"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
+    </span> </dt>
             <dd>Specifies that its <a href="img.html#img">img</a> element
         provides access to a server-side image map.</dd>
           

Index: bdo.html
===================================================================
RCS file: /sources/public/html5/markup/bdo.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- bdo.html	29 Jul 2009 11:23:42 -0000	1.12
+++ bdo.html	16 Aug 2009 10:53:40 -0000	1.13
@@ -23,8 +23,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="bdo.html#bdo.attrs">bdo.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="bdo.html#bdo.attrs">bdo.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="bdo-attr-mdl">

Index: input.number.html
===================================================================
RCS file: /sources/public/html5/markup/input.number.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- input.number.html	2 Aug 2009 07:07:43 -0000	1.11
+++ input.number.html	16 Aug 2009 10:53:43 -0000	1.12
@@ -31,19 +31,19 @@
         <h2 class="element-subhead">Attribute model <a class="hash" href="#input.number-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="input.number.html#input.number.attrs">input.number.attrs</a> = <span class="pattern" id="input.number.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-  &amp; <a class="ref" href="input.number.html#input.number.attrs.type" title="input.number.attrs.type">type</a>
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a>?
-  &amp; <a class="ref" href="input.number.html#input.number.attrs.min" title="input.number.attrs.min">min</a>?
-  &amp; <a class="ref" href="input.number.html#input.number.attrs.max" title="input.number.attrs.max">max</a>?
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a>?
-  &amp; <a class="ref" href="input.number.html#input.number.attrs.value" title="input.number.attrs.value">value</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.number.html#input.number.attrs.type" title="input.number.attrs.type">type</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.number.html#input.number.attrs.min" title="input.number.attrs.min">min</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.number.html#input.number.attrs.max" title="input.number.attrs.max">max</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.number.html#input.number.attrs.value" title="input.number.attrs.value">value</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="input.number-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#input.number-attributes">#</a></h2>
         <dl class="attr-defs">

Index: col.html
===================================================================
RCS file: /sources/public/html5/markup/col.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- col.html	2 Aug 2009 07:07:42 -0000	1.11
+++ col.html	16 Aug 2009 10:53:41 -0000	1.12
@@ -23,14 +23,15 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#col-content">#</a></h2>
         <div class="content-models" 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>
+      empty
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="col.html#col.attrs">col.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="col-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#col-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="col.html#col.attrs">col.attrs</a> = <span class="pattern" id="col.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="col.html#col.attrs.span" title="col.attrs.span">span</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="col.html#col.attrs.span" title="col.attrs.span">span</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="col-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#col-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -55,8 +56,8 @@
       <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>*
-  | <a class="ref" href="colgroup.html#colgroup.attrs.span" title="colgroup.attrs.span">span</a>?</li></ul>
+        <li class="context-mdl"><a href="colgroup.html#colgroup-mdl">colgroup</a> = <a class="ref" href="col.html#col">col</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="colgroup.html#colgroup.attrs.span" title="colgroup.attrs.span">span</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></li></ul>
       </div>
       
       <div class="no-number no-toc" id="col-display">

Index: datatypes.html
===================================================================
RCS file: /sources/public/html5/markup/datatypes.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- datatypes.html	9 Aug 2009 15:15:19 -0000	1.26
+++ datatypes.html	16 Aug 2009 10:53:41 -0000	1.27
@@ -12,10 +12,20 @@
 <span class="nav-next"><a href="references.html">references &#187;</a></span>
 </div>
 <div id="datatypes" class="section">
-        <h2>11. Datatypes <a class="hash" href="#datatypes">#</a> <a class="toc-bak" href="Overview.html#datatypes-toc">T</a></h2>
+        <h2>9. Datatypes <a class="hash" href="#datatypes">#</a> <a class="toc-bak" href="Overview.html#datatypes-toc">T</a></h2>
+        <p>This section defines datatypes that are referenced
+              by attribute definitions in the 
+              <a href="elements.html">HTML elements</a>,
+              <a href="common-attributes.html">Common attributes</a>,
+              and
+              <a href="forms-attributes.html">Forms attributes</a>
+              sections.</p>
         <div id="data-string-def" class="section">
-    <h2>11.01. String <a class="hash" href="#data-string-def">#</a></h2>
-    <p>For any pattern in this document that references the <a href="datatypes.html#data-string">string</a> datatype, a
+    <h2>9.01. String <a class="hash" href="#data-string-def">#</a></h2>
+    <p>For any attribute definition in this document that
+    references the
+    <a href="datatypes.html#data-string">string</a>
+    datatype, a
     <dfn id="data-string" title="string">string</dfn>
     is defined as
     <a href="syntax.html#normal-character-data">normal character data</a>
@@ -31,15 +41,18 @@
       <li><a href="syntax.html#attr-value-double-quoted">double-quoted attribute values</a></li>
     </ul>
   </div><div id="data-token-def" class="section">
-    <h2>11.02. Token <a class="hash" href="#data-token-def">#</a></h2>
-    <p>For any pattern in this document that references the <a href="datatypes.html#data-token">token</a> datatype, a
+    <h2>9.02. Token <a class="hash" href="#data-token-def">#</a></h2>
+    <p>For any attribute definition in this document that
+    references the
+    <a href="datatypes.html#data-token">token</a>
+    datatype, a
     <dfn id="data-token" title="token">token</dfn>
     is defined
     as a <a href="datatypes.html#data-string">string</a> that does not contain
     any <a href="terminology.html#space">space characters</a>.</p>
   </div>
       <div id="common.data.tokens-mdl" class="section">
-        <h2 class="common-subhead">11.03. Tokens <a class="hash" href="#common.data.tokens-mdl">#</a></h2>
+        <h2 class="common-subhead">9.03. Tokens <a class="hash" href="#common.data.tokens-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.tokens">tokens</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.tokens" class="hash">#</a></div>
       <div class="datatype-desc">A
@@ -49,7 +62,7 @@
     </div>
       </div>
       <div id="common.data.browsing-context-name-mdl" class="section">
-        <h2 class="common-subhead">11.04. Browsing-context-name <a class="hash" href="#common.data.browsing-context-name-mdl">#</a></h2>
+        <h2 class="common-subhead">9.04. Browsing-context-name <a class="hash" href="#common.data.browsing-context-name-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.browsing-context-name">browsing-context-name</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.browsing-context-name" class="hash">#</a></div>
       <div class="datatype-desc">Any
@@ -65,7 +78,7 @@
     </div>
       </div>
       <div id="common.data.browsing-context-name-or-keyword-mdl" class="section">
-        <h2 class="common-subhead">11.05. Browsing-context-name-or-keyword <a class="hash" href="#common.data.browsing-context-name-or-keyword-mdl">#</a></h2>
+        <h2 class="common-subhead">9.05. Browsing-context-name-or-keyword <a class="hash" href="#common.data.browsing-context-name-or-keyword-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.browsing-context-name-or-keyword">browsing-context-name-or-keyword</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.browsing-context-name-or-keyword" class="hash">#</a></div>
       <div class="datatype-desc">Any
@@ -74,8 +87,9 @@
         <ul>
           <li>a
           <a href="datatypes.html#common.data.browsing-context-name">browsing-context-name</a></li>
-          <li>an <a href="terminology.html#ascii-case-insensitive">ASCII
-            case-insensitive</a> match for one of the following literal strings:
+          <li>any
+          <a href="terminology.html#case-insensitive">case-insensitive match</a>
+          for one of the following literal strings:
             <ul>
               <li><code>_blank</code></li>
               <li><code>_self</code></li>
@@ -88,7 +102,7 @@
     </div>
       </div>
       <div id="common.data.id-mdl" class="section">
-        <h2 class="common-subhead">11.06. ID <a class="hash" href="#common.data.id-mdl">#</a></h2>
+        <h2 class="common-subhead">9.06. ID <a class="hash" href="#common.data.id-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.id">id</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.id" class="hash">#</a></div>
       <div class="datatype-desc">Any
@@ -103,7 +117,7 @@
     </div>
       </div>
       <div id="common.data.idref-mdl" class="section">
-        <h2 class="common-subhead">11.07. IDREF <a class="hash" href="#common.data.idref-mdl">#</a></h2>
+        <h2 class="common-subhead">9.07. IDREF <a class="hash" href="#common.data.idref-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.idref">idref</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.idref" class="hash">#</a></div>
       <div class="datatype-desc">Any
@@ -118,7 +132,7 @@
     </div>
       </div>
       <div id="common.data.idrefs-mdl" class="section">
-        <h2 class="common-subhead">11.08. IDREFS <a class="hash" href="#common.data.idrefs-mdl">#</a></h2>
+        <h2 class="common-subhead">9.08. IDREFS <a class="hash" href="#common.data.idrefs-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.idrefs">idrefs</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.idrefs" class="hash">#</a></div>
       <div class="datatype-desc">A
@@ -127,7 +141,7 @@
     </div>
       </div>
       <div id="common.data.name-mdl" class="section">
-        <h2 class="common-subhead">11.09. Name <a class="hash" href="#common.data.name-mdl">#</a></h2>
+        <h2 class="common-subhead">9.09. Name <a class="hash" href="#common.data.name-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.name">name</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.name" class="hash">#</a></div>
       <div class="datatype-desc">Any
@@ -142,7 +156,7 @@
     </div>
       </div>
       <div id="common.data.hash-name-mdl" class="section">
-        <h2 class="common-subhead">11.10. Hash-name <a class="hash" href="#common.data.hash-name-mdl">#</a></h2>
+        <h2 class="common-subhead">9.10. Hash-name <a class="hash" href="#common.data.hash-name-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.hash-name">hash-name</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.hash-name" class="hash">#</a></div>
       <div class="datatype-desc">A
@@ -159,7 +173,7 @@
     </div>
       </div>
       <div id="common.data.integer-mdl" class="section">
-        <h2 class="common-subhead">11.11. Integer <a class="hash" href="#common.data.integer-mdl">#</a></h2>
+        <h2 class="common-subhead">9.11. Integer <a class="hash" href="#common.data.integer-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.integer">integer</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.integer" class="hash">#</a></div>
       <div class="datatype-desc">One or more characters in the range
@@ -170,7 +184,7 @@
     </div>
       </div>
       <div id="common.data.integer.positive-mdl" class="section">
-        <h2 class="common-subhead">11.12. Positive integer <a class="hash" href="#common.data.integer.positive-mdl">#</a></h2>
+        <h2 class="common-subhead">9.12. Positive integer <a class="hash" href="#common.data.integer.positive-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.integer.positive">integer.positive</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.integer.positive" class="hash">#</a></div>
       <div class="datatype-desc">Any
@@ -183,7 +197,7 @@
     </div>
       </div>
       <div id="common.data.integer.non-negative-mdl" class="section">
-        <h2 class="common-subhead">11.13. Non-negative integer <a class="hash" href="#common.data.integer.non-negative-mdl">#</a></h2>
+        <h2 class="common-subhead">9.13. Non-negative integer <a class="hash" href="#common.data.integer.non-negative-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.integer.non-negative">integer.non-negative</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.integer.non-negative" class="hash">#</a></div>
       <div class="datatype-desc">One or more characters in the range
@@ -191,7 +205,7 @@
       </div>
       </div>
       <div id="common.data.float-mdl" class="section">
-        <h2 class="common-subhead">11.14. Float <a class="hash" href="#common.data.float-mdl">#</a></h2>
+        <h2 class="common-subhead">9.14. Float <a class="hash" href="#common.data.float-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.float">float</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.float" class="hash">#</a></div>
       <div class="datatype-desc">A float consists of the following
@@ -234,7 +248,7 @@
     </div>
       </div>
       <div id="common.data.float.positive-mdl" class="section">
-        <h2 class="common-subhead">11.15. Positive float <a class="hash" href="#common.data.float.positive-mdl">#</a></h2>
+        <h2 class="common-subhead">9.15. Positive float <a class="hash" href="#common.data.float.positive-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.float.positive">float.positive</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.float.positive" class="hash">#</a></div>
       <div class="datatype-desc">A
@@ -247,7 +261,7 @@
     </div>
       </div>
       <div id="common.data.float.non-negative-mdl" class="section">
-        <h2 class="common-subhead">11.16. Non-negative float <a class="hash" href="#common.data.float.non-negative-mdl">#</a></h2>
+        <h2 class="common-subhead">9.16. Non-negative float <a class="hash" href="#common.data.float.non-negative-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.float.non-negative">float.non-negative</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.float.non-negative" class="hash">#</a></div>
       <div class="datatype-desc">A
@@ -262,7 +276,7 @@
     </div>
       </div>
       <div id="common.data.datetime-mdl" class="section">
-        <h2 class="common-subhead">11.17. Datetime <a class="hash" href="#common.data.datetime-mdl">#</a></h2>
+        <h2 class="common-subhead">9.17. Datetime <a class="hash" href="#common.data.datetime-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.datetime">datetime</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.datetime" class="hash">#</a></div>
       <div class="datatype-desc">A valid
@@ -287,7 +301,7 @@
     </div>
       </div>
       <div id="common.data.date-or-time-mdl" class="section">
-        <h2 class="common-subhead">11.18. Date-or-time <a class="hash" href="#common.data.date-or-time-mdl">#</a></h2>
+        <h2 class="common-subhead">9.18. Date-or-time <a class="hash" href="#common.data.date-or-time-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.date-or-time">date-or-time</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.date-or-time" class="hash">#</a></div>
       <div class="datatype-desc">Any one of the following:
@@ -300,7 +314,7 @@
     </div>
       </div>
       <div id="common.data.uri-mdl" class="section">
-        <h2 class="common-subhead">11.19. URI <a class="hash" href="#common.data.uri-mdl">#</a></h2>
+        <h2 class="common-subhead">9.19. URI <a class="hash" href="#common.data.uri-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.uri">uri</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.uri" class="hash">#</a></div>
       <div class="datatype-desc">An
@@ -315,7 +329,7 @@
     </div>
       </div>
       <div id="common.data.uris-mdl" class="section">
-        <h2 class="common-subhead">11.20. URIs <a class="hash" href="#common.data.uris-mdl">#</a></h2>
+        <h2 class="common-subhead">9.20. URIs <a class="hash" href="#common.data.uris-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.uris">uris</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.uris" class="hash">#</a></div>
       <div class="datatype-desc">A
@@ -324,7 +338,7 @@
     </div>
       </div>
       <div id="common.data.uri.absolute-mdl" class="section">
-        <h2 class="common-subhead">11.21. Absolute URI <a class="hash" href="#common.data.uri.absolute-mdl">#</a></h2>
+        <h2 class="common-subhead">9.21. Absolute URI <a class="hash" href="#common.data.uri.absolute-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.uri.absolute">uri.absolute</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.uri.absolute" class="hash">#</a></div>
       <div class="datatype-desc">An
@@ -341,7 +355,7 @@
     </div>
       </div>
       <div id="common.data.sizes-mdl" class="section">
-        <h2 class="common-subhead">11.22. Sizes <a class="hash" href="#common.data.sizes-mdl">#</a></h2>
+        <h2 class="common-subhead">9.22. Sizes <a class="hash" href="#common.data.sizes-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.sizes">sizes</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.sizes" class="hash">#</a></div>
       <div class="datatype-desc">An unordered set of unique
@@ -362,7 +376,7 @@
     </div>
       </div>
       <div id="common.data.mimetype-mdl" class="section">
-        <h2 class="common-subhead">11.23. Mimetype <a class="hash" href="#common.data.mimetype-mdl">#</a></h2>
+        <h2 class="common-subhead">9.23. Mimetype <a class="hash" href="#common.data.mimetype-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.mimetype">mimetype</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.mimetype" class="hash">#</a></div>
       <div class="datatype-desc">A string that identifies a valid
@@ -371,7 +385,7 @@
         <a href="references.html#refsRFC2046">[RFC2046]</a>.</div> </div>
       </div>
       <div id="common.data.charset-mdl" class="section">
-        <h2 class="common-subhead">11.24. Charset <a class="hash" href="#common.data.charset-mdl">#</a></h2>
+        <h2 class="common-subhead">9.24. Charset <a class="hash" href="#common.data.charset-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.charset">charset</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.charset" class="hash">#</a></div>
       <div class="datatype-desc">
@@ -383,14 +397,14 @@
         <a href="references.html#refsIANACHARSET">[IANACHARSET]</a>.</p>
         <p>For documents in the <a href="documents.html#xml-syntax">XML
           syntax</a>, any
-        <a href="terminology.html#ascii-case-insensitive">ASCII case-insensitive</a>
-        match for the string
+        <a href="terminology.html#case-insensitive">case-insensitive match</a>
+        for the string
         "<code>UTF-8</code>".</p>
       </div>
     </div>
       </div>
       <div id="common.data.meta-charset-mdl" class="section">
-        <h2 class="common-subhead">11.25. Meta-charset <a class="hash" href="#common.data.meta-charset-mdl">#</a></h2>
+        <h2 class="common-subhead">9.25. Meta-charset <a class="hash" href="#common.data.meta-charset-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.meta-charset">meta-charset</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.meta-charset" class="hash">#</a></div>
       <div class="datatype-desc">The following parts, in exactly
@@ -409,7 +423,7 @@
     </div>
       </div>
       <div id="common.data.refresh-mdl" class="section">
-        <h2 class="common-subhead">11.26. Refresh <a class="hash" href="#common.data.refresh-mdl">#</a></h2>
+        <h2 class="common-subhead">9.26. Refresh <a class="hash" href="#common.data.refresh-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.refresh">refresh</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.refresh" class="hash">#</a></div>
       <div class="datatype-desc">Any one of the following:
@@ -426,8 +440,8 @@
               <li>One or more
               <a href="terminology.html#space">space characters</a>.</li>
               <li>A
-              <a href="terminology.html#ascii-case-insensitive">ASCII case-insensitive</a>
-              match for the string
+              <a href="terminology.html#case-insensitive">case-insensitive match</a>
+              for the string
               "<code>url=</code>".</li>
               <li>A
               <a href="datatypes.html#common.data.uri">URI</a>.</li>
@@ -438,7 +452,7 @@
     </div>
       </div>
       <div id="common.data.default-style-mdl" class="section">
-        <h2 class="common-subhead">11.27. Default-style <a class="hash" href="#common.data.default-style-mdl">#</a></h2>
+        <h2 class="common-subhead">9.27. Default-style <a class="hash" href="#common.data.default-style-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.default-style">default-style</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.default-style" class="hash">#</a></div>
       <div class="datatype-desc">A
@@ -446,7 +460,7 @@
     </div>
       </div>
       <div id="common.data.mediaquery-mdl" class="section">
-        <h2 class="common-subhead">11.28. Mediaquery <a class="hash" href="#common.data.mediaquery-mdl">#</a></h2>
+        <h2 class="common-subhead">9.28. Mediaquery <a class="hash" href="#common.data.mediaquery-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.mediaquery">mediaquery</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.mediaquery" class="hash">#</a></div>
       <div class="datatype-desc">A valid
@@ -456,7 +470,7 @@
     </div>
       </div>
       <div id="common.data.langcode-mdl" class="section">
-        <h2 class="common-subhead">11.29. Langcode <a class="hash" href="#common.data.langcode-mdl">#</a></h2>
+        <h2 class="common-subhead">9.29. Langcode <a class="hash" href="#common.data.langcode-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.langcode">langcode</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.langcode" class="hash">#</a></div>
       <div class="datatype-desc">A valid
@@ -466,7 +480,7 @@
     </div>
       </div>
       <div id="common.data.keylabellist-mdl" class="section">
-        <h2 class="common-subhead">11.30. Keylabellist <a class="hash" href="#common.data.keylabellist-mdl">#</a></h2>
+        <h2 class="common-subhead">9.30. Keylabellist <a class="hash" href="#common.data.keylabellist-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.keylabellist">keylabellist</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.keylabellist" class="hash">#</a></div>
       <div class="datatype-desc">An ordered set of unique
@@ -476,7 +490,7 @@
     </div>
       </div>
       <div id="common.data.zero-mdl" class="section">
-        <h2 class="common-subhead">11.31. Zero <a class="hash" href="#common.data.zero-mdl">#</a></h2>
+        <h2 class="common-subhead">9.31. Zero <a class="hash" href="#common.data.zero-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.zero">zero</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.zero" class="hash">#</a></div>
       <div class="datatype-desc">The literal string
@@ -484,7 +498,7 @@
     </div>
       </div>
       <div id="common.data.sandbox-allow-list-mdl" class="section">
-        <h2 class="common-subhead">11.32. Sandbox-allow-list <a class="hash" href="#common.data.sandbox-allow-list-mdl">#</a></h2>
+        <h2 class="common-subhead">9.32. Sandbox-allow-list <a class="hash" href="#common.data.sandbox-allow-list-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.sandbox-allow-list">sandbox-allow-list</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.sandbox-allow-list" class="hash">#</a></div>
       <div class="datatype-desc">An unordered set of unique
@@ -500,16 +514,16 @@
     </div>
       </div>
       <div id="common.data.javascript-mdl" class="section">
-        <h2 class="common-subhead">11.33. Javascript <a class="hash" href="#common.data.javascript-mdl">#</a></h2>
+        <h2 class="common-subhead">9.33. Javascript <a class="hash" href="#common.data.javascript-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="common.data.javascript">javascript</dfn></span><code class="punc"> = </code> <a href="datatypes.html#common.data.javascript" class="hash">#</a></div>
       <div class="datatype-desc">Any
-        <a href="terminology.html#ascii-case-insensitive">ASCII case-insensitive</a>
-        match for the literal string "<code>javascript</code>".</div>
+        <a href="terminology.html#case-insensitive">case-insensitive match</a>
+        for the literal string "<code>javascript</code>".</div>
     </div>
       </div>
       <div id="form.data.mimetypelist-mdl" class="section">
-        <h2 class="common-subhead">11.34. Mimetypelist <a class="hash" href="#form.data.mimetypelist-mdl">#</a></h2>
+        <h2 class="common-subhead">9.34. Mimetypelist <a class="hash" href="#form.data.mimetypelist-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.mimetypelist">mimetypelist</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.mimetypelist" class="hash">#</a></div>
       <div class="datatype-desc">A set of comma-separated <a href="datatypes.html#data-token">tokens</a>,
@@ -518,7 +532,7 @@
     </div>
       </div>
       <div id="form.data.charsetlist-mdl" class="section">
-        <h2 class="common-subhead">11.35. Charsetlist <a class="hash" href="#form.data.charsetlist-mdl">#</a></h2>
+        <h2 class="common-subhead">9.35. Charsetlist <a class="hash" href="#form.data.charsetlist-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.charsetlist">charsetlist</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.charsetlist" class="hash">#</a></div>
       <div class="datatype-desc">A set of comma-separated <a href="datatypes.html#data-token">tokens</a>,
@@ -528,7 +542,7 @@
     </div>
       </div>
       <div id="form.data.pattern-mdl" class="section">
-        <h2 class="common-subhead">11.36. Pattern <a class="hash" href="#form.data.pattern-mdl">#</a></h2>
+        <h2 class="common-subhead">9.36. Pattern <a class="hash" href="#form.data.pattern-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.pattern">pattern</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.pattern" class="hash">#</a></div>
       <div class="datatype-desc">A regular expression that must
@@ -536,7 +550,7 @@
     </div>
       </div>
       <div id="form.data.datetime-local-mdl" class="section">
-        <h2 class="common-subhead">11.37. Datetime-local <a class="hash" href="#form.data.datetime-local-mdl">#</a></h2>
+        <h2 class="common-subhead">9.37. Datetime-local <a class="hash" href="#form.data.datetime-local-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.datetime-local">datetime-local</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.datetime-local" class="hash">#</a></div>
       <div class="datatype-desc">The following parts, in exactly
@@ -556,7 +570,7 @@
     </div>
       </div>
       <div id="form.data.date-mdl" class="section">
-        <h2 class="common-subhead">11.38. Date <a class="hash" href="#form.data.date-mdl">#</a></h2>
+        <h2 class="common-subhead">9.38. Date <a class="hash" href="#form.data.date-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.date">date</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.date" class="hash">#</a></div>
       <div class="datatype-desc">A valid
@@ -574,7 +588,7 @@
     </div>
       </div>
       <div id="form.data.month-mdl" class="section">
-        <h2 class="common-subhead">11.39. Month <a class="hash" href="#form.data.month-mdl">#</a></h2>
+        <h2 class="common-subhead">9.39. Month <a class="hash" href="#form.data.month-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.month">month</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.month" class="hash">#</a></div>
       <div class="datatype-desc">The following parts, in exactly the
@@ -595,7 +609,7 @@
     </div>
       </div>
       <div id="form.data.week-mdl" class="section">
-        <h2 class="common-subhead">11.40. Week <a class="hash" href="#form.data.week-mdl">#</a></h2>
+        <h2 class="common-subhead">9.40. Week <a class="hash" href="#form.data.week-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.week">week</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.week" class="hash">#</a></div>
       <div class="datatype-desc">The following parts, in exactly
@@ -619,7 +633,7 @@
     </div>
       </div>
       <div id="form.data.time-mdl" class="section">
-        <h2 class="common-subhead">11.41. Time <a class="hash" href="#form.data.time-mdl">#</a></h2>
+        <h2 class="common-subhead">9.41. Time <a class="hash" href="#form.data.time-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.time">time</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.time" class="hash">#</a></div>
       <div class="datatype-desc">A valid
@@ -635,7 +649,7 @@
     </div>
       </div>
       <div id="form.data.emailaddress-mdl" class="section">
-        <h2 class="common-subhead">11.42. Emailaddress <a class="hash" href="#form.data.emailaddress-mdl">#</a></h2>
+        <h2 class="common-subhead">9.42. Emailaddress <a class="hash" href="#form.data.emailaddress-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.emailaddress">emailaddress</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.emailaddress" class="hash">#</a></div>
       <div class="datatype-desc">The following parts, in exactly
@@ -663,7 +677,7 @@
     </div>
       </div>
       <div id="form.data.emailaddresslist-mdl" class="section">
-        <h2 class="common-subhead">11.43. Emailaddresslist <a class="hash" href="#form.data.emailaddresslist-mdl">#</a></h2>
+        <h2 class="common-subhead">9.43. Emailaddresslist <a class="hash" href="#form.data.emailaddresslist-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.emailaddresslist">emailaddresslist</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.emailaddresslist" class="hash">#</a></div>
       <div class="datatype-desc">A set of comma-separated <a href="datatypes.html#data-token">tokens</a>, each of which is a valid
@@ -671,7 +685,7 @@
     </div>
       </div>
       <div id="form.data.color-mdl" class="section">
-        <h2 class="common-subhead">11.44. Color <a class="hash" href="#form.data.color-mdl">#</a></h2>
+        <h2 class="common-subhead">9.44. Color <a class="hash" href="#form.data.color-mdl">#</a></h2>
         <div class="content-models">
           <div><span class="common-pattern-name"><dfn id="form.data.color">color</dfn></span><code class="punc"> = </code> <a href="datatypes.html#form.data.color" class="hash">#</a></div>
       <div class="datatype-desc">A string exactly seven

Index: command.radio.html
===================================================================
RCS file: /sources/public/html5/markup/command.radio.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- command.radio.html	2 Aug 2009 07:07:42 -0000	1.12
+++ command.radio.html	16 Aug 2009 10:53:41 -0000	1.13
@@ -24,19 +24,19 @@
         <div class="content-models" 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>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="command.radio.html#command.radio.attrs">command.radio.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="command.radio-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#command.radio-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="command.radio.html#command.radio.attrs">command.radio.attrs</a> = <span class="pattern" id="command.radio.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; (<a class="ref" href="command.radio.html#command.radio.attrs.type" title="command.radio.attrs.type">type</a>
-         &amp; <a class="ref" href="command.radio.html#command.radio.attrs.radiogroup" title="command.radio.attrs.radiogroup">radiogroup</a>
-         &amp; <a class="ref" href="command.radio.html#command.radio.attrs.checked" title="command.radio.attrs.checked">checked</a>?)
-  &amp; <a class="ref" href="command.radio.html#command.radio.attrs.label" title="command.radio.attrs.label">label</a>?
-  &amp; <a class="ref" href="command.radio.html#command.radio.attrs.icon" title="command.radio.attrs.icon">icon</a>?
-  &amp; <a class="ref" href="command.radio.html#command.radio.attrs.disabled" title="command.radio.attrs.disabled">disabled</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> (<a class="ref" href="command.radio.html#command.radio.attrs.type" title="command.radio.attrs.type">type</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="command.radio.html#command.radio.attrs.radiogroup" title="command.radio.attrs.radiogroup">radiogroup</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="command.radio.html#command.radio.attrs.checked" title="command.radio.attrs.checked">checked</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="command.radio.html#command.radio.attrs.label" title="command.radio.attrs.label">label</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="command.radio.html#command.radio.attrs.icon" title="command.radio.attrs.icon">icon</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="command.radio.html#command.radio.attrs.disabled" title="command.radio.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="command.radio-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#command.radio-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -48,7 +48,10 @@
             <dd>The name of the group of commands that will be toggled
         when the command itself is toggled.</dd>
           
-            <dt><a class="attribute-name" id="command.radio.attrs.checked" title="command.radio.attrs.checked" href="command.radio.html#command.radio.attrs.checked">checked</a> = <span class="attr-values">  "checked" |  "" </span> </dt>
+            <dt><a class="attribute-name" id="command.radio.attrs.checked" title="command.radio.attrs.checked" href="command.radio.html#command.radio.attrs.checked">checked</a> = <span class="attr-values">
+       "checked"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
+    </span> </dt>
             <dd>Specifies that the command is selected.</dd>
           
             <dt><a class="attribute-name" id="command.radio.attrs.label" title="command.radio.attrs.label" href="command.radio.html#command.radio.attrs.label">label</a> = <span class="attr-values"><a href="datatypes.html#data-string">string</a></span> </dt>
@@ -59,7 +62,10 @@
     </span> </dt>
             <dd>A URL for an image that represents the command.</dd>
           
-            <dt><a class="attribute-name" id="command.radio.attrs.disabled" title="command.radio.attrs.disabled" href="command.radio.html#command.radio.attrs.disabled">disabled</a> = <span class="attr-values">  "disabled" |  "" </span> </dt>
+            <dt><a class="attribute-name" id="command.radio.attrs.disabled" title="command.radio.attrs.disabled" href="command.radio.html#command.radio.attrs.disabled">disabled</a> = <span class="attr-values">
+       "disabled"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
+    </span> </dt>
             <dd>Specifies that the command is not currently
         available.</dd>
           
@@ -78,16 +84,17 @@
         <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>
-  | <a class="ref" href="style.html#style-pattern">style</a>
-  | <a class="ref" href="meta.name.html#meta.name">meta.name</a>
-  | <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-  | <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-  | <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  | (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-     | <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
-  | <a class="ref" href="script.html#script">script</a>
-  | <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  | (<a class="ref" href="command.html#command">command</a>)</li>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="style.html#style-pattern">style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>
+                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> notAllowed)</li>
         <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
       </div>
       </div>

Index: input.datetime.html
===================================================================
RCS file: /sources/public/html5/markup/input.datetime.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- input.datetime.html	2 Aug 2009 07:07:43 -0000	1.11
+++ input.datetime.html	16 Aug 2009 10:53:42 -0000	1.12
@@ -32,19 +32,19 @@
         <h2 class="element-subhead">Attribute model <a class="hash" href="#input.datetime-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="input.datetime.html#input.datetime.attrs">input.datetime.attrs</a> = <span class="pattern" id="input.datetime.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-  &amp; <a class="ref" href="input.datetime.html#input.datetime.attrs.type" title="input.datetime.attrs.type">type</a>
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a>?
-  &amp; <a class="ref" href="input.datetime.html#input.datetime.attrs.min" title="input.datetime.attrs.min">min</a>?
-  &amp; <a class="ref" href="input.datetime.html#input.datetime.attrs.max" title="input.datetime.attrs.max">max</a>?
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a>?
-  &amp; <a class="ref" href="input.datetime.html#input.datetime.attrs.value" title="input.datetime.attrs.value">value</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.datetime.html#input.datetime.attrs.type" title="input.datetime.attrs.type">type</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.datetime.html#input.datetime.attrs.min" title="input.datetime.attrs.min">min</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.datetime.html#input.datetime.attrs.max" title="input.datetime.attrs.max">max</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.datetime.html#input.datetime.attrs.value" title="input.datetime.attrs.value">value</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="input.datetime-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#input.datetime-attributes">#</a></h2>
         <dl class="attr-defs">

Index: input.password.html
===================================================================
RCS file: /sources/public/html5/markup/input.password.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- input.password.html	2 Aug 2009 07:07:43 -0000	1.12
+++ input.password.html	16 Aug 2009 10:53:43 -0000	1.13
@@ -30,19 +30,19 @@
         <h2 class="element-subhead">Attribute model <a class="hash" href="#input.password-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="input.password.html#input.password.attrs">input.password.attrs</a> = <span class="pattern" id="input.password.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-   &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-   &amp; <a class="ref" href="input.password.html#input.password.attrs.type" title="input.password.attrs.type">type</a>
-   &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a>?
-   &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a>?
-   &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a>?
-   &amp; <a class="ref" href="input.password.html#input.password.attrs.value" title="input.password.attrs.value">value</a>?)
-  &amp; (<a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a>?)</span></p></div></div>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.password.html#input.password.attrs.type" title="input.password.attrs.type">type</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.password.html#input.password.attrs.value" title="input.password.attrs.value">value</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> (<a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)</span></p></div></div>
       <div class="no-number no-toc" id="input.password-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#input.password-attributes">#</a></h2>
         <dl class="attr-defs">

Index: embed.html
===================================================================
RCS file: /sources/public/html5/markup/embed.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- embed.html	2 Aug 2009 11:48:35 -0000	1.14
+++ embed.html	16 Aug 2009 10:53:42 -0000	1.15
@@ -21,17 +21,18 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#embed-content">#</a></h2>
         <div class="content-models" 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="embed.html#embed.attrs">embed.attrs</a>
+      empty
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="embed.html#embed.attrs">embed.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="embed-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#embed-attr-mdl">#</a></h2>
         <div class="attr-content-models"><div class="attr-content-model"><a class="attribute-pattern-name" id="embed.attrs" href="embed.html#embed.attrs">embed.attrs</a> = <a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="embed.html#embed.attrs.src" title="embed.attrs.src">src</a>?
-  &amp; <a class="ref" href="embed.html#embed.attrs.type" title="embed.attrs.type">type</a>?
-  &amp; <a class="ref" href="embed.html#embed.attrs.height" title="embed.attrs.height">height</a>?
-  &amp; <a class="ref" href="embed.html#embed.attrs.width" title="embed.attrs.width">width</a>?
-  &amp; <a class="ref" href="embed.html#embed.attrs.other" title="embed.attrs.other">embed.attrs.other</a>*</div><div class="attr-content-model"><a class="attribute-pattern-name" id="embed.attrs.other" href="embed.html#embed.attrs.other">embed.attrs.other</a> = <span class="attr-prose-desc">Any other attribute that has no namespace.</span></div></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="embed.html#embed.attrs.src" title="embed.attrs.src">src</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="embed.html#embed.attrs.type" title="embed.attrs.type">type</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="embed.html#embed.attrs.height" title="embed.attrs.height">height</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="embed.html#embed.attrs.width" title="embed.attrs.width">width</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="embed.html#embed.attrs.other" title="embed.attrs.other">embed.attrs.other</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a></div><div class="attr-content-model"><a class="attribute-pattern-name" id="embed.attrs.other" href="embed.html#embed.attrs.other">embed.attrs.other</a> = <span class="attr-prose-desc">Any other attribute that has no namespace.</span></div></div></div>
       <div class="no-number no-toc" id="embed-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#embed-attributes">#</a></h2>
         <dl class="attr-defs">

Index: dd.html
===================================================================
RCS file: /sources/public/html5/markup/dd.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- dd.html	2 Aug 2009 11:48:35 -0000	1.14
+++ dd.html	16 Aug 2009 10:53:41 -0000	1.15
@@ -26,8 +26,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="dd.html#dd.attrs">dd.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="dd.html#dd.attrs">dd.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="dd-attr-mdl">
@@ -52,10 +52,10 @@
       <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>+,
-   <a class="ref" href="dd.html#dd">dd</a>+)*</li>
-        <li class="context-mdl"><a href="dialog.html#dialog-mdl">dialog</a> = (<a class="ref" href="dt.html#dt">dt</a>,
-   <a class="ref" href="dd.html#dd">dd</a>)*</li></ul>
+        <li class="context-mdl"><a href="dl.html#dl-mdl">dl</a> = (<a class="ref" href="dt.html#dt">dt</a><a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+   <a class="ref" href="dd.html#dd">dd</a><a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a>)<a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a></li>
+        <li class="context-mdl"><a href="dialog.html#dialog-mdl">dialog</a> = (<a class="ref" href="dt.html#dt">dt</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+   <a class="ref" href="dd.html#dd">dd</a>)<a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a></li></ul>
       </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.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- common-models.html	1 Aug 2009 12:23:46 -0000	1.14
+++ common-models.html	16 Aug 2009 10:53:41 -0000	1.15
@@ -12,123 +12,130 @@
 <span class="nav-next"><a href="common-attributes.html">common-attributes &#187;</a></span>
 </div>
 <div id="common-models" class="section">
-        <h2>8. Common content models <a class="hash" href="#common-models">#</a> <a class="toc-bak" href="Overview.html#common-models-toc">T</a></h2>
+        <h2>6. Common content models <a class="hash" href="#common-models">#</a> <a class="toc-bak" href="Overview.html#common-models-toc">T</a></h2><p>This section defines content models that are
+              referenced by a number of different element
+              definitions in the
+              <i>Content model</i>
+              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">8.01. Flow elements <a class="hash" href="#common-flow">#</a> <a class="toc-bak" href="Overview.html#common-flow-toc">T</a></h2>
+        <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>
-  | <a class="ref" href="a.html#a.elem.flow">a.elem.flow</a>
-  | <a class="ref" href="p.html#p">p</a>
-  | <a class="ref" href="hr.html#hr">hr</a>
-  | <a class="ref" href="pre.html#pre">pre</a>
-  | <a class="ref" href="ul.html#ul">ul</a>
-  | <a class="ref" href="ol.html#ol">ol</a>
-  | <a class="ref" href="dl.html#dl">dl</a>
-  | <a class="ref" href="div.html#div">div</a>
-  | <a class="ref" href="h1.html#h1">h1</a>
-  | <a class="ref" href="h2.html#h2">h2</a>
-  | <a class="ref" href="h3.html#h3">h3</a>
-  | <a class="ref" href="h4.html#h4">h4</a>
-  | <a class="ref" href="h5.html#h5">h5</a>
-  | <a class="ref" href="h6.html#h6">h6</a>
-  | <a class="ref" href="hgroup.html#hgroup">hgroup</a>
-  | <a class="ref" href="address.html#address">address</a>
-  | <a class="ref" href="blockquote.html#blockquote">blockquote</a>
-  | <a class="ref" href="ins.html#ins.elem.flow">ins.elem.flow</a>
-  | <a class="ref" href="del.html#del.elem.flow">del.elem.flow</a>
-  | <a class="ref" href="object.html#object.elem.flow">object.elem.flow</a>
-  | <a class="ref" href="map.html#map.elem.flow">map.elem.flow</a>
-  | <a class="ref" href="noscript.html#noscript.elem.flow">noscript.elem.flow</a>
-  | <a class="ref" href="section.html#section">section</a>
-  | <a class="ref" href="nav.html#nav">nav</a>
-  | <a class="ref" href="article.html#article">article</a>
-  | <a class="ref" href="aside.html#aside">aside</a>
-  | <a class="ref" href="header.html#header">header</a>
-  | <a class="ref" href="footer.html#footer">footer</a>
-  | <a class="ref" href="dialog.html#dialog">dialog</a>
-  | <a class="ref" href="video.html#video.elem.flow">video.elem.flow</a>
-  | <a class="ref" href="audio.html#audio.elem.flow">audio.elem.flow</a>
-  | <a class="ref" href="figure.html#figure">figure</a>
-  | <a class="ref" href="table.html#table">table</a>
-  | <a class="ref" href="form.html#form">form</a>
-  | <a class="ref" href="fieldset.html#fieldset">fieldset</a>
-  | <a class="ref" href="datagrid.html#datagrid">datagrid</a>
-  | <a class="ref" href="menu.html#menu">menu</a>
-  | <a class="ref" href="canvas.html#canvas.elem.flow">canvas.elem.flow</a>
-  | <a class="ref" href="details.html#details">details</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="a.html#a.elem.flow">a.elem.flow</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="p.html#p">p</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="hr.html#hr">hr</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="pre.html#pre">pre</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="ul.html#ul">ul</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="ol.html#ol">ol</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="dl.html#dl">dl</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="div.html#div">div</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h1.html#h1">h1</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h2.html#h2">h2</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h3.html#h3">h3</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h4.html#h4">h4</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h5.html#h5">h5</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h6.html#h6">h6</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="hgroup.html#hgroup">hgroup</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="address.html#address">address</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="blockquote.html#blockquote">blockquote</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="ins.html#ins.elem.flow">ins.elem.flow</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="del.html#del.elem.flow">del.elem.flow</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="object.html#object.elem.flow">object.elem.flow</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="map.html#map.elem.flow">map.elem.flow</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.flow">noscript.elem.flow</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="section.html#section">section</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="nav.html#nav">nav</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="article.html#article">article</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="aside.html#aside">aside</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="header.html#header">header</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="footer.html#footer">footer</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="dialog.html#dialog">dialog</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="video.html#video.elem.flow">video.elem.flow</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="audio.html#audio.elem.flow">audio.elem.flow</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="figure.html#figure">figure</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="table.html#table">table</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="form.html#form">form</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="fieldset.html#fieldset">fieldset</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="datagrid.html#datagrid">datagrid</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="menu.html#menu">menu</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="canvas.html#canvas.elem.flow">canvas.elem.flow</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="details.html#details">details</a>
           </dd>
         </dl>
       </div>
       <div id="common-metadata" class="section">
-        <h2 class="common-subhead">8.02. Metadata elements <a class="hash" href="#common-metadata">#</a> <a class="toc-bak" href="Overview.html#common-metadata-toc">T</a></h2>
+        <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>
-  | <a class="ref" href="style.html#style-pattern">style</a>
-  | <a class="ref" href="meta.name.html#meta.name">meta.name</a>
-  | <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-  | <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-  | <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  | (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-     | <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
-  | <a class="ref" href="script.html#script">script</a>
-  | <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  | (<a class="ref" href="command.html#command">command</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="style.html#style-pattern">style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>
+                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> notAllowed)
           </dd>
         </dl>
       </div>
       <div id="common-phrasing" class="section">
-        <h2 class="common-subhead">8.03. Phrasing elements <a class="hash" href="#common-phrasing">#</a> <a class="toc-bak" href="Overview.html#common-phrasing-toc">T</a></h2>
+        <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>
-  | <a class="ref" href="em.html#em">em</a>
-  | <a class="ref" href="strong.html#strong">strong</a>
-  | <a class="ref" href="small.html#small">small</a>
-  | <a class="ref" href="mark.html#mark">mark</a>
-  | <a class="ref" href="abbr.html#abbr">abbr</a>
-  | <a class="ref" href="dfn.html#dfn">dfn</a>
-  | <a class="ref" href="i.html#i">i</a>
-  | <a class="ref" href="b.html#b">b</a>
-  | <a class="ref" href="code.html#code">code</a>
-  | <a class="ref" href="var.html#var">var</a>
-  | <a class="ref" href="samp.html#samp">samp</a>
-  | <a class="ref" href="kbd.html#kbd">kbd</a>
-  | <a class="ref" href="sup.html#sup">sup</a>
-  | <a class="ref" href="sub.html#sub">sub</a>
-  | <a class="ref" href="q.html#q">q</a>
-  | <a class="ref" href="cite.html#cite">cite</a>
-  | <a class="ref" href="span.html#span">span</a>
-  | <a class="ref" href="bdo.html#bdo">bdo</a>
-  | <a class="ref" href="br.html#br">br</a>
-  | <a class="ref" href="ins.html#ins.elem.phrasing">ins.elem.phrasing</a>
-  | <a class="ref" href="del.html#del.elem.phrasing">del.elem.phrasing</a>
-  | <a class="ref" href="img.html#img">img</a>
-  | <a class="ref" href="embed.html#embed">embed</a>
-  | <a class="ref" href="object.html#object.elem.phrasing">object.elem.phrasing</a>
-  | <a class="ref" href="iframe.html#iframe">iframe</a>
-  | <a class="ref" href="map.html#map.elem.phrasing">map.elem.phrasing</a>
-  | <a class="ref" href="area.html#area">area</a>
-  | <a class="ref" href="script.html#script">script</a>
-  | <a class="ref" href="noscript.html#noscript.elem.phrasing">noscript.elem.phrasing</a>
-  | <a class="ref" href="ruby.html#ruby">ruby</a>
-  | <a class="ref" href="video.html#video.elem.phrasing">video.elem.phrasing</a>
-  | <a class="ref" href="audio.html#audio.elem.phrasing">audio.elem.phrasing</a>
-  | <a class="ref" href="input.html#input">input</a>
-  | <a class="ref" href="textarea.html#textarea">textarea</a>
-  | <a class="ref" href="select.html#select">select</a>
-  | <a class="ref" href="button.html#button">button</a>
-  | <a class="ref" href="label.html#label">label</a>
-  | <a class="ref" href="output.html#output">output</a>
-  | <a class="ref" href="datalist.html#datalist">datalist</a>
-  | <a class="ref" href="keygen.html#keygen">keygen</a>
-  | <a class="ref" href="progress.html#progress">progress</a>
-  | <a class="ref" href="command.html#command">command</a>
-  | <a class="ref" href="bb.html#bb">bb</a>
-  | <a class="ref" href="canvas.html#canvas.elem.phrasing">canvas.elem.phrasing</a>
-  | <a class="ref" href="time.html#time">time</a>
-  | <a class="ref" href="meter.html#meter">meter</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="em.html#em">em</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="strong.html#strong">strong</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="small.html#small">small</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="mark.html#mark">mark</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="abbr.html#abbr">abbr</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="dfn.html#dfn">dfn</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="i.html#i">i</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="b.html#b">b</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="code.html#code">code</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="var.html#var">var</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="samp.html#samp">samp</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="kbd.html#kbd">kbd</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="sup.html#sup">sup</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="sub.html#sub">sub</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="q.html#q">q</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="cite.html#cite">cite</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="span.html#span">span</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="bdo.html#bdo">bdo</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="br.html#br">br</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="ins.html#ins.elem.phrasing">ins.elem.phrasing</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="del.html#del.elem.phrasing">del.elem.phrasing</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="img.html#img">img</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="embed.html#embed">embed</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="object.html#object.elem.phrasing">object.elem.phrasing</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="iframe.html#iframe">iframe</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="map.html#map.elem.phrasing">map.elem.phrasing</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="area.html#area">area</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.phrasing">noscript.elem.phrasing</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="ruby.html#ruby">ruby</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="video.html#video.elem.phrasing">video.elem.phrasing</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="audio.html#audio.elem.phrasing">audio.elem.phrasing</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="input.html#input">input</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="textarea.html#textarea">textarea</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="select.html#select">select</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="button.html#button">button</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="label.html#label">label</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="output.html#output">output</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="datalist.html#datalist">datalist</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="keygen.html#keygen">keygen</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="progress.html#progress">progress</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="command.html#command">command</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="bb.html#bb">bb</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="canvas.html#canvas.elem.phrasing">canvas.elem.phrasing</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="time.html#time">time</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meter.html#meter">meter</a>
           </dd>
         </dl>
       </div>

Index: ul.html
===================================================================
RCS file: /sources/public/html5/markup/ul.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ul.html	29 Jul 2009 11:23:46 -0000	1.9
+++ ul.html	16 Aug 2009 10:53:45 -0000	1.10
@@ -23,8 +23,8 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#ul-content">#</a></h2>
         <div class="content-models" 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>*
-      &amp; <a class="ref" href="ul.html#ul.attrs">ul.attrs</a>
+      <a class="ref" href="li.html#li-pattern">li</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="ul.html#ul.attrs">ul.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="ul-attr-mdl">

Index: input.time.html
===================================================================
RCS file: /sources/public/html5/markup/input.time.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- input.time.html	2 Aug 2009 07:07:43 -0000	1.11
+++ input.time.html	16 Aug 2009 10:53:43 -0000	1.12
@@ -31,19 +31,19 @@
         <h2 class="element-subhead">Attribute model <a class="hash" href="#input.time-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="input.time.html#input.time.attrs">input.time.attrs</a> = <span class="pattern" id="input.time.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-  &amp; <a class="ref" href="input.time.html#input.time.attrs.type" title="input.time.attrs.type">type</a>
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a>?
-  &amp; <a class="ref" href="input.time.html#input.time.attrs.min" title="input.time.attrs.min">min</a>?
-  &amp; <a class="ref" href="input.time.html#input.time.attrs.max" title="input.time.attrs.max">max</a>?
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a>?
-  &amp; <a class="ref" href="input.time.html#input.time.attrs.value" title="input.time.attrs.value">value</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.time.html#input.time.attrs.type" title="input.time.attrs.type">type</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.time.html#input.time.attrs.min" title="input.time.attrs.min">min</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.time.html#input.time.attrs.max" title="input.time.attrs.max">max</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.time.html#input.time.attrs.value" title="input.time.attrs.value">value</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="input.time-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#input.time-attributes">#</a></h2>
         <dl class="attr-defs">

--- structure.html DELETED ---

Index: strong.html
===================================================================
RCS file: /sources/public/html5/markup/strong.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- strong.html	29 Jul 2009 11:23:46 -0000	1.13
+++ strong.html	16 Aug 2009 10:53:44 -0000	1.14
@@ -22,8 +22,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="strong.html#strong.attrs">strong.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="strong.html#strong.attrs">strong.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="strong-attr-mdl">

Index: q.html
===================================================================
RCS file: /sources/public/html5/markup/q.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- q.html	2 Aug 2009 07:07:44 -0000	1.14
+++ q.html	16 Aug 2009 10:53:44 -0000	1.15
@@ -22,15 +22,15 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="q.html#q.attrs">q.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="q.html#q.attrs">q.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="q-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#q-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="q.html#q.attrs">q.attrs</a> = <span class="pattern" id="q.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="q.html#q.attrs.cite" title="q.attrs.cite">cite</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="q.html#q.attrs.cite" title="q.attrs.cite">cite</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="q-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#q-attributes">#</a></h2>
         <dl class="attr-defs">

Index: li.html
===================================================================
RCS file: /sources/public/html5/markup/li.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- li.html	2 Aug 2009 07:07:44 -0000	1.15
+++ li.html	16 Aug 2009 10:53:43 -0000	1.16
@@ -23,26 +23,26 @@
         <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>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="li.html#li.attrs">li.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <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>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="li.html#oli.attrs">oli.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <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>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="li.html#mli.attrs">mli.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="li.html#mli.attrs">mli.attrs</a>
     </span></dd>
         </dl>
       </div><div class="no-number no-toc" id="li-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#li-attr-mdl">#</a></h2>
         <dl class="attr-content-models"><dt class="attr-content-model"><a class="attribute-pattern-name" href="li.html#li.attrs">li.attrs</a> = </dt><dd><span class="pattern" id="li.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></dd><dt class="attr-content-model"><a class="attribute-pattern-name" href="li.html#oli.attrs">oli.attrs</a> = </dt><dd><span class="pattern" id="oli.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="li.html#oli.attrs.value" title="oli.attrs.value">value</a>?</span></dd><dt class="attr-content-model"><a class="attribute-pattern-name" href="li.html#mli.attrs">mli.attrs</a> = </dt><dd><span class="pattern" id="mli.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></dd></dl></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="li.html#oli.attrs.value" title="oli.attrs.value">value</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></dd><dt class="attr-content-model"><a class="attribute-pattern-name" href="li.html#mli.attrs">mli.attrs</a> = </dt><dd><span class="pattern" id="mli.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></dd></dl></div>
       <div class="no-number no-toc" id="li-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#li-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -68,11 +68,11 @@
       <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>*</li>
-        <li class="context-mdl"><a href="ol.html#ol-mdl">ol</a> = <a class="ref" href="li.html#oli">oli</a>*</li>
-        <li class="context-mdl"><a href="menu.html#menu-mdl">menu</a> = <a class="ref" href="li.html#mli">mli</a>*
-  | (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li></ul>
+        <li class="context-mdl"><a href="ul.html#ul-mdl">ul</a> = <a class="ref" href="li.html#li-pattern">li</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a></li>
+        <li class="context-mdl"><a href="ol.html#ol-mdl">ol</a> = <a class="ref" href="li.html#oli">oli</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a></li>
+        <li class="context-mdl"><a href="menu.html#menu-mdl">menu</a> = <a class="ref" href="li.html#mli">mli</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)</li></ul>
       </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.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- style.html	2 Aug 2009 07:07:45 -0000	1.15
+++ style.html	16 Aug 2009 10:53:44 -0000	1.16
@@ -24,24 +24,24 @@
         <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>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <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>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="style.html#style.scoped.attrs">style.scoped.attrs</a>
     </span></dd>
         </dl>
       </div><div class="no-number no-toc" id="style-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#style-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="style.html#style.attrs">style.attrs</a> = <span class="pattern" id="style.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="style.html#style.attrs.type" title="style.attrs.type">type</a>?
-  &amp; <a class="ref" href="style.html#style.attrs.media" title="style.attrs.media">media</a>?</span></p>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="style.html#style.attrs.type" title="style.attrs.type">type</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="style.html#style.attrs.media" title="style.attrs.media">media</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p>
           <p><a href="style.html#style.scoped.attrs">style.scoped.attrs</a> = <span class="pattern" id="style.scoped.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="style.html#style.attrs.type" title="style.attrs.type">type</a>?
-  &amp; <a class="ref" href="style.html#style.attrs.media" title="style.attrs.media">media</a>?
-  &amp; <a class="ref" href="style.html#style.attrs.scoped" title="style.attrs.scoped">scoped</a></span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="style.html#style.attrs.type" title="style.attrs.type">type</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="style.html#style.attrs.media" title="style.attrs.media">media</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="style.html#style.attrs.scoped" title="style.attrs.scoped">scoped</a></span></p></div></div>
       <div class="no-number no-toc" id="style-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#style-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -55,7 +55,10 @@
     </span> </dt>
             <dd>Specifies which media the styles apply to.</dd>
           
-            <dt><a class="attribute-name" id="style.attrs.scoped" title="style.attrs.scoped" href="style.html#style.attrs.scoped">scoped</a> = <span class="attr-values">  "scoped" |  "" </span> </dt>
+            <dt><a class="attribute-name" id="style.attrs.scoped" title="style.attrs.scoped" href="style.html#style.attrs.scoped">scoped</a> = <span class="attr-values">
+       "scoped"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
+    </span> </dt>
             <dd>Instructs the UA to
         apply the specified style information only to the <a href="style.html#style" class="element">style</a> element&#8217;s parent
         element, and that element&#8217;s child nodes. Otherwise, the
@@ -77,32 +80,33 @@
         <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>
-  | <a class="ref" href="style.html#style-pattern">style</a>
-  | <a class="ref" href="meta.name.html#meta.name">meta.name</a>
-  | <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-  | <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-  | <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  | (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-     | <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
-  | <a class="ref" href="script.html#script">script</a>
-  | <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  | (<a class="ref" href="command.html#command">command</a>)</li>
-        <li class="context-mdl"><a href="div.html#div-mdl">div</a> = <a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a>*,
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="style.html#style-pattern">style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>
+                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> notAllowed)</li>
+        <li class="context-mdl"><a href="div.html#div-mdl">div</a> = <a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)</li>
         <li class="context-mdl"><a href="noscript.html#noscript.elem.head">noscript.elem.head</a> = (<a class="ref" href="link.html#link">link</a>
-   | <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-   | <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-   | <a class="ref" href="style.html#style-pattern">style</a>)*</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>*,
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="style.html#style-pattern">style</a>)<a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a></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><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li>
-        <li class="context-mdl"><a href="article.html#article-mdl">article</a> = <a class="ref" href="style.html#style-pattern">style</a>*,
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)</li>
+        <li class="context-mdl"><a href="article.html#article-mdl">article</a> = <a class="ref" href="style.html#style-pattern">style</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li>
-        <li class="context-mdl"><a href="aside.html#aside-mdl">aside</a> = <a class="ref" href="style.html#style-pattern">style</a>*,
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)</li>
+        <li class="context-mdl"><a href="aside.html#aside-mdl">aside</a> = <a class="ref" href="style.html#style-pattern">style</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li></ul>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)</li></ul>
       </div>
       
       <div class="no-number no-toc" id="style-display">

Index: documents.html
===================================================================
RCS file: /sources/public/html5/markup/documents.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- documents.html	7 Aug 2009 14:50:29 -0000	1.9
+++ documents.html	16 Aug 2009 10:53:41 -0000	1.10
@@ -12,17 +12,22 @@
 <span class="nav-next"><a href="syntax.html">syntax &#187;</a></span>
 </div>
 <div id="documents" class="section">
-  <h2>5. Documents <a class="hash" href="#documents">#</a> <a class="toc-bak" href="Overview.html#documents-toc">T</a></h2>
+  <h2>3. Documents <a class="hash" href="#documents">#</a> <a class="toc-bak" href="Overview.html#documents-toc">T</a></h2>
+  <p>This section introduces the following:</p>
   <div class="toc">
 <ul>
-<li id="mime-types-toc"><span class="toc-section-number"></span><a href="documents.html#mime-types"><span class="toc-section-number">1.</span> The HTML namespace and MIME types</a>
+<li id="language-and-syntax-toc"><span class="toc-section-number"></span><a href="documents.html#language-and-syntax"><span class="toc-section-number">1.</span> The HTML language and HTML and XML syntaxes</a>
 </li>
-<li id="conformant-documents-toc"><span class="toc-section-number"></span><a href="documents.html#conformant-documents"><span class="toc-section-number">2.</span> Conformant documents</a>
+<li id="mime-types-toc"><span class="toc-section-number"></span><a href="documents.html#mime-types"><span class="toc-section-number">2.</span> The HTML namespace and MIME types</a>
 </li>
-<li id="case-insensitivity-toc"><span class="toc-section-number"></span><a href="documents.html#case-insensitivity"><span class="toc-section-number">3.</span> Case insensitivity in tag names and attribute names</a>
+<li id="conformant-documents-toc"><span class="toc-section-number"></span><a href="documents.html#conformant-documents"><span class="toc-section-number">3.</span> Conformant documents</a>
+</li>
+<li id="case-insensitivity-toc"><span class="toc-section-number"></span><a href="documents.html#case-insensitivity"><span class="toc-section-number">4.</span> Case insensitivity in tag names and attribute names</a>
 </li>
 </ul>
 </div>
+    <div id="language-and-syntax" class="section">
+      <h2>3.01. The HTML language and HTML and XML syntaxes <a class="hash" href="#language-and-syntax">#</a> <a class="toc-bak" href="Overview.html#language-and-syntax-toc">T</a></h2>
   <p>The term
   <dfn id="document" title="document">document</dfn> is used in this specification
   to mean an instance of the HTML language. The
@@ -49,7 +54,8 @@
   <a href="documents.html#xml-syntax">XML syntax</a>.</p>
   <p>The <dfn id="html-syntax" title="html-syntax">HTML syntax</dfn>
   is the syntax described in the
-  &#8220;HTML syntax&#8221; section of this specification.</p>
+  <a href="syntax.html">HTML syntax</a>
+  section of this specification.</p>
   <p>The
   <dfn id="xml-syntax" title="xml-syntax">XML syntax</dfn>
   is defined by rules in the XML specification
@@ -60,8 +66,9 @@
   this specification does not define any additional syntax-level
   requirements for 
   <a href="documents.html#syntax-document-xml">documents in the XML syntax</a>.</p>
+  </div>
   <div id="mime-types" class="section">
-    <h2>5.01. The HTML namespace and MIME types <a class="hash" href="#mime-types">#</a> <a class="toc-bak" href="Overview.html#mime-types-toc">T</a></h2>
+    <h2>3.02. The HTML namespace and MIME types <a class="hash" href="#mime-types">#</a> <a class="toc-bak" href="Overview.html#mime-types-toc">T</a></h2>
     <p>The
     <dfn id="html-namespace" title="html-namespace">HTML namespace</dfn>
     is defined as <code>http://www.w3.org/1999/xhtml</code>.
@@ -85,7 +92,7 @@
     <a href="documents.html#syntax-document-xml">documents in the XML syntax</a>.</p>
   </div>
   <div id="conformant-documents" class="section">
-    <h2>5.02. Conformant documents <a class="hash" href="#conformant-documents">#</a> <a class="toc-bak" href="Overview.html#conformant-documents-toc">T</a></h2>
+    <h2>3.03. Conformant documents <a class="hash" href="#conformant-documents">#</a> <a class="toc-bak" href="Overview.html#conformant-documents-toc">T</a></h2>
     <p>A conformant
     <dfn id="syntax-document-html" title="syntax-document-html">document in the HTML
       syntax</dfn> must consist of the following parts, in the
@@ -110,6 +117,10 @@
       <a href="syntax.html#syntax-comments">comments</a> and
       <a href="terminology.html#space">space characters</a>.</li>
     </ol>
+    <p><a href="documents.html#syntax-document-html">Documents in the HTML syntax</a>
+    must conform to the syntax described in the
+    <a href="documents.html#html-syntax">HTML syntax</a>
+    section of this specification.</p>
     <p>A conformant
     <dfn id="syntax-document-xml" title="syntax-document-xml">document in the XML syntax</dfn>
     must consist of the following parts, in the following order:</p>
@@ -147,7 +158,7 @@
     <a href="syntax.html#omitted">omit tags</a>).</p>
   </div>
   <div id="case-insensitivity" class="section">
-    <h2>5.03. Case insensitivity in tag names and attribute names <a class="hash" href="#case-insensitivity">#</a> <a class="toc-bak" href="Overview.html#case-insensitivity-toc">T</a></h2>
+    <h2>3.04. Case insensitivity in tag names and attribute names <a class="hash" href="#case-insensitivity">#</a> <a class="toc-bak" href="Overview.html#case-insensitivity-toc">T</a></h2>
     <p>In
     <a href="documents.html#syntax-document-html">documents in the HTML syntax</a>:</p>
     <ul>
@@ -155,9 +166,9 @@
       for
       <a href="elements.html#html-elements">HTML elements</a>
       may be written with any mix of lowercase and
-      uppercase letters that are an
-      <a href="terminology.html#ascii-case-insensitive">ASCII case-insensitive</a>
-      match for the names of the elements given in the
+      uppercase letters that are a
+      <a href="terminology.html#case-insensitive">case-insensitive match</a>
+      for the names of the elements given in the
       <a href="elements.html">HTML elements</a>
       section of this document; tag names are
       case-insensitive.</li>
@@ -166,8 +177,8 @@
       <a href="elements.html#html-elements">HTML elements</a>
       may be written with any mix of lowercase and uppercase
       letters that are an
-      <a href="terminology.html#ascii-case-insensitive">ASCII case-insensitive</a>
-      match for the names of the attributes given in the
+      <a href="terminology.html#case-insensitive">case-insensitive match</a>
+      for the names of the attributes given in the
       <a href="elements.html">HTML elements</a>
       section of this document; attribute names are
       case-insensitive.</li>

Index: del.html
===================================================================
RCS file: /sources/public/html5/markup/del.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- del.html	2 Aug 2009 07:07:42 -0000	1.17
+++ del.html	16 Aug 2009 10:53:41 -0000	1.18
@@ -24,22 +24,22 @@
         <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>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="del.html#del.attrs">del.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="del.html#del.attrs">del.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="del.html#del.attrs">del.attrs</a>
     </span></dd>
         </dl>
       </div><div class="no-number no-toc" id="del-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#del-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="del.html#del.attrs">del.attrs</a> = <span class="pattern" id="del.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="del.html#del.attrs.cite" title="del.attrs.cite">cite</a>?
-  &amp; <a class="ref" href="del.html#del.attrs.datetime" title="del.attrs.datetime">datetime</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="del.html#del.attrs.cite" title="del.attrs.cite">cite</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="del.html#del.attrs.datetime" title="del.attrs.datetime">datetime</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="del-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#del-attributes">#</a></h2>
         <dl class="attr-defs">

Index: menu.html
===================================================================
RCS file: /sources/public/html5/markup/menu.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- menu.html	2 Aug 2009 07:07:44 -0000	1.16
+++ menu.html	16 Aug 2009 10:53:43 -0000	1.17
@@ -21,23 +21,24 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#menu-content">#</a></h2>
         <div class="content-models" 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>*
-  | (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*))
-      &amp; <a class="ref" href="menu.html#menu.attrs">menu.attrs</a>
+      (<a class="ref" href="li.html#mli">li</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>))
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="menu.html#menu.attrs">menu.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="menu-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#menu-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="menu.html#menu.attrs">menu.attrs</a> = <span class="pattern" id="menu.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="menu.html#menu.attrs.type" title="menu.attrs.type">type</a>?
-  &amp; <a class="ref" href="menu.html#menu.attrs.label" title="menu.attrs.label">label</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="menu.html#menu.attrs.type" title="menu.attrs.type">type</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="menu.html#menu.attrs.label" title="menu.attrs.label">label</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="menu-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#menu-attributes">#</a></h2>
         <dl class="attr-defs">
             <dt><a class="attribute-name" id="menu.attrs.type" title="menu.attrs.type" href="menu.html#menu.attrs.type">type</a> = <span class="attr-values">
-       "toolbar" |  "context"
+       "toolbar"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  "context"
     </span> </dt>
             <dd>The kind of menu being declared. The attribute has three states:
         <ul>

Index: input.image.html
===================================================================
RCS file: /sources/public/html5/markup/input.image.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- input.image.html	2 Aug 2009 07:07:43 -0000	1.12
+++ input.image.html	16 Aug 2009 10:53:43 -0000	1.13
@@ -33,20 +33,20 @@
         <h2 class="element-subhead">Attribute model <a class="hash" href="#input.image-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="input.image.html#input.image.attrs">input.image.attrs</a> = <span class="pattern" id="input.image.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-   &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-   &amp; <a class="ref" href="input.image.html#input.image.attrs.type" title="input.image.attrs.type">type</a>
-   &amp; <a class="ref" href="input.image.html#input.image.attrs.alt" title="input.image.attrs.alt">alt</a>
-   &amp; <a class="ref" href="input.image.html#input.image.attrs.src" title="input.image.attrs.src">src</a>?)
-  &amp; (<a class="ref" href="forms-attributes.html#shared-form.attrs.formaction" title="shared-form.attrs.formaction">formaction</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.formenctype" title="shared-form.attrs.formenctype">formenctype</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.formmethod" title="shared-form.attrs.formmethod">formmethod</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.formtarget" title="shared-form.attrs.formtarget">formtarget</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.formnovalidate" title="shared-form.attrs.formnovalidate">formnovalidate</a>?
-         &amp; <a class="ref" href="input.image.html#input.image.attrs.height" title="input.image.attrs.height">height</a>?
-         &amp; <a class="ref" href="input.image.html#input.image.attrs.width" title="input.image.attrs.width">width</a>?)</span></p></div></div>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.image.html#input.image.attrs.type" title="input.image.attrs.type">type</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.image.html#input.image.attrs.alt" title="input.image.attrs.alt">alt</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.image.html#input.image.attrs.src" title="input.image.attrs.src">src</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> (<a class="ref" href="forms-attributes.html#shared-form.attrs.formaction" title="shared-form.attrs.formaction">formaction</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.formenctype" title="shared-form.attrs.formenctype">formenctype</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.formmethod" title="shared-form.attrs.formmethod">formmethod</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.formtarget" title="shared-form.attrs.formtarget">formtarget</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.formnovalidate" title="shared-form.attrs.formnovalidate">formnovalidate</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.image.html#input.image.attrs.height" title="input.image.attrs.height">height</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.image.html#input.image.attrs.width" title="input.image.attrs.width">width</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)</span></p></div></div>
       <div class="no-number no-toc" id="input.image-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#input.image-attributes">#</a></h2>
         <dl class="attr-defs">

Index: code.html
===================================================================
RCS file: /sources/public/html5/markup/code.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- code.html	29 Jul 2009 11:23:43 -0000	1.13
+++ code.html	16 Aug 2009 10:53:41 -0000	1.14
@@ -22,8 +22,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="code.html#code.attrs">code.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="code.html#code.attrs">code.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="code-attr-mdl">

Index: h2.html
===================================================================
RCS file: /sources/public/html5/markup/h2.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- h2.html	29 Jul 2009 11:23:43 -0000	1.15
+++ h2.html	16 Aug 2009 10:53:42 -0000	1.16
@@ -22,8 +22,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="h2.html#h2.attrs">h2.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="h2.html#h2.attrs">h2.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="h2-attr-mdl">
@@ -58,11 +58,11 @@
         <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>
-   | <a class="ref" href="h2.html#h2">h2</a>
-   | <a class="ref" href="h3.html#h3">h3</a>
-   | <a class="ref" href="h4.html#h4">h4</a>
-   | <a class="ref" href="h5.html#h5">h5</a>
-   | <a class="ref" href="h6.html#h6">h6</a>)+</li></ul>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h2.html#h2">h2</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h3.html#h3">h3</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h4.html#h4">h4</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h5.html#h5">h5</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h6.html#h6">h6</a>)<a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a></li></ul>
       </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.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- head.html	29 Jul 2009 11:23:43 -0000	1.9
+++ head.html	16 Aug 2009 10:53:42 -0000	1.10
@@ -22,9 +22,9 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="base.html#base">base</a>?
-  &amp; (<a class="ref" href="common-models.html#common.elem.metadata">common.elem.metadata</a>*)
-      &amp; <a class="ref" href="head.html#head.attrs">head.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="base.html#base">base</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> (<a class="ref" href="common-models.html#common.elem.metadata">common.elem.metadata</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="head.html#head.attrs">head.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="head-attr-mdl">
@@ -51,7 +51,7 @@
       <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>,
+        <li class="context-mdl"><a href="html.html#html-mdl">html</a> = <a class="ref" href="head.html#head">head</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   <a class="ref" href="body.html#body">body</a></li></ul>
       </div>
       

Index: p.html
===================================================================
RCS file: /sources/public/html5/markup/p.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- p.html	29 Jul 2009 11:23:45 -0000	1.14
+++ p.html	16 Aug 2009 10:53:44 -0000	1.15
@@ -22,8 +22,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="p.html#p.attrs">p.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="p.html#p.attrs">p.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="p-attr-mdl">

Index: map.html
===================================================================
RCS file: /sources/public/html5/markup/map.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- map.html	4 Aug 2009 15:46:33 -0000	1.16
+++ map.html	16 Aug 2009 10:53:43 -0000	1.17
@@ -24,21 +24,21 @@
         <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>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="map.html#map.attrs">map.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="map.html#map.attrs">map.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="map.html#map.attrs">map.attrs</a>
     </span></dd>
         </dl>
       </div><div class="no-number no-toc" id="map-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#map-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="map.html#map.attrs">map.attrs</a> = <span class="pattern" id="map.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="map.html#map.attrs.name" title="map.attrs.name">name</a></span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="map.html#map.attrs.name" title="map.attrs.name">name</a></span></p></div></div>
       <div class="no-number no-toc" id="map-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#map-attributes">#</a></h2>
         <dl class="attr-defs">

Index: input.file.html
===================================================================
RCS file: /sources/public/html5/markup/input.file.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- input.file.html	2 Aug 2009 07:07:43 -0000	1.11
+++ input.file.html	16 Aug 2009 10:53:42 -0000	1.12
@@ -32,14 +32,14 @@
         <h2 class="element-subhead">Attribute model <a class="hash" href="#input.file-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="input.file.html#input.file.attrs">input.file.attrs</a> = <span class="pattern" id="input.file.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-   &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-   &amp; <a class="ref" href="input.file.html#input.file.attrs.type" title="input.file.attrs.type">type</a>
-   &amp; <a class="ref" href="input.file.html#input.file.attrs.accept" title="input.file.attrs.accept">accept</a>?)
-  &amp; (<a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a>?
-         &amp; <a class="ref" href="forms-attributes.html#input.attrs.multiple" title="input.attrs.multiple">multiple</a>?)</span></p></div></div>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.file.html#input.file.attrs.type" title="input.file.attrs.type">type</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.file.html#input.file.attrs.accept" title="input.file.attrs.accept">accept</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> (<a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.multiple" title="input.attrs.multiple">multiple</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)</span></p></div></div>
       <div class="no-number no-toc" id="input.file-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#input.file-attributes">#</a></h2>
         <dl class="attr-defs">

Index: input.radio.html
===================================================================
RCS file: /sources/public/html5/markup/input.radio.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- input.radio.html	2 Aug 2009 07:07:43 -0000	1.12
+++ input.radio.html	16 Aug 2009 10:53:43 -0000	1.13
@@ -31,14 +31,14 @@
         <h2 class="element-subhead">Attribute model <a class="hash" href="#input.radio-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="input.radio.html#input.radio.attrs">input.radio.attrs</a> = <span class="pattern" id="input.radio.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-   &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-   &amp; <a class="ref" href="input.radio.html#input.radio.attrs.type" title="input.radio.attrs.type">type</a>
-   &amp; <a class="ref" href="forms-attributes.html#input.attrs.checked" title="input.attrs.checked">checked</a>?
-   &amp; <a class="ref" href="input.radio.html#input.radio.attrs.value" title="input.radio.attrs.value">value</a>?)
-  &amp; (<a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a>?)</span></p></div></div>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.radio.html#input.radio.attrs.type" title="input.radio.attrs.type">type</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.checked" title="input.attrs.checked">checked</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.radio.html#input.radio.attrs.value" title="input.radio.attrs.value">value</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> (<a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)</span></p></div></div>
       <div class="no-number no-toc" id="input.radio-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#input.radio-attributes">#</a></h2>
         <dl class="attr-defs">

Index: command.checkbox.html
===================================================================
RCS file: /sources/public/html5/markup/command.checkbox.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- command.checkbox.html	2 Aug 2009 07:07:42 -0000	1.12
+++ command.checkbox.html	16 Aug 2009 10:53:41 -0000	1.13
@@ -24,18 +24,18 @@
         <div class="content-models" 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>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="command.checkbox.html#command.checkbox.attrs">command.checkbox.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="command.checkbox-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#command.checkbox-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="command.checkbox.html#command.checkbox.attrs">command.checkbox.attrs</a> = <span class="pattern" id="command.checkbox.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; (<a class="ref" href="command.checkbox.html#command.checkbox.attrs.type" title="command.checkbox.attrs.type">type</a>
-         &amp; <a class="ref" href="command.checkbox.html#command.checkbox.attrs.checked" title="command.checkbox.attrs.checked">checked</a>?)
-  &amp; <a class="ref" href="command.checkbox.html#command.checkbox.attrs.label" title="command.checkbox.attrs.label">label</a>?
-  &amp; <a class="ref" href="command.checkbox.html#command.checkbox.attrs.icon" title="command.checkbox.attrs.icon">icon</a>?
-  &amp; <a class="ref" href="command.checkbox.html#command.checkbox.attrs.disabled" title="command.checkbox.attrs.disabled">disabled</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> (<a class="ref" href="command.checkbox.html#command.checkbox.attrs.type" title="command.checkbox.attrs.type">type</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="command.checkbox.html#command.checkbox.attrs.checked" title="command.checkbox.attrs.checked">checked</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="command.checkbox.html#command.checkbox.attrs.label" title="command.checkbox.attrs.label">label</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="command.checkbox.html#command.checkbox.attrs.icon" title="command.checkbox.attrs.icon">icon</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="command.checkbox.html#command.checkbox.attrs.disabled" title="command.checkbox.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="command.checkbox-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#command.checkbox-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -43,7 +43,10 @@
             <dd>Specifies that its <a href="command.html#command" class="element">command</a> element represents
         a state or option that can be toggled.</dd>
           
-            <dt><a class="attribute-name" id="command.checkbox.attrs.checked" title="command.checkbox.attrs.checked" href="command.checkbox.html#command.checkbox.attrs.checked">checked</a> = <span class="attr-values">  "checked" |  "" </span> </dt>
+            <dt><a class="attribute-name" id="command.checkbox.attrs.checked" title="command.checkbox.attrs.checked" href="command.checkbox.html#command.checkbox.attrs.checked">checked</a> = <span class="attr-values">
+       "checked"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
+    </span> </dt>
             <dd>Specifies that the command is selected.</dd>
           
             <dt><a class="attribute-name" id="command.checkbox.attrs.label" title="command.checkbox.attrs.label" href="command.checkbox.html#command.checkbox.attrs.label">label</a> = <span class="attr-values"><a href="datatypes.html#data-string">string</a></span> </dt>
@@ -54,7 +57,10 @@
     </span> </dt>
             <dd>A URL for an image that represents the command.</dd>
           
-            <dt><a class="attribute-name" id="command.checkbox.attrs.disabled" title="command.checkbox.attrs.disabled" href="command.checkbox.html#command.checkbox.attrs.disabled">disabled</a> = <span class="attr-values">  "disabled" |  "" </span> </dt>
+            <dt><a class="attribute-name" id="command.checkbox.attrs.disabled" title="command.checkbox.attrs.disabled" href="command.checkbox.html#command.checkbox.attrs.disabled">disabled</a> = <span class="attr-values">
+       "disabled"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
+    </span> </dt>
             <dd>Specifies that the command is not currently
         available.</dd>
           
@@ -73,16 +79,17 @@
         <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>
-  | <a class="ref" href="style.html#style-pattern">style</a>
-  | <a class="ref" href="meta.name.html#meta.name">meta.name</a>
-  | <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-  | <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-  | <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  | (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-     | <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
-  | <a class="ref" href="script.html#script">script</a>
-  | <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  | (<a class="ref" href="command.html#command">command</a>)</li>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="style.html#style-pattern">style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>
+                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> notAllowed)</li>
         <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul>
       </div>
       </div>

Index: param.html
===================================================================
RCS file: /sources/public/html5/markup/param.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- param.html	2 Aug 2009 07:07:44 -0000	1.15
+++ param.html	16 Aug 2009 10:53:44 -0000	1.16
@@ -21,15 +21,16 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#param-content">#</a></h2>
         <div class="content-models" 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>
+      empty
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="param.html#param.attrs">param.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="param-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#param-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="param.html#param.attrs">param.attrs</a> = <span class="pattern" id="param.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="param.html#param.attrs.name" title="param.attrs.name">name</a>
-  &amp; <a class="ref" href="param.html#param.attrs.value" title="param.attrs.value">value</a></span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="param.html#param.attrs.name" title="param.attrs.name">name</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="param.html#param.attrs.value" title="param.attrs.value">value</a></span></p></div></div>
       <div class="no-number no-toc" id="param-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#param-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -53,12 +54,12 @@
       <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>*,
+        <li class="context-mdl"><a href="object.html#object.elem.flow">object.elem.flow</a> = <a class="ref" href="param.html#param">param</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</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>*,
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)</li>
+        <li class="context-mdl"><a href="object.html#object.elem.phrasing">object.elem.phrasing</a> = <a class="ref" href="param.html#param">param</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)</li></ul>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)</li></ul>
       </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.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- span.html	2 Aug 2009 11:48:35 -0000	1.13
+++ span.html	16 Aug 2009 10:53:44 -0000	1.14
@@ -23,8 +23,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="span.html#span.attrs">span.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="span.html#span.attrs">span.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="span-attr-mdl">

Index: input.reset.html
===================================================================
RCS file: /sources/public/html5/markup/input.reset.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- input.reset.html	2 Aug 2009 07:07:43 -0000	1.12
+++ input.reset.html	16 Aug 2009 10:53:43 -0000	1.13
@@ -30,12 +30,12 @@
         <h2 class="element-subhead">Attribute model <a class="hash" href="#input.reset-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="input.reset.html#input.reset.attrs">input.reset.attrs</a> = <span class="pattern" id="input.reset.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-   &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-   &amp; <a class="ref" href="input.reset.html#input.reset.attrs.type" title="input.reset.attrs.type">type</a>
-   &amp; <a class="ref" href="input.reset.html#input.reset.attrs.value" title="input.reset.attrs.value">value</a>?)
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?</span></p></div></div>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.reset.html#input.reset.attrs.type" title="input.reset.attrs.type">type</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.reset.html#input.reset.attrs.value" title="input.reset.attrs.value">value</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="input.reset-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#input.reset-attributes">#</a></h2>
         <dl class="attr-defs">

Index: input.datetime-local.html
===================================================================
RCS file: /sources/public/html5/markup/input.datetime-local.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- input.datetime-local.html	2 Aug 2009 07:07:43 -0000	1.11
+++ input.datetime-local.html	16 Aug 2009 10:53:42 -0000	1.12
@@ -32,19 +32,19 @@
         <h2 class="element-subhead">Attribute model <a class="hash" href="#input.datetime-local-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="input.datetime-local.html#input.datetime-local.attrs">input.datetime-local.attrs</a> = <span class="pattern" id="input.datetime-local.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-  &amp; <a class="ref" href="input.datetime-local.html#input.datetime-local.attrs.type" title="input.datetime-local.attrs.type">type</a>
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a>?
-  &amp; <a class="ref" href="input.datetime-local.html#input.datetime-local.attrs.min" title="input.datetime-local.attrs.min">min</a>?
-  &amp; <a class="ref" href="input.datetime-local.html#input.datetime-local.attrs.max" title="input.datetime-local.attrs.max">max</a>?
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a>?
-  &amp; <a class="ref" href="input.datetime-local.html#input.datetime-local.attrs.value" title="input.datetime-local.attrs.value">value</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.datetime-local.html#input.datetime-local.attrs.type" title="input.datetime-local.attrs.type">type</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.datetime-local.html#input.datetime-local.attrs.min" title="input.datetime-local.attrs.min">min</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.datetime-local.html#input.datetime-local.attrs.max" title="input.datetime-local.attrs.max">max</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.datetime-local.html#input.datetime-local.attrs.value" title="input.datetime-local.attrs.value">value</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="input.datetime-local-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#input.datetime-local-attributes">#</a></h2>
         <dl class="attr-defs">

Index: input.color.html
===================================================================
RCS file: /sources/public/html5/markup/input.color.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- input.color.html	2 Aug 2009 07:07:43 -0000	1.12
+++ input.color.html	16 Aug 2009 10:53:42 -0000	1.13
@@ -31,14 +31,14 @@
         <h2 class="element-subhead">Attribute model <a class="hash" href="#input.color-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="input.color.html#input.color.attrs">input.color.attrs</a> = <span class="pattern" id="input.color.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-  &amp; <a class="ref" href="input.color.html#input.color.attrs.type" title="input.color.attrs.type">type</a>
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a>?
-  &amp; <a class="ref" href="input.color.html#input.color.attrs.value" title="input.color.attrs.value">value</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.color.html#input.color.attrs.type" title="input.color.attrs.type">type</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.color.html#input.color.attrs.value" title="input.color.attrs.value">value</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="input.color-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#input.color-attributes">#</a></h2>
         <dl class="attr-defs">

--- conformance.html DELETED ---

Index: common-attributes.html
===================================================================
RCS file: /sources/public/html5/markup/common-attributes.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- common-attributes.html	4 Aug 2009 15:46:32 -0000	1.21
+++ common-attributes.html	16 Aug 2009 10:53:41 -0000	1.22
@@ -12,32 +12,35 @@
 <span class="nav-next"><a href="forms-attributes.html">forms-attributes &#187;</a></span>
 </div>
 <div id="common-attributes" class="section">
-        <h2>9. Common attributes <a class="hash" href="#common-attributes">#</a> <a class="toc-bak" href="Overview.html#common-attributes-toc">T</a></h2>
+        <h2>7. Common attributes <a class="hash" href="#common-attributes">#</a> <a class="toc-bak" href="Overview.html#common-attributes-toc">T</a></h2>
+        <p>This section defines attributes that are common to
+              all elements in the
+              <a href="documents.html#html-language">HTML language</a>.</p>
         <div id="common.attrs-mdl">
         <dl class="content-models">
             <dt class="content-model"><span class="common-pattern-name"><a href="common-attributes.html#common.attrs" id="common.attrs">common.attrs</a></span> = </dt><dd><a class="ref" href="common-attributes.html#common.attrs.core" title="common.attrs.core">common.attrs.core</a>
-  &amp; <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a>
-  &amp; <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a>
             </dd>
           </dl>
         </div>
       <div id="core-attrs" class="section">
-        <h2 class="common-subhead">9.01. Core attributes <a class="hash" href="#core-attrs">#</a> <a class="toc-bak" href="Overview.html#core-attrs-toc">T</a></h2><div id="common.attrs.core-mdl">
+        <h2 class="common-subhead">7.01. Core attributes <a class="hash" href="#core-attrs">#</a> <a class="toc-bak" href="Overview.html#core-attrs-toc">T</a></h2><div id="common.attrs.core-mdl">
         
           <div class="content-models">
-            <p><span class="common-pattern-name"><a href="common-attributes.html#common.attrs.core" id="common.attrs.core">common.attrs.core</a></span> = <a class="ref" href="common-attributes.html#common.attrs.accesskey" title="common.attrs.accesskey">accesskey</a>?
-  &amp; <a class="ref" href="common-attributes.html#common.attrs.class" title="common.attrs.class">class</a>?
-  &amp; <a class="ref" href="common-attributes.html#common.attrs.contenteditable" title="common.attrs.contenteditable">contenteditable</a>?
-  &amp; <a class="ref" href="common-attributes.html#common.attrs.contextmenu" title="common.attrs.contextmenu">contextmenu</a>?
-  &amp; <a class="ref" href="common-attributes.html#common.attrs.dir" title="common.attrs.dir">dir</a>?
-  &amp; <a class="ref" href="common-attributes.html#common.attrs.draggable" title="common.attrs.draggable">draggable</a>?
-  &amp; <a class="ref" href="common-attributes.html#common.attrs.hidden" title="common.attrs.hidden">hidden</a>?
-  &amp; <a class="ref" href="common-attributes.html#common.attrs.id" title="common.attrs.id">id</a>?
-  &amp; <a class="ref" href="common-attributes.html#common.attrs.lang" title="common.attrs.lang">lang</a>?
-  &amp; <a class="ref" href="common-attributes.html#common.attrs.spellcheck" title="common.attrs.spellcheck">spellcheck</a>?
-  &amp; <a class="ref" href="common-attributes.html#common.attrs.style" title="common.attrs.style">style</a>?
-  &amp; <a class="ref" href="common-attributes.html#common.attrs.tabindex" title="common.attrs.tabindex">tabindex</a>?
-  &amp; <a class="ref" href="common-attributes.html#common.attrs.title" title="common.attrs.title">title</a>?</p>
+            <p><span class="common-pattern-name"><a href="common-attributes.html#common.attrs.core" id="common.attrs.core">common.attrs.core</a></span> = <a class="ref" href="common-attributes.html#common.attrs.accesskey" title="common.attrs.accesskey">accesskey</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#common.attrs.class" title="common.attrs.class">class</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#common.attrs.contenteditable" title="common.attrs.contenteditable">contenteditable</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#common.attrs.contextmenu" title="common.attrs.contextmenu">contextmenu</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#common.attrs.dir" title="common.attrs.dir">dir</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#common.attrs.draggable" title="common.attrs.draggable">draggable</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#common.attrs.hidden" title="common.attrs.hidden">hidden</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#common.attrs.id" title="common.attrs.id">id</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#common.attrs.lang" title="common.attrs.lang">lang</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#common.attrs.spellcheck" title="common.attrs.spellcheck">spellcheck</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#common.attrs.style" title="common.attrs.style">style</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#common.attrs.tabindex" title="common.attrs.tabindex">tabindex</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#common.attrs.title" title="common.attrs.title">title</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></p>
           </div>
         </div>
         <div class="no-number no-toc">
@@ -57,7 +60,9 @@
         classifications, to which the element belongs.</dd>
           
             <dt><a class="attribute-name" id="common.attrs.contenteditable" title="common.attrs.contenteditable" href="common-attributes.html#common.attrs.contenteditable">contenteditable</a> = <span class="attr-values">
-       "true" |  "false" |  ""
+       "true"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  "false"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
     </span> </dt>
             <dd>Specifies whether the
         <a href="syntax.html#contents">contents</a>
@@ -72,13 +77,22 @@
         with which to associate the element as a
         <dfn id="context-menu" title="context-menu">context menu</dfn>.</dd>
           
-            <dt><a class="attribute-name" id="common.attrs.dir" title="common.attrs.dir" href="common-attributes.html#common.attrs.dir">dir</a> = <span class="attr-values">  "ltr" |  "rtl" </span> </dt>
+            <dt><a class="attribute-name" id="common.attrs.dir" title="common.attrs.dir" href="common-attributes.html#common.attrs.dir">dir</a> = <span class="attr-values">
+       "ltr"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  "rtl"
+    </span> </dt>
             <dd>Specifies the element&#8217;s text directionality.</dd>
           
-            <dt><a class="attribute-name" id="common.attrs.draggable" title="common.attrs.draggable" href="common-attributes.html#common.attrs.draggable">draggable</a> = <span class="attr-values">  "true" |  "false" </span> </dt>
+            <dt><a class="attribute-name" id="common.attrs.draggable" title="common.attrs.draggable" href="common-attributes.html#common.attrs.draggable">draggable</a> = <span class="attr-values">
+       "true"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  "false"
+    </span> </dt>
             <dd>Specifies whether the element is draggable.</dd>
           
-            <dt><a class="attribute-name" id="common.attrs.hidden" title="common.attrs.hidden" href="common-attributes.html#common.attrs.hidden">hidden</a> = <span class="attr-values">  "hidden" |  "" </span> </dt>
+            <dt><a class="attribute-name" id="common.attrs.hidden" title="common.attrs.hidden" href="common-attributes.html#common.attrs.hidden">hidden</a> = <span class="attr-values">
+       "hidden"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
+    </span> </dt>
             <dd>Specifies that the element represents an element that is
         not yet, or is no longer, relevant.</dd>
           
@@ -99,7 +113,9 @@
         that contain text.</dd>
           
             <dt><a class="attribute-name" id="common.attrs.spellcheck" title="common.attrs.spellcheck" href="common-attributes.html#common.attrs.spellcheck">spellcheck</a> = <span class="attr-values">
-       "true" |  "false" |  ""
+       "true"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  "false"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
     </span> </dt>
             <dd>Specifies whether the element represents
         an element whose
@@ -126,63 +142,63 @@
             <dd>Advisory information associated with the element.</dd>
           
         </dl></div></div><div id="event-handler-attrs" class="section">
-        <h2 class="common-subhead">9.02. Event-handler attributes <a class="hash" href="#event-handler-attrs">#</a> <a class="toc-bak" href="Overview.html#event-handler-attrs-toc">T</a></h2><div id="common.attrs.event-handler-mdl">
+        <h2 class="common-subhead">7.02. Event-handler attributes <a class="hash" href="#event-handler-attrs">#</a> <a class="toc-bak" href="Overview.html#event-handler-attrs-toc">T</a></h2><div id="common.attrs.event-handler-mdl">
         
           <div class="content-models">
-            <p><span class="common-pattern-name"><a href="common-attributes.html#common.attrs.event-handler" id="common.attrs.event-handler">common.attrs.event-handler</a></span> = (<a class="ref" href="common-attributes.html#scripting.attr.onabort" title="scripting.attr.onabort">onabort</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onblur" title="scripting.attr.onblur">onblur</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.oncanplay" title="scripting.attr.oncanplay">oncanplay</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.oncanplaythrough" title="scripting.attr.oncanplaythrough">oncanplaythrough</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onchange" title="scripting.attr.onchange">onchange</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onclick" title="scripting.attr.onclick">onclick</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.oncontextmenu" title="scripting.attr.oncontextmenu">oncontextmenu</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.ondblclick" title="scripting.attr.ondblclick">ondblclick</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.ondrag" title="scripting.attr.ondrag">ondrag</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.ondragend" title="scripting.attr.ondragend">ondragend</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.ondragenter" title="scripting.attr.ondragenter">ondragenter</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.ondragleave" title="scripting.attr.ondragleave">ondragleave</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.ondragover" title="scripting.attr.ondragover">ondragover</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.ondragstart" title="scripting.attr.ondragstart">ondragstart</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.ondrop" title="scripting.attr.ondrop">ondrop</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.ondurationchange" title="scripting.attr.ondurationchange">ondurationchange</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onemptied" title="scripting.attr.onemptied">onemptied</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onended" title="scripting.attr.onended">onended</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onerror" title="scripting.attr.onerror">onerror</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onfocus" title="scripting.attr.onfocus">onfocus</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onformchange" title="scripting.attr.onformchange">onformchange</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onforminput" title="scripting.attr.onforminput">onforminput</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.oninput" title="scripting.attr.oninput">oninput</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.oninvalid" title="scripting.attr.oninvalid">oninvalid</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onkeydown" title="scripting.attr.onkeydown">onkeydown</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onkeypress" title="scripting.attr.onkeypress">onkeypress</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onkeyup" title="scripting.attr.onkeyup">onkeyup</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onload" title="scripting.attr.onload">onload</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onloadeddata" title="scripting.attr.onloadeddata">onloadeddata</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onloadedmetadata" title="scripting.attr.onloadedmetadata">onloadedmetadata</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onloadstart" title="scripting.attr.onloadstart">onloadstart</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onmousedown" title="scripting.attr.onmousedown">onmousedown</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onmousemove" title="scripting.attr.onmousemove">onmousemove</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onmouseout" title="scripting.attr.onmouseout">onmouseout</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onmouseover" title="scripting.attr.onmouseover">onmouseover</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onmouseup" title="scripting.attr.onmouseup">onmouseup</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onmousewheel" title="scripting.attr.onmousewheel">onmousewheel</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onpause" title="scripting.attr.onpause">onpause</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onplay" title="scripting.attr.onplay">onplay</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onplaying" title="scripting.attr.onplaying">onplaying</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onprogress" title="scripting.attr.onprogress">onprogress</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onratechange" title="scripting.attr.onratechange">onratechange</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onreadystatechange" title="scripting.attr.onreadystatechange">onreadystatechange</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onscroll" title="scripting.attr.onscroll">onscroll</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onseeked" title="scripting.attr.onseeked">onseeked</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onseeking" title="scripting.attr.onseeking">onseeking</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onselect" title="scripting.attr.onselect">onselect</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onshow" title="scripting.attr.onshow">onshow</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onstalled" title="scripting.attr.onstalled">onstalled</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onsubmit" title="scripting.attr.onsubmit">onsubmit</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onsuspend" title="scripting.attr.onsuspend">onsuspend</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.ontimeupdate" title="scripting.attr.ontimeupdate">ontimeupdate</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onvolumechange" title="scripting.attr.onvolumechange">onvolumechange</a>?
-   &amp; <a class="ref" href="common-attributes.html#scripting.attr.onwaiting" title="scripting.attr.onwaiting">onwaiting</a>?)</p>
+            <p><span class="common-pattern-name"><a href="common-attributes.html#common.attrs.event-handler" id="common.attrs.event-handler">common.attrs.event-handler</a></span> = (<a class="ref" href="common-attributes.html#scripting.attr.onabort" title="scripting.attr.onabort">onabort</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onblur" title="scripting.attr.onblur">onblur</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.oncanplay" title="scripting.attr.oncanplay">oncanplay</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.oncanplaythrough" title="scripting.attr.oncanplaythrough">oncanplaythrough</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onchange" title="scripting.attr.onchange">onchange</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onclick" title="scripting.attr.onclick">onclick</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.oncontextmenu" title="scripting.attr.oncontextmenu">oncontextmenu</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ondblclick" title="scripting.attr.ondblclick">ondblclick</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ondrag" title="scripting.attr.ondrag">ondrag</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ondragend" title="scripting.attr.ondragend">ondragend</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ondragenter" title="scripting.attr.ondragenter">ondragenter</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ondragleave" title="scripting.attr.ondragleave">ondragleave</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ondragover" title="scripting.attr.ondragover">ondragover</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ondragstart" title="scripting.attr.ondragstart">ondragstart</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ondrop" title="scripting.attr.ondrop">ondrop</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ondurationchange" title="scripting.attr.ondurationchange">ondurationchange</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onemptied" title="scripting.attr.onemptied">onemptied</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onended" title="scripting.attr.onended">onended</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onerror" title="scripting.attr.onerror">onerror</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onfocus" title="scripting.attr.onfocus">onfocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onformchange" title="scripting.attr.onformchange">onformchange</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onforminput" title="scripting.attr.onforminput">onforminput</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.oninput" title="scripting.attr.oninput">oninput</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.oninvalid" title="scripting.attr.oninvalid">oninvalid</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onkeydown" title="scripting.attr.onkeydown">onkeydown</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onkeypress" title="scripting.attr.onkeypress">onkeypress</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onkeyup" title="scripting.attr.onkeyup">onkeyup</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onload" title="scripting.attr.onload">onload</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onloadeddata" title="scripting.attr.onloadeddata">onloadeddata</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onloadedmetadata" title="scripting.attr.onloadedmetadata">onloadedmetadata</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onloadstart" title="scripting.attr.onloadstart">onloadstart</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onmousedown" title="scripting.attr.onmousedown">onmousedown</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onmousemove" title="scripting.attr.onmousemove">onmousemove</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onmouseout" title="scripting.attr.onmouseout">onmouseout</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onmouseover" title="scripting.attr.onmouseover">onmouseover</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onmouseup" title="scripting.attr.onmouseup">onmouseup</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onmousewheel" title="scripting.attr.onmousewheel">onmousewheel</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onpause" title="scripting.attr.onpause">onpause</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onplay" title="scripting.attr.onplay">onplay</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onplaying" title="scripting.attr.onplaying">onplaying</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onprogress" title="scripting.attr.onprogress">onprogress</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onratechange" title="scripting.attr.onratechange">onratechange</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onreadystatechange" title="scripting.attr.onreadystatechange">onreadystatechange</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onscroll" title="scripting.attr.onscroll">onscroll</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onseeked" title="scripting.attr.onseeked">onseeked</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onseeking" title="scripting.attr.onseeking">onseeking</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onselect" title="scripting.attr.onselect">onselect</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onshow" title="scripting.attr.onshow">onshow</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onstalled" title="scripting.attr.onstalled">onstalled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onsubmit" title="scripting.attr.onsubmit">onsubmit</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onsuspend" title="scripting.attr.onsuspend">onsuspend</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.ontimeupdate" title="scripting.attr.ontimeupdate">ontimeupdate</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onvolumechange" title="scripting.attr.onvolumechange">onvolumechange</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#scripting.attr.onwaiting" title="scripting.attr.onwaiting">onwaiting</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)</p>
           </div>
         </div>
         <div class="no-number no-toc">
@@ -350,12 +366,12 @@
             <dd></dd>
           
         </dl></div></div><div id="xml-attrs" class="section">
-        <h2 class="common-subhead">9.03. XML attributes <a class="hash" href="#xml-attrs">#</a> <a class="toc-bak" href="Overview.html#xml-attrs-toc">T</a></h2><div id="common.attrs.xml-mdl">
+        <h2 class="common-subhead">7.03. XML attributes <a class="hash" href="#xml-attrs">#</a> <a class="toc-bak" href="Overview.html#xml-attrs-toc">T</a></h2><div id="common.attrs.xml-mdl">
         
           <div class="content-models">
-            <p><span class="common-pattern-name"><a href="common-attributes.html#common.attrs.xml" id="common.attrs.xml">common.attrs.xml</a></span> = <a class="ref" href="common-attributes.html#common.attrs.xmllang" title="common.attrs.xmllang">xml:lang</a>?
-  &amp; <a class="ref" href="common-attributes.html#common.attrs.xmlspace" title="common.attrs.xmlspace">xml:space</a>?
-  &amp; <a class="ref" href="common-attributes.html#common.attrs.xmlbase" title="common.attrs.xmlbase">xml:base</a>?</p>
+            <p><span class="common-pattern-name"><a href="common-attributes.html#common.attrs.xml" id="common.attrs.xml">common.attrs.xml</a></span> = <a class="ref" href="common-attributes.html#common.attrs.xmllang" title="common.attrs.xmllang">xml:lang</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#common.attrs.xmlspace" title="common.attrs.xmlspace">xml:space</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-attributes.html#common.attrs.xmlbase" title="common.attrs.xmlbase">xml:base</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></p>
           </div>
         </div>
         <div class="no-number no-toc">

Index: option.html
===================================================================
RCS file: /sources/public/html5/markup/option.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- option.html	2 Aug 2009 07:07:44 -0000	1.16
+++ option.html	16 Aug 2009 10:53:44 -0000	1.17
@@ -24,21 +24,24 @@
         <div class="content-models" 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>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="option.html#option.attrs">option.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="option-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#option-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="option.html#option.attrs">option.attrs</a> = <span class="pattern" id="option.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="option.html#option.attrs.selected" title="option.attrs.selected">selected</a>?
-  &amp; <a class="ref" href="option.html#option.attrs.label" title="option.attrs.label">label</a>?
-  &amp; <a class="ref" href="option.html#option.attrs.value" title="option.attrs.value">value</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="option.html#option.attrs.selected" title="option.attrs.selected">selected</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="option.html#option.attrs.label" title="option.attrs.label">label</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="option.html#option.attrs.value" title="option.attrs.value">value</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="option-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#option-attributes">#</a></h2>
         <dl class="attr-defs">
-            <dt><a class="attribute-name" id="option.attrs.selected" title="option.attrs.selected" href="option.html#option.attrs.selected">selected</a> = <span class="attr-values">  "selected" |  "" </span> </dt>
+            <dt><a class="attribute-name" id="option.attrs.selected" title="option.attrs.selected" href="option.html#option.attrs.selected">selected</a> = <span class="attr-values">
+       "selected"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
+    </span> </dt>
             <dd>Specifies that this <a href="option.html#option" class="element">option</a> is pre-selected.</dd>
           
             <dt><a class="attribute-name" id="option.attrs.label" title="option.attrs.label" href="option.html#option.attrs.label">label</a> = <span class="attr-values"><a href="datatypes.html#data-string">string</a></span> </dt>
@@ -65,12 +68,12 @@
       <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>*</li>
-        <li class="context-mdl"><a href="select.html#select-mdl">select</a> = <a class="ref" href="optgroup.html#optgroup">optgroup</a>*
-  &amp; <a class="ref" href="option.html#option">option</a>*</li>
-        <li class="context-mdl"><a href="datalist.html#datalist-mdl">datalist</a> = <a class="ref" href="option.html#option">option</a>*
-  &amp; (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)</li></ul>
+        <li class="context-mdl"><a href="optgroup.html#optgroup-mdl">optgroup</a> = <a class="ref" href="option.html#option">option</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a></li>
+        <li class="context-mdl"><a href="select.html#select-mdl">select</a> = <a class="ref" href="optgroup.html#optgroup">optgroup</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="option.html#option">option</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a></li>
+        <li class="context-mdl"><a href="datalist.html#datalist-mdl">datalist</a> = <a class="ref" href="option.html#option">option</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)</li></ul>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: label.html
===================================================================
RCS file: /sources/public/html5/markup/label.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- label.html	2 Aug 2009 07:07:44 -0000	1.16
+++ label.html	16 Aug 2009 10:53:43 -0000	1.17
@@ -22,16 +22,16 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="label.html#label.attrs">label.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="label.html#label.attrs">label.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="label-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#label-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="label.html#label.attrs">label.attrs</a> = <span class="pattern" id="label.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-   &amp; <a class="ref" href="label.html#label.attrs.for" title="label.attrs.for">for</a>?)
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?</span></p></div></div>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="label.html#label.attrs.for" title="label.attrs.for">for</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="label-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#label-attributes">#</a></h2>
         <dl class="attr-defs">

Index: select.html
===================================================================
RCS file: /sources/public/html5/markup/select.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- select.html	2 Aug 2009 07:07:45 -0000	1.13
+++ select.html	16 Aug 2009 10:53:44 -0000	1.14
@@ -22,20 +22,20 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#select-content">#</a></h2>
         <div class="content-models" 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>*
-  &amp; <a class="ref" href="option.html#option">option</a>*
-      &amp; <a class="ref" href="select.html#select.attrs">select.attrs</a>
+      <a class="ref" href="optgroup.html#optgroup">optgroup</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="option.html#option">option</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="select.html#select.attrs">select.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="select-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#select-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="select.html#select.attrs">select.attrs</a> = <span class="pattern" id="select.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-  &amp; <a class="ref" href="select.html#select.attrs.size" title="select.attrs.size">size</a>?
-  &amp; <a class="ref" href="select.html#select.attrs.multiple" title="select.attrs.multiple">multiple</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="select.html#select.attrs.size" title="select.attrs.size">size</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="select.html#select.attrs.multiple" title="select.attrs.multiple">multiple</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="select-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#select-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -44,7 +44,10 @@
     </span> </dt>
             <dd>The number of options to show to the user.</dd>
           
-            <dt><a class="attribute-name" id="select.attrs.multiple" title="select.attrs.multiple" href="select.html#select.attrs.multiple">multiple</a> = <span class="attr-values">  "multiple" |  "" </span> </dt>
+            <dt><a class="attribute-name" id="select.attrs.multiple" title="select.attrs.multiple" href="select.html#select.attrs.multiple">multiple</a> = <span class="attr-values">
+       "multiple"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
+    </span> </dt>
             <dd>If present, indicates that its <a href="select.html#select" class="element">select</a>
         element represents a control for selecting zero or more
         options from a list of options.</dd><dd>If not present, indicates that its <a href="select.html#select">select</a> element represents a control

Index: noscript.html
===================================================================
RCS file: /sources/public/html5/markup/noscript.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- noscript.html	29 Jul 2009 11:23:45 -0000	1.14
+++ noscript.html	16 Aug 2009 10:53:43 -0000	1.15
@@ -25,22 +25,22 @@
         <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>
-   | <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-   | <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-   | <a class="ref" href="style.html#style-pattern">style</a>)*
-      &amp; <a class="ref" href="noscript.html#noscript.attrs">noscript.attrs</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="style.html#style-pattern">style</a>)<a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="noscript.html#noscript.attrs">noscript.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <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>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="noscript.html#noscript.attrs">noscript.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="noscript.html#noscript.attrs">noscript.attrs</a>
     </span></dd>
         </dl>
       </div><div class="no-number no-toc" id="noscript-attr-mdl">
@@ -76,16 +76,17 @@
         <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>
-  | <a class="ref" href="style.html#style-pattern">style</a>
-  | <a class="ref" href="meta.name.html#meta.name">meta.name</a>
-  | <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-  | <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-  | <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  | (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-     | <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
-  | <a class="ref" href="script.html#script">script</a>
-  | <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  | (<a class="ref" href="command.html#command">command</a>)</li>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="style.html#style-pattern">style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>
+                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> notAllowed)</li>
         <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li>
         <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
       </div>

Index: blockquote.html
===================================================================
RCS file: /sources/public/html5/markup/blockquote.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- blockquote.html	2 Aug 2009 07:07:42 -0000	1.15
+++ blockquote.html	16 Aug 2009 10:53:40 -0000	1.16
@@ -23,15 +23,15 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="blockquote.html#blockquote.attrs">blockquote.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="blockquote.html#blockquote.attrs">blockquote.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="blockquote-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#blockquote-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="blockquote.html#blockquote.attrs">blockquote.attrs</a> = <span class="pattern" id="blockquote.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="blockquote.html#blockquote.attrs.cite" title="blockquote.attrs.cite">cite</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="blockquote.html#blockquote.attrs.cite" title="blockquote.attrs.cite">cite</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="blockquote-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#blockquote-attributes">#</a></h2>
         <dl class="attr-defs">

Index: hr.html
===================================================================
RCS file: /sources/public/html5/markup/hr.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- hr.html	2 Aug 2009 11:48:35 -0000	1.11
+++ hr.html	16 Aug 2009 10:53:42 -0000	1.12
@@ -21,7 +21,8 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#hr-content">#</a></h2>
         <div class="content-models" 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>
+      empty
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="hr.html#hr.attrs">hr.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="hr-attr-mdl">

Index: td.html
===================================================================
RCS file: /sources/public/html5/markup/td.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- td.html	2 Aug 2009 08:15:42 -0000	1.15
+++ td.html	16 Aug 2009 10:53:45 -0000	1.16
@@ -22,17 +22,17 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="td.html#td.attrs">td.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="td.html#td.attrs">td.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="td-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#td-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="td.html#td.attrs">td.attrs</a> = <span class="pattern" id="td.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="td.html#td.attrs.colspan" title="td.attrs.colspan">colspan</a>?
-  &amp; <a class="ref" href="td.html#td.attrs.rowspan" title="td.attrs.rowspan">rowspan</a>?
-  &amp; <a class="ref" href="td.html#td.attrs.headers" title="td.attrs.headers">headers</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="td.html#td.attrs.colspan" title="td.attrs.colspan">colspan</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="td.html#td.attrs.rowspan" title="td.attrs.rowspan">rowspan</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="td.html#td.attrs.headers" title="td.attrs.headers">headers</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="td-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#td-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -78,7 +78,7 @@
         <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>
-   | <a class="ref" href="th.html#th">th</a>)*</li></ul>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="th.html#th">th</a>)<a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a></li></ul>
       </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.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- em.html	29 Jul 2009 11:23:43 -0000	1.13
+++ em.html	16 Aug 2009 10:53:42 -0000	1.14
@@ -22,8 +22,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="em.html#em.attrs">em.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="em.html#em.attrs">em.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="em-attr-mdl">

Index: figure.html
===================================================================
RCS file: /sources/public/html5/markup/figure.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- figure.html	29 Jul 2009 11:23:43 -0000	1.12
+++ figure.html	16 Aug 2009 10:53:42 -0000	1.13
@@ -23,13 +23,13 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#figure-content">#</a></h2>
         <div class="content-models" id="figure-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="figure-mdl" href="figure.html#figure-mdl" class="element">figure</a> = </span><span>
-      (<a class="ref" href="legend.html#legend">legend</a>,
+      (<a class="ref" href="legend.html#legend">legend</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
    (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*))
-  | ((<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*),
-     <a class="ref" href="legend.html#legend">legend</a>?)
-      &amp; <a class="ref" href="figure.html#figure.attrs">figure.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>))
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> ((<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)<a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+                                                                       <a class="ref" href="legend.html#legend">legend</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="figure.html#figure.attrs">figure.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="figure-attr-mdl">

Index: input.hidden.html
===================================================================
RCS file: /sources/public/html5/markup/input.hidden.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- input.hidden.html	2 Aug 2009 07:07:43 -0000	1.12
+++ input.hidden.html	16 Aug 2009 10:53:42 -0000	1.13
@@ -31,11 +31,11 @@
         <h2 class="element-subhead">Attribute model <a class="hash" href="#input.hidden-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="input.hidden.html#input.hidden.attrs">input.hidden.attrs</a> = <span class="pattern" id="input.hidden.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-  &amp; <a class="ref" href="input.hidden.html#input.hidden.attrs.type" title="input.hidden.attrs.type">type</a>
-  &amp; <a class="ref" href="input.hidden.html#input.hidden.attrs.value" title="input.hidden.attrs.value">value</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.hidden.html#input.hidden.attrs.type" title="input.hidden.attrs.type">type</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.hidden.html#input.hidden.attrs.value" title="input.hidden.attrs.value">value</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="input.hidden-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#input.hidden-attributes">#</a></h2>
         <dl class="attr-defs">

Index: caption.html
===================================================================
RCS file: /sources/public/html5/markup/caption.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- caption.html	29 Jul 2009 11:23:42 -0000	1.13
+++ caption.html	16 Aug 2009 10:53:41 -0000	1.14
@@ -22,8 +22,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="caption.html#caption.attrs">caption.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="caption.html#caption.attrs">caption.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="caption-attr-mdl">
@@ -44,15 +44,15 @@
       <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>?,
-  <a class="ref" href="colgroup.html#colgroup">colgroup</a>*,
-  <a class="ref" href="thead.html#thead">thead</a>?,
-  ((<a class="ref" href="tfoot.html#tfoot">tfoot</a>,
-    (<a class="ref" href="tbody.html#tbody">tbody</a>*
-     | <a class="ref" href="tr.html#tr">tr</a>+))
-   | ((<a class="ref" href="tbody.html#tbody">tbody</a>*
-       | <a class="ref" href="tr.html#tr">tr</a>+),
-      <a class="ref" href="tfoot.html#tfoot">tfoot</a>?))</li></ul>
+        <li class="context-mdl"><a href="table.html#table-mdl">table</a> = <a class="ref" href="caption.html#caption">caption</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+  <a class="ref" href="colgroup.html#colgroup">colgroup</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+  <a class="ref" href="thead.html#thead">thead</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+  ((<a class="ref" href="tfoot.html#tfoot">tfoot</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+    (<a class="ref" href="tbody.html#tbody">tbody</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+     <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="tr.html#tr">tr</a><a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a>))
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> ((<a class="ref" href="tbody.html#tbody">tbody</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+                                                                         <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="tr.html#tr">tr</a><a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a>)<a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+                                                                        <a class="ref" href="tfoot.html#tfoot">tfoot</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>))</li></ul>
       </div>
       
       <div class="no-number no-toc" id="caption-display">

Index: style.css
===================================================================
RCS file: /sources/public/html5/markup/style.css,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- style.css	2 Aug 2009 11:48:35 -0000	1.75
+++ style.css	16 Aug 2009 10:53:44 -0000	1.76
@@ -504,3 +504,19 @@
 .status-missing dt {
   margin-top: 8px;
 }
+a.rnc-symbol {
+  text-decoration: none;
+  color: #777;
+  font-weight: bold;
+}
+#rnc-symbol-list dt  {
+  font-weight: normal;
+  color: orangered;
+  margin-top: 6px;
+}
+#rnc-symbol-list dt span.rnc-symbol {
+  font-family: monospace;
+  font-size: 1.3em;
+  font-weight: bold;
+  color: rgb(0, 90, 156);
+}

Index: kbd.html
===================================================================
RCS file: /sources/public/html5/markup/kbd.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- kbd.html	2 Aug 2009 11:48:35 -0000	1.14
+++ kbd.html	16 Aug 2009 10:53:43 -0000	1.15
@@ -22,8 +22,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="kbd.html#kbd.attrs">kbd.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="kbd.html#kbd.attrs">kbd.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="kbd-attr-mdl">

Index: base.html
===================================================================
RCS file: /sources/public/html5/markup/base.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- base.html	4 Aug 2009 15:46:32 -0000	1.12
+++ base.html	16 Aug 2009 10:53:40 -0000	1.13
@@ -23,15 +23,16 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#base-content">#</a></h2>
         <div class="content-models" 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>
+      empty
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="base.html#base.attrs">base.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="base-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#base-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="base.html#base.attrs">base.attrs</a> = <span class="pattern" id="base.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="base.html#base.attrs.href" title="base.attrs.href">href</a>?
-  &amp; <a class="ref" href="base.html#base.attrs.target" title="base.attrs.target">target</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="base.html#base.attrs.href" title="base.attrs.href">href</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="base.html#base.attrs.target" title="base.attrs.target">target</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="base-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#base-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -62,8 +63,8 @@
         <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>
-  &amp; <a class="ref" href="base.html#base">base</a>?
-  &amp; (<a class="ref" href="common-models.html#common.elem.metadata">common.elem.metadata</a>*)</li></ul>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="base.html#base">base</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> (<a class="ref" href="common-models.html#common.elem.metadata">common.elem.metadata</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)</li></ul>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: canvas.html
===================================================================
RCS file: /sources/public/html5/markup/canvas.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- canvas.html	2 Aug 2009 07:07:42 -0000	1.13
+++ canvas.html	16 Aug 2009 10:53:41 -0000	1.14
@@ -25,22 +25,22 @@
         <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>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="canvas.html#canvas.attrs">canvas.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="canvas.html#canvas.attrs">canvas.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="canvas.html#canvas.attrs">canvas.attrs</a>
     </span></dd>
         </dl>
       </div><div class="no-number no-toc" id="canvas-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#canvas-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="canvas.html#canvas.attrs">canvas.attrs</a> = <span class="pattern" id="canvas.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="canvas.html#canvas.attrs.height" title="canvas.attrs.height">height</a>?
-  &amp; <a class="ref" href="canvas.html#canvas.attrs.width" title="canvas.attrs.width">width</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="canvas.html#canvas.attrs.height" title="canvas.attrs.height">height</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="canvas.html#canvas.attrs.width" title="canvas.attrs.width">width</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="canvas-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#canvas-attributes">#</a></h2>
         <dl class="attr-defs">

Index: input.search.html
===================================================================
RCS file: /sources/public/html5/markup/input.search.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- input.search.html	2 Aug 2009 07:07:43 -0000	1.13
+++ input.search.html	16 Aug 2009 10:53:43 -0000	1.14
@@ -31,20 +31,20 @@
         <h2 class="element-subhead">Attribute model <a class="hash" href="#input.search-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="input.search.html#input.search.attrs">input.search.attrs</a> = <span class="pattern" id="input.search.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-  &amp; <a class="ref" href="input.search.html#input.search.attrs.type" title="input.search.attrs.type">type</a>
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a>?
-  &amp; <a class="ref" href="input.search.html#input.search.attrs.value" title="input.search.attrs.value">value</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.search.html#input.search.attrs.type" title="input.search.attrs.type">type</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.search.html#input.search.attrs.value" title="input.search.attrs.value">value</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="input.search-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#input.search-attributes">#</a></h2>
         <dl class="attr-defs">

Index: tfoot.html
===================================================================
RCS file: /sources/public/html5/markup/tfoot.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- tfoot.html	29 Jul 2009 11:23:46 -0000	1.9
+++ tfoot.html	16 Aug 2009 10:53:45 -0000	1.10
@@ -22,8 +22,8 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#tfoot-content">#</a></h2>
         <div class="content-models" 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>*
-      &amp; <a class="ref" href="tfoot.html#tfoot.attrs">tfoot.attrs</a>
+      <a class="ref" href="tr.html#tr">tr</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="tfoot.html#tfoot.attrs">tfoot.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="tfoot-attr-mdl">
@@ -47,15 +47,15 @@
       <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>?,
-  <a class="ref" href="colgroup.html#colgroup">colgroup</a>*,
-  <a class="ref" href="thead.html#thead">thead</a>?,
-  ((<a class="ref" href="tfoot.html#tfoot">tfoot</a>,
-    (<a class="ref" href="tbody.html#tbody">tbody</a>*
-     | <a class="ref" href="tr.html#tr">tr</a>+))
-   | ((<a class="ref" href="tbody.html#tbody">tbody</a>*
-       | <a class="ref" href="tr.html#tr">tr</a>+),
-      <a class="ref" href="tfoot.html#tfoot">tfoot</a>?))</li></ul>
+        <li class="context-mdl"><a href="table.html#table-mdl">table</a> = <a class="ref" href="caption.html#caption">caption</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+  <a class="ref" href="colgroup.html#colgroup">colgroup</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+  <a class="ref" href="thead.html#thead">thead</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+  ((<a class="ref" href="tfoot.html#tfoot">tfoot</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+    (<a class="ref" href="tbody.html#tbody">tbody</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+     <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="tr.html#tr">tr</a><a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a>))
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> ((<a class="ref" href="tbody.html#tbody">tbody</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+                                                                         <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="tr.html#tr">tr</a><a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a>)<a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+                                                                        <a class="ref" href="tfoot.html#tfoot">tfoot</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>))</li></ul>
       </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.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- rt.html	29 Jul 2009 11:23:45 -0000	1.13
+++ rt.html	16 Aug 2009 10:53:44 -0000	1.14
@@ -22,8 +22,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="rt.html#rt.attrs">rt.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="rt.html#rt.attrs">rt.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="rt-attr-mdl">
@@ -48,11 +48,11 @@
         <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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*),
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)<a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
    (<a class="ref" href="rt.html#rt">rt</a>
-    | (<a class="ref" href="rp.html#rp">rp</a>,
-       <a class="ref" href="rt.html#rt">rt</a>,
-       <a class="ref" href="rp.html#rp">rp</a>)))+</li></ul>
+    <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="rp.html#rp">rp</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+                                                                         <a class="ref" href="rt.html#rt">rt</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+                                                                         <a class="ref" href="rp.html#rp">rp</a>)))<a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a></li></ul>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: fieldset.html
===================================================================
RCS file: /sources/public/html5/markup/fieldset.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- fieldset.html	1 Aug 2009 16:46:31 -0000	1.15
+++ fieldset.html	16 Aug 2009 10:53:42 -0000	1.16
@@ -21,20 +21,23 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#fieldset-content">#</a></h2>
         <div class="content-models" 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>?,
+      <a class="ref" href="legend.html#legend">legend</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="fieldset.html#fieldset.attrs">fieldset.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="fieldset.html#fieldset.attrs">fieldset.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="fieldset-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#fieldset-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="fieldset.html#fieldset.attrs">fieldset.attrs</a> = <span class="pattern" id="fieldset.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>)
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?</span></p></div></div>
-      
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
+      <div class="no-number no-toc" id="fieldset-attributes">
+        <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#fieldset-attributes">#</a></h2>
+        <dl class="attr-defs">
+        </dl></div>
       
       <div class="no-number no-toc" id="fieldset-tags">
         <h2 class="element-subhead">Tag omission <a class="hash" href="#fieldset-tags">#</a></h2>

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- spec.html	9 Aug 2009 15:15:19 -0000	1.93
+++ spec.html	16 Aug 2009 10:53:44 -0000	1.94
@@ -9,7 +9,7 @@
 <body>
 <div class="head">
 <h1>HTML 5: The Markup Language</h1>
-<h2>Editor&#8217;s Draft <em>9 August 2009</em>
+<h2>Editor&#8217;s Draft <em>16 August 2009</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -41,7 +41,7 @@
     
     
[...6278 lines suppressed...]
         <div class="content-models">
           <div>
@@ -16130,7 +16400,7 @@
     </div>
       </div>
       <div id="form.data.emailaddresslist-mdl" class="section">
-        <h2 class="common-subhead">11.43. Emailaddresslist <a class="hash" href="#form.data.emailaddresslist-mdl">#</a>
+        <h2 class="common-subhead">9.43. Emailaddresslist <a class="hash" href="#form.data.emailaddresslist-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>
@@ -16141,7 +16411,7 @@
     </div>
       </div>
       <div id="form.data.color-mdl" class="section">
-        <h2 class="common-subhead">11.44. Color <a class="hash" href="#form.data.color-mdl">#</a>
+        <h2 class="common-subhead">9.44. Color <a class="hash" href="#form.data.color-mdl">#</a>
 </h2>
         <div class="content-models">
           <div>

Index: datalist.html
===================================================================
RCS file: /sources/public/html5/markup/datalist.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- datalist.html	2 Aug 2009 11:48:35 -0000	1.14
+++ datalist.html	16 Aug 2009 10:53:41 -0000	1.15
@@ -23,10 +23,10 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#datalist-content">#</a></h2>
         <div class="content-models" 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>*
-  &amp; (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="datalist.html#datalist.attrs">datalist.attrs</a>
+      <a class="ref" href="option.html#option">option</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="datalist.html#datalist.attrs">datalist.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="datalist-attr-mdl">

Index: h1.html
===================================================================
RCS file: /sources/public/html5/markup/h1.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- h1.html	29 Jul 2009 11:23:43 -0000	1.15
+++ h1.html	16 Aug 2009 10:53:42 -0000	1.16
@@ -22,8 +22,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="h1.html#h1.attrs">h1.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="h1.html#h1.attrs">h1.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="h1-attr-mdl">
@@ -58,11 +58,11 @@
         <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>
-   | <a class="ref" href="h2.html#h2">h2</a>
-   | <a class="ref" href="h3.html#h3">h3</a>
-   | <a class="ref" href="h4.html#h4">h4</a>
-   | <a class="ref" href="h5.html#h5">h5</a>
-   | <a class="ref" href="h6.html#h6">h6</a>)+</li></ul>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h2.html#h2">h2</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h3.html#h3">h3</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h4.html#h4">h4</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h5.html#h5">h5</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h6.html#h6">h6</a>)<a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a></li></ul>
       </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.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- h3.html	29 Jul 2009 11:23:43 -0000	1.15
+++ h3.html	16 Aug 2009 10:53:42 -0000	1.16
@@ -22,8 +22,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="h3.html#h3.attrs">h3.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="h3.html#h3.attrs">h3.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="h3-attr-mdl">
@@ -58,11 +58,11 @@
         <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>
-   | <a class="ref" href="h2.html#h2">h2</a>
-   | <a class="ref" href="h3.html#h3">h3</a>
-   | <a class="ref" href="h4.html#h4">h4</a>
-   | <a class="ref" href="h5.html#h5">h5</a>
-   | <a class="ref" href="h6.html#h6">h6</a>)+</li></ul>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h2.html#h2">h2</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h3.html#h3">h3</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h4.html#h4">h4</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h5.html#h5">h5</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h6.html#h6">h6</a>)<a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a></li></ul>
       </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.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- optgroup.html	2 Aug 2009 07:07:44 -0000	1.12
+++ optgroup.html	16 Aug 2009 10:53:44 -0000	1.13
@@ -21,16 +21,16 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#optgroup-content">#</a></h2>
         <div class="content-models" 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>*
-      &amp; <a class="ref" href="optgroup.html#optgroup.attrs">optgroup.attrs</a>
+      <a class="ref" href="option.html#option">option</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="optgroup.html#optgroup.attrs">optgroup.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="optgroup-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#optgroup-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="optgroup.html#optgroup.attrs">optgroup.attrs</a> = <span class="pattern" id="optgroup.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="optgroup.html#optgroup.attrs.label" title="optgroup.attrs.label">label</a>
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="optgroup.html#optgroup.attrs.label" title="optgroup.attrs.label">label</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="optgroup-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#optgroup-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -57,8 +57,8 @@
       <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>*
-  &amp; <a class="ref" href="option.html#option">option</a>*</li></ul>
+        <li class="context-mdl"><a href="select.html#select-mdl">select</a> = <a class="ref" href="optgroup.html#optgroup">optgroup</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="option.html#option">option</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a></li></ul>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: input.week.html
===================================================================
RCS file: /sources/public/html5/markup/input.week.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- input.week.html	2 Aug 2009 07:07:43 -0000	1.11
+++ input.week.html	16 Aug 2009 10:53:43 -0000	1.12
@@ -31,19 +31,19 @@
         <h2 class="element-subhead">Attribute model <a class="hash" href="#input.week-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="input.week.html#input.week.attrs">input.week.attrs</a> = <span class="pattern" id="input.week.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-  &amp; <a class="ref" href="input.week.html#input.week.attrs.type" title="input.week.attrs.type">type</a>
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a>?
-  &amp; <a class="ref" href="input.week.html#input.week.attrs.min" title="input.week.attrs.min">min</a>?
-  &amp; <a class="ref" href="input.week.html#input.week.attrs.max" title="input.week.attrs.max">max</a>?
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.step.integer" title="input.attrs.step.integer">step.integer</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a>?
-  &amp; <a class="ref" href="input.week.html#input.week.attrs.value" title="input.week.attrs.value">value</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.week.html#input.week.attrs.type" title="input.week.attrs.type">type</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.week.html#input.week.attrs.min" title="input.week.attrs.min">min</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.week.html#input.week.attrs.max" title="input.week.attrs.max">max</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.step.integer" title="input.attrs.step.integer">step.integer</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.week.html#input.week.attrs.value" title="input.week.attrs.value">value</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="input.week-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#input.week-attributes">#</a></h2>
         <dl class="attr-defs">

Index: button.button.html
===================================================================
RCS file: /sources/public/html5/markup/button.button.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- button.button.html	2 Aug 2009 07:07:42 -0000	1.18
+++ button.button.html	16 Aug 2009 10:53:41 -0000	1.19
@@ -24,20 +24,20 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="button.button.html#button.button.attrs">button.button.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="button.button.html#button.button.attrs">button.button.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="button.button-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#button.button-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="button.button.html#button.button.attrs">button.button.attrs</a> = <span class="pattern" id="button.button.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-   &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-   &amp; <a class="ref" href="button.button.html#button.button.attrs.type" title="button.button.attrs.type">type</a>
-   &amp; <a class="ref" href="button.button.html#button.button.attrs.value" title="button.button.attrs.value">value</a>?)
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?</span></p></div></div>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="button.button.html#button.button.attrs.type" title="button.button.attrs.type">type</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="button.button.html#button.button.attrs.value" title="button.button.attrs.value">value</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="button.button-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#button.button-attributes">#</a></h2>
         <dl class="attr-defs">

Index: form.html
===================================================================
RCS file: /sources/public/html5/markup/form.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- form.html	4 Aug 2009 15:46:33 -0000	1.18
+++ form.html	16 Aug 2009 10:53:42 -0000	1.19
@@ -22,22 +22,22 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="form.html#form.attrs">form.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="form.html#form.attrs">form.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="form-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#form-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="form.html#form.attrs">form.attrs</a> = <span class="pattern" id="form.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-   &amp; <a class="ref" href="form.html#form.attrs.action" title="form.attrs.action">action</a>?
-   &amp; <a class="ref" href="form.html#form.attrs.method" title="form.attrs.method">method</a>?
-   &amp; <a class="ref" href="form.html#form.attrs.enctype" title="form.attrs.enctype">enctype</a>?
-   &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-   &amp; <a class="ref" href="form.html#form.attrs.accept-charset" title="form.attrs.accept-charset">accept-charset</a>?)
-  &amp; (<a class="ref" href="form.html#form.attrs.novalidate" title="form.attrs.novalidate">novalidate</a>?
-         &amp; <a class="ref" href="form.html#form.attrs.target" title="form.attrs.target">target</a>?
-         &amp; <a class="ref" href="form.html#form.attrs.autocomplete" title="form.attrs.autocomplete">autocomplete</a>?)</span></p></div></div>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="form.html#form.attrs.action" title="form.attrs.action">action</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="form.html#form.attrs.method" title="form.attrs.method">method</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="form.html#form.attrs.enctype" title="form.attrs.enctype">enctype</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="form.html#form.attrs.accept-charset" title="form.attrs.accept-charset">accept-charset</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> (<a class="ref" href="form.html#form.attrs.novalidate" title="form.attrs.novalidate">novalidate</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="form.html#form.attrs.target" title="form.attrs.target">target</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="form.html#form.attrs.autocomplete" title="form.attrs.autocomplete">autocomplete</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)</span></p></div></div>
       <div class="no-number no-toc" id="form-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#form-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -47,14 +47,15 @@
             <dd>The submission action for the form.</dd>
           
             <dt><a class="attribute-name" id="form.attrs.method" title="form.attrs.method" href="form.html#form.attrs.method">method</a> = <span class="attr-values">( "get"
-   |  "post")
-  | ( "put" |  "delete")</span> </dt>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  "post")
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> ( "put"
+                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  "delete")</span> </dt>
             <dd>The HTTP method with which a UA is meant to associate
         this element for form submission.</dd>
           
             <dt><a class="attribute-name" id="form.attrs.enctype" title="form.attrs.enctype" href="form.html#form.attrs.enctype">enctype</a> = <span class="attr-values">( "application/x-www-form-urlencoded"
-   |  "multipart/form-data")
-  |  "text/plain"</span> </dt>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  "multipart/form-data")
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  "text/plain"</span> </dt>
             <dd>A MIME type with which a UA is meant to associate the
         form contents for form submission.</dd>
           
@@ -64,7 +65,10 @@
             <dd>Specifies the character encodings used for form
         submission.</dd>
           
-            <dt><a class="attribute-name" id="form.attrs.novalidate" title="form.attrs.novalidate" href="form.html#form.attrs.novalidate">novalidate</a> = <span class="attr-values">  "novalidate" |  "" </span> </dt>
+            <dt><a class="attribute-name" id="form.attrs.novalidate" title="form.attrs.novalidate" href="form.html#form.attrs.novalidate">novalidate</a> = <span class="attr-values">
+       "novalidate"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
+    </span> </dt>
             <dd>Specifies that the element represents a form that is not
         meant to be validated during form submission.</dd>
           
@@ -74,7 +78,10 @@
             <dd>A browsing context or keyword that represents the target
         of the form.</dd>
           
-            <dt><a class="attribute-name" id="form.attrs.autocomplete" title="form.attrs.autocomplete" href="form.html#form.attrs.autocomplete">autocomplete</a> = <span class="attr-values">  "on" |  "off" </span> </dt>
+            <dt><a class="attribute-name" id="form.attrs.autocomplete" title="form.attrs.autocomplete" href="form.html#form.attrs.autocomplete">autocomplete</a> = <span class="attr-values">
+       "on"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  "off"
+    </span> </dt>
             <dd>Specifies whether the element represents a form for
         which by default a UA is meant to store the values entered
         into its <a href="input.html#input" class="element">input</a>

Index: small.html
===================================================================
RCS file: /sources/public/html5/markup/small.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- small.html	29 Jul 2009 11:23:46 -0000	1.13
+++ small.html	16 Aug 2009 10:53:44 -0000	1.14
@@ -23,8 +23,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="small.html#small.attrs">small.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="small.html#small.attrs">small.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="small-attr-mdl">

Index: ruby.html
===================================================================
RCS file: /sources/public/html5/markup/ruby.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ruby.html	29 Jul 2009 11:23:45 -0000	1.13
+++ ruby.html	16 Aug 2009 10:53:44 -0000	1.14
@@ -22,12 +22,12 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*),
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)<a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
    (<a class="ref" href="rt.html#rt">rt</a>
-    | (<a class="ref" href="rp.html#rp">rp</a>,
-       <a class="ref" href="rt.html#rt">rt</a>,
-       <a class="ref" href="rp.html#rp">rp</a>)))+
-      &amp; <a class="ref" href="ruby.html#ruby.attrs">ruby.attrs</a>
+    <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="rp.html#rp">rp</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+                                                                         <a class="ref" href="rt.html#rt">rt</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+                                                                         <a class="ref" href="rp.html#rp">rp</a>)))<a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="ruby.html#ruby.attrs">ruby.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="ruby-attr-mdl">

Index: ol.html
===================================================================
RCS file: /sources/public/html5/markup/ol.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ol.html	2 Aug 2009 07:07:44 -0000	1.11
+++ ol.html	16 Aug 2009 10:53:44 -0000	1.12
@@ -23,16 +23,16 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#ol-content">#</a></h2>
         <div class="content-models" 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>*
-      &amp; <a class="ref" href="ol.html#ol.attrs">ol.attrs</a>
+      <a class="ref" href="li.html#oli">li</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="ol.html#ol.attrs">ol.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="ol-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#ol-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="ol.html#ol.attrs">ol.attrs</a> = <span class="pattern" id="ol.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="ol.html#ol.attrs.start" title="ol.attrs.start">start</a>?
-  &amp; <a class="ref" href="ol.html#ol.attrs.reversed" title="ol.attrs.reversed">reversed</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="ol.html#ol.attrs.start" title="ol.attrs.start">start</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="ol.html#ol.attrs.reversed" title="ol.attrs.reversed">reversed</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="ol-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#ol-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -41,7 +41,10 @@
     </span> </dt>
             <dd>The ordinal value of the first list item.</dd>
           
-            <dt><a class="attribute-name" id="ol.attrs.reversed" title="ol.attrs.reversed" href="ol.html#ol.attrs.reversed">reversed</a> = <span class="attr-values">  "reversed" |  "" </span> </dt>
+            <dt><a class="attribute-name" id="ol.attrs.reversed" title="ol.attrs.reversed" href="ol.html#ol.attrs.reversed">reversed</a> = <span class="attr-values">
+       "reversed"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
+    </span> </dt>
             <dd>If present, indicates that the list is a descending
         list (&#8230;, 3, 2, 1).</dd><dd>If not present, indicates that the list is an ascending
         list (1, 2, 3, &#8230;).</dd>

Index: article.html
===================================================================
RCS file: /sources/public/html5/markup/article.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- article.html	2 Aug 2009 07:07:42 -0000	1.17
+++ article.html	16 Aug 2009 10:53:40 -0000	1.18
@@ -23,18 +23,18 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#article-content">#</a></h2>
         <div class="content-models" 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>*,
+      <a class="ref" href="style.html#style-pattern">style</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="article.html#article.attrs">article.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="article.html#article.attrs">article.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="article-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#article-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="article.html#article.attrs">article.attrs</a> = <span class="pattern" id="article.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="article.html#article.attrs.cite" title="article.attrs.cite">cite</a>?
-  &amp; <a class="ref" href="article.html#article.attrs.pubdate" title="article.attrs.pubdate">pubdate</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="article.html#article.attrs.cite" title="article.attrs.cite">cite</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="article.html#article.attrs.pubdate" title="article.attrs.pubdate">pubdate</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="article-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#article-attributes">#</a></h2>
         <dl class="attr-defs">

Index: dialog.html
===================================================================
RCS file: /sources/public/html5/markup/dialog.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- dialog.html	2 Aug 2009 11:48:35 -0000	1.9
+++ dialog.html	16 Aug 2009 10:53:41 -0000	1.10
@@ -21,9 +21,9 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#dialog-content">#</a></h2>
         <div class="content-models" id="dialog-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="dialog-mdl" href="dialog.html#dialog-mdl" class="element">dialog</a> = </span><span>
-      (<a class="ref" href="dt.html#dt">dt</a>,
-   <a class="ref" href="dd.html#dd">dd</a>)*
-      &amp; <a class="ref" href="dialog.html#dialog.attrs">dialog.attrs</a>
+      (<a class="ref" href="dt.html#dt">dt</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+   <a class="ref" href="dd.html#dd">dd</a>)<a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="dialog.html#dialog.attrs">dialog.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="dialog-attr-mdl">

Index: elements.html
===================================================================
RCS file: /sources/public/html5/markup/elements.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- elements.html	2 Aug 2009 07:07:42 -0000	1.17
+++ elements.html	16 Aug 2009 10:53:41 -0000	1.18
@@ -12,7 +12,7 @@
 <span class="nav-next"><a href="common-models.html">common-models &#187;</a></span>
 </div>
 <div id="elements" class="section">
-        <h2>7. HTML elements <a class="hash" href="#elements">#</a> <a class="toc-bak" href="Overview.html#elements-toc">T</a></h2><p>The complete set of
+        <h2>5. HTML elements <a class="hash" href="#elements">#</a> <a class="toc-bak" href="Overview.html#elements-toc">T</a></h2><p>The complete set of
               <dfn id="html-elements" title="html-elements">HTML elements</dfn>
               is the set of elements described in the following
               sections.</p><div class="toc">
@@ -281,7 +281,7 @@
 </li>
 <li id="th-toc"><span class="toc-section-number"></span><a href="th.html#th"><span class="toc-section-number"></span> <span class="element">th</span> &#8211; <span class="shortdesc">table header cell</span></a>
 </li>
-<li id="thead-toc"><span class="toc-section-number"></span><a href="thead.html#thead"><span class="toc-section-number"></span> <span class="element">thead</span> &#8211; <span class="shortdesc">table header row group</span></a>
+<li id="thead-toc"><span class="toc-section-number"></span><a href="thead.html#thead"><span class="toc-section-number"></span> <span class="element">thead</span> &#8211; <span class="shortdesc">table heading group</span></a>
 </li>
 <li id="time-toc"><span class="toc-section-number"></span><a href="time.html#time"><span class="toc-section-number"></span> <span class="element">time</span> &#8211; <span class="shortdesc">date and/or time</span></a>
 </li>

Index: colgroup.html
===================================================================
RCS file: /sources/public/html5/markup/colgroup.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- colgroup.html	2 Aug 2009 07:07:42 -0000	1.10
+++ colgroup.html	16 Aug 2009 10:53:41 -0000	1.11
@@ -22,9 +22,9 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#colgroup-content">#</a></h2>
         <div class="content-models" 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>*
-  | <a href="colgroup.html#colgroup.attrs.span-mdl"><span class="attr-qualifier">colgroup.attrs.</span>span</a>?)
-      &amp; <a class="ref" href="colgroup.html#colgroup.attrs">colgroup.attrs</a>
+      (<a class="ref" href="col.html#col">col</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a href="colgroup.html#colgroup.attrs.span-mdl"><span class="attr-qualifier">colgroup.attrs.</span>span</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="colgroup.html#colgroup.attrs">colgroup.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="colgroup-attr-mdl">
@@ -57,15 +57,15 @@
       <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>?,
-  <a class="ref" href="colgroup.html#colgroup">colgroup</a>*,
-  <a class="ref" href="thead.html#thead">thead</a>?,
-  ((<a class="ref" href="tfoot.html#tfoot">tfoot</a>,
-    (<a class="ref" href="tbody.html#tbody">tbody</a>*
-     | <a class="ref" href="tr.html#tr">tr</a>+))
-   | ((<a class="ref" href="tbody.html#tbody">tbody</a>*
-       | <a class="ref" href="tr.html#tr">tr</a>+),
-      <a class="ref" href="tfoot.html#tfoot">tfoot</a>?))</li></ul>
+        <li class="context-mdl"><a href="table.html#table-mdl">table</a> = <a class="ref" href="caption.html#caption">caption</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+  <a class="ref" href="colgroup.html#colgroup">colgroup</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+  <a class="ref" href="thead.html#thead">thead</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+  ((<a class="ref" href="tfoot.html#tfoot">tfoot</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+    (<a class="ref" href="tbody.html#tbody">tbody</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+     <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="tr.html#tr">tr</a><a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a>))
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> ((<a class="ref" href="tbody.html#tbody">tbody</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+                                                                         <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="tr.html#tr">tr</a><a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a>)<a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+                                                                        <a class="ref" href="tfoot.html#tfoot">tfoot</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>))</li></ul>
       </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.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- dl.html	2 Aug 2009 11:48:35 -0000	1.10
+++ dl.html	16 Aug 2009 10:53:41 -0000	1.11
@@ -21,9 +21,9 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#dl-content">#</a></h2>
         <div class="content-models" 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>+,
-   <a class="ref" href="dd.html#dd">dd</a>+)*
-      &amp; <a class="ref" href="dl.html#dl.attrs">dl.attrs</a>
+      (<a class="ref" href="dt.html#dt">dt</a><a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+   <a class="ref" href="dd.html#dd">dd</a><a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a>)<a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="dl.html#dl.attrs">dl.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="dl-attr-mdl">

Index: thead.html
===================================================================
RCS file: /sources/public/html5/markup/thead.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- thead.html	29 Jul 2009 11:23:46 -0000	1.9
+++ thead.html	16 Aug 2009 10:53:45 -0000	1.10
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>HTML5: thead &#8211; table header row group</title>
+<title>HTML5: thead &#8211; table heading group</title>
 <link rel="stylesheet" href="style.css" type="text/css"></link>
 <link rel="stylesheet" href="W3C-ED.css" type="text/css"></link>
 </head>
@@ -12,18 +12,20 @@
 <span class="nav-next"><a href="time.html">time &#187;</a></span>
 </div>
 <div id="thead" class="section">
-      <h2 class="element-head"><span class="element">thead</span> &#8211; <span class="shortdesc">table header row group</span> <a class="hash" href="#thead">#</a> <a class="toc-bak" href="Overview.html#thead-toc">T</a></h2>
+      <h2 class="element-head"><span class="element">thead</span> &#8211; <span class="shortdesc">table heading group</span> <a class="hash" href="#thead">#</a> <a class="toc-bak" href="Overview.html#thead-toc">T</a></h2>
       <div id="thead-longdesc" class="longdesc">
     <p>The <a href="thead.html#thead" class="element">thead</a> element
     represents the block of rows that consist of the column labels
-    (headers) for its parent <a href="table.html#table" class="element">table</a> element.</p>
+    (headings) for its parent
+    <a href="table.html#table" class="element">table</a>
+    element.</p>
   </div>
       <div class="no-number no-toc" id="thead-content">
         <h2 class="element-subhead">Content model <a class="hash" href="#thead-content">#</a></h2>
         <div class="content-models" 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>*
-      &amp; <a class="ref" href="thead.html#thead.attrs">thead.attrs</a>
+      <a class="ref" href="tr.html#tr">tr</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="thead.html#thead.attrs">thead.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="thead-attr-mdl">
@@ -47,15 +49,15 @@
       <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>?,
-  <a class="ref" href="colgroup.html#colgroup">colgroup</a>*,
-  <a class="ref" href="thead.html#thead">thead</a>?,
-  ((<a class="ref" href="tfoot.html#tfoot">tfoot</a>,
-    (<a class="ref" href="tbody.html#tbody">tbody</a>*
-     | <a class="ref" href="tr.html#tr">tr</a>+))
-   | ((<a class="ref" href="tbody.html#tbody">tbody</a>*
-       | <a class="ref" href="tr.html#tr">tr</a>+),
-      <a class="ref" href="tfoot.html#tfoot">tfoot</a>?))</li></ul>
+        <li class="context-mdl"><a href="table.html#table-mdl">table</a> = <a class="ref" href="caption.html#caption">caption</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+  <a class="ref" href="colgroup.html#colgroup">colgroup</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+  <a class="ref" href="thead.html#thead">thead</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+  ((<a class="ref" href="tfoot.html#tfoot">tfoot</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+    (<a class="ref" href="tbody.html#tbody">tbody</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+     <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="tr.html#tr">tr</a><a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a>))
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> ((<a class="ref" href="tbody.html#tbody">tbody</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+                                                                         <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="tr.html#tr">tr</a><a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a>)<a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+                                                                        <a class="ref" href="tfoot.html#tfoot">tfoot</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>))</li></ul>
       </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.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- tbody.html	29 Jul 2009 11:23:46 -0000	1.9
+++ tbody.html	16 Aug 2009 10:53:45 -0000	1.10
@@ -23,8 +23,8 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#tbody-content">#</a></h2>
         <div class="content-models" 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>*
-      &amp; <a class="ref" href="tbody.html#tbody.attrs">tbody.attrs</a>
+      <a class="ref" href="tr.html#tr">tr</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="tbody.html#tbody.attrs">tbody.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="tbody-attr-mdl">
@@ -51,15 +51,15 @@
       <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>?,
-  <a class="ref" href="colgroup.html#colgroup">colgroup</a>*,
-  <a class="ref" href="thead.html#thead">thead</a>?,
-  ((<a class="ref" href="tfoot.html#tfoot">tfoot</a>,
-    (<a class="ref" href="tbody.html#tbody">tbody</a>*
-     | <a class="ref" href="tr.html#tr">tr</a>+))
-   | ((<a class="ref" href="tbody.html#tbody">tbody</a>*
-       | <a class="ref" href="tr.html#tr">tr</a>+),
-      <a class="ref" href="tfoot.html#tfoot">tfoot</a>?))</li></ul>
+        <li class="context-mdl"><a href="table.html#table-mdl">table</a> = <a class="ref" href="caption.html#caption">caption</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+  <a class="ref" href="colgroup.html#colgroup">colgroup</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+  <a class="ref" href="thead.html#thead">thead</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+  ((<a class="ref" href="tfoot.html#tfoot">tfoot</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+    (<a class="ref" href="tbody.html#tbody">tbody</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+     <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="tr.html#tr">tr</a><a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a>))
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> ((<a class="ref" href="tbody.html#tbody">tbody</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>
+                                                                         <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="tr.html#tr">tr</a><a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a>)<a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+                                                                        <a class="ref" href="tfoot.html#tfoot">tfoot</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>))</li></ul>
       </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.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- video.html	2 Aug 2009 07:07:45 -0000	1.16
+++ video.html	16 Aug 2009 10:53:45 -0000	1.17
@@ -23,31 +23,31 @@
         <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>
-   | <a class="ref" href="source.html#source">source</a>*),
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="source.html#source">source</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)<a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="video.html#video.attrs">video.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <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>
-   | <a class="ref" href="source.html#source">source</a>*),
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="source.html#source">source</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)<a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="video.html#video.attrs">video.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="video.html#video.attrs">video.attrs</a>
     </span></dd>
         </dl>
       </div><div class="no-number no-toc" id="video-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#video-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="video.html#video.attrs">video.attrs</a> = <span class="pattern" id="video.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="video.html#video.attrs.autoplay" title="video.attrs.autoplay">autoplay</a>?
-  &amp; <a class="ref" href="video.html#video.attrs.autobuffer" title="video.attrs.autobuffer">autobuffer</a>?
-  &amp; <a class="ref" href="video.html#video.attrs.controls" title="video.attrs.controls">controls</a>?
-  &amp; <a class="ref" href="video.html#video.attrs.loop" title="video.attrs.loop">loop</a>?
-  &amp; <a class="ref" href="video.html#video.attrs.poster" title="video.attrs.poster">poster</a>?
-  &amp; <a class="ref" href="video.html#video.attrs.height" title="video.attrs.height">height</a>?
-  &amp; <a class="ref" href="video.html#video.attrs.width" title="video.attrs.width">width</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="video.html#video.attrs.autoplay" title="video.attrs.autoplay">autoplay</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="video.html#video.attrs.autobuffer" title="video.attrs.autobuffer">autobuffer</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="video.html#video.attrs.controls" title="video.attrs.controls">controls</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="video.html#video.attrs.loop" title="video.attrs.loop">loop</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="video.html#video.attrs.poster" title="video.attrs.poster">poster</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="video.html#video.attrs.height" title="video.attrs.height">height</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="video.html#video.attrs.width" title="video.attrs.width">width</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="video-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#video-attributes">#</a></h2>
         <dl class="attr-defs">

Index: source.html
===================================================================
RCS file: /sources/public/html5/markup/source.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- source.html	2 Aug 2009 11:48:35 -0000	1.18
+++ source.html	16 Aug 2009 10:53:44 -0000	1.19
@@ -23,16 +23,17 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#source-content">#</a></h2>
         <div class="content-models" 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>
+      empty
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="source.html#source.attrs">source.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="source-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#source-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="source.html#source.attrs">source.attrs</a> = <span class="pattern" id="source.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="source.html#source.attrs.src" title="source.attrs.src">src</a>
-  &amp; <a class="ref" href="source.html#source.attrs.type" title="source.attrs.type">type</a>?
-  &amp; <a class="ref" href="source.html#source.attrs.media" title="source.attrs.media">media</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="source.html#source.attrs.src" title="source.attrs.src">src</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="source.html#source.attrs.type" title="source.attrs.type">type</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="source.html#source.attrs.media" title="source.attrs.media">media</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="source-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#source-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -72,21 +73,21 @@
         <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>
-   | <a class="ref" href="source.html#source">source</a>*),
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="source.html#source">source</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)<a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)</li>
         <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>
-   | <a class="ref" href="source.html#source">source</a>*),
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="source.html#source">source</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)<a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)</li>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)</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>
-   | <a class="ref" href="source.html#source">source</a>*),
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="source.html#source">source</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)<a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)</li>
         <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>
-   | <a class="ref" href="source.html#source">source</a>*),
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="source.html#source">source</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)<a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)</li></ul>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)</li></ul>
       </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.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- button.reset.html	2 Aug 2009 07:07:42 -0000	1.18
+++ button.reset.html	16 Aug 2009 10:53:41 -0000	1.19
@@ -24,20 +24,20 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="button.reset.html#button.reset.attrs">button.reset.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="button.reset.html#button.reset.attrs">button.reset.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="button.reset-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#button.reset-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="button.reset.html#button.reset.attrs">button.reset.attrs</a> = <span class="pattern" id="button.reset.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-   &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-   &amp; <a class="ref" href="button.reset.html#button.reset.attrs.type" title="button.reset.attrs.type">type</a>
-   &amp; <a class="ref" href="button.reset.html#button.reset.attrs.value" title="button.reset.attrs.value">value</a>?)
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?</span></p></div></div>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="button.reset.html#button.reset.attrs.type" title="button.reset.attrs.type">type</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="button.reset.html#button.reset.attrs.value" title="button.reset.attrs.value">value</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="button.reset-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#button.reset-attributes">#</a></h2>
         <dl class="attr-defs">

Index: meta.charset.html
===================================================================
RCS file: /sources/public/html5/markup/meta.charset.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- meta.charset.html	2 Aug 2009 07:07:44 -0000	1.13
+++ meta.charset.html	16 Aug 2009 10:53:43 -0000	1.14
@@ -24,14 +24,14 @@
         <div class="content-models" 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>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="meta.charset.html#meta.charset.attrs">meta.charset.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="meta.charset-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#meta.charset-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="meta.charset.html#meta.charset.attrs">meta.charset.attrs</a> = <span class="pattern" id="meta.charset.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="meta.charset.html#meta.charset.attrs.charset" title="meta.charset.attrs.charset">charset</a></span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="meta.charset.html#meta.charset.attrs.charset" title="meta.charset.attrs.charset">charset</a></span></p></div></div>
       <div class="no-number no-toc" id="meta.charset-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#meta.charset-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -65,16 +65,17 @@
         <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>
-  | <a class="ref" href="style.html#style-pattern">style</a>
-  | <a class="ref" href="meta.name.html#meta.name">meta.name</a>
-  | <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
-  | <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
-  | <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
-  | (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
-     | <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
-  | <a class="ref" href="script.html#script">script</a>
-  | <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
-  | (<a class="ref" href="command.html#command">command</a>)</li></ul>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="style.html#style-pattern">style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.name.html#meta.name">meta.name</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="meta.charset.html#meta.charset">meta.charset</a>
+                                                                       <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a>)
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="script.html#script">script</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a>
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="command.html#command">command</a>
+                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> notAllowed)</li></ul>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: output.html
===================================================================
RCS file: /sources/public/html5/markup/output.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- output.html	2 Aug 2009 07:07:44 -0000	1.15
+++ output.html	16 Aug 2009 10:53:44 -0000	1.16
@@ -22,17 +22,17 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="output.html#output.attrs">output.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="output.html#output.attrs">output.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="output-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#output-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="output.html#output.attrs">output.attrs</a> = <span class="pattern" id="output.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-  &amp; <a class="ref" href="output.html#output.attrs.for" title="output.attrs.for">for</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="output.html#output.attrs.for" title="output.attrs.for">for</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="output-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#output-attributes">#</a></h2>
         <dl class="attr-defs">

Index: i.html
===================================================================
RCS file: /sources/public/html5/markup/i.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- i.html	2 Aug 2009 11:48:35 -0000	1.14
+++ i.html	16 Aug 2009 10:53:42 -0000	1.15
@@ -24,8 +24,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="i.html#i.attrs">i.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="i.html#i.attrs">i.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="i-attr-mdl">

Index: input.submit.html
===================================================================
RCS file: /sources/public/html5/markup/input.submit.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- input.submit.html	2 Aug 2009 07:07:43 -0000	1.12
+++ input.submit.html	16 Aug 2009 10:53:43 -0000	1.13
@@ -30,17 +30,17 @@
         <h2 class="element-subhead">Attribute model <a class="hash" href="#input.submit-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="input.submit.html#input.submit.attrs">input.submit.attrs</a> = <span class="pattern" id="input.submit.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-   &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-   &amp; <a class="ref" href="input.submit.html#input.submit.attrs.type" title="input.submit.attrs.type">type</a>
-   &amp; <a class="ref" href="input.submit.html#input.submit.attrs.value" title="input.submit.attrs.value">value</a>?)
-  &amp; (<a class="ref" href="forms-attributes.html#shared-form.attrs.formaction" title="shared-form.attrs.formaction">formaction</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.formenctype" title="shared-form.attrs.formenctype">formenctype</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.formmethod" title="shared-form.attrs.formmethod">formmethod</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.formtarget" title="shared-form.attrs.formtarget">formtarget</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.formnovalidate" title="shared-form.attrs.formnovalidate">formnovalidate</a>?)</span></p></div></div>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.submit.html#input.submit.attrs.type" title="input.submit.attrs.type">type</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.submit.html#input.submit.attrs.value" title="input.submit.attrs.value">value</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> (<a class="ref" href="forms-attributes.html#shared-form.attrs.formaction" title="shared-form.attrs.formaction">formaction</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.formenctype" title="shared-form.attrs.formenctype">formenctype</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.formmethod" title="shared-form.attrs.formmethod">formmethod</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.formtarget" title="shared-form.attrs.formtarget">formtarget</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.formnovalidate" title="shared-form.attrs.formnovalidate">formnovalidate</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)</span></p></div></div>
       <div class="no-number no-toc" id="input.submit-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#input.submit-attributes">#</a></h2>
         <dl class="attr-defs">

Index: input.date.html
===================================================================
RCS file: /sources/public/html5/markup/input.date.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- input.date.html	2 Aug 2009 07:07:43 -0000	1.11
+++ input.date.html	16 Aug 2009 10:53:42 -0000	1.12
@@ -31,19 +31,19 @@
         <h2 class="element-subhead">Attribute model <a class="hash" href="#input.date-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="input.date.html#input.date.attrs">input.date.attrs</a> = <span class="pattern" id="input.date.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-  &amp; <a class="ref" href="input.date.html#input.date.attrs.type" title="input.date.attrs.type">type</a>
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a>?
-  &amp; <a class="ref" href="input.date.html#input.date.attrs.min" title="input.date.attrs.min">min</a>?
-  &amp; <a class="ref" href="input.date.html#input.date.attrs.max" title="input.date.attrs.max">max</a>?
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.step.integer" title="input.attrs.step.integer">step.integer</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a>?
-  &amp; <a class="ref" href="input.date.html#input.date.attrs.value" title="input.date.attrs.value">value</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.date.html#input.date.attrs.type" title="input.date.attrs.type">type</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.date.html#input.date.attrs.min" title="input.date.attrs.min">min</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.date.html#input.date.attrs.max" title="input.date.attrs.max">max</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.step.integer" title="input.attrs.step.integer">step.integer</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.date.html#input.date.attrs.value" title="input.date.attrs.value">value</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="input.date-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#input.date-attributes">#</a></h2>
         <dl class="attr-defs">

Index: var.html
===================================================================
RCS file: /sources/public/html5/markup/var.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- var.html	29 Jul 2009 11:23:46 -0000	1.13
+++ var.html	16 Aug 2009 10:53:45 -0000	1.14
@@ -24,8 +24,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="var.html#var.attrs">var.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="var.html#var.attrs">var.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="var-attr-mdl">

Index: sub.html
===================================================================
RCS file: /sources/public/html5/markup/sub.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- sub.html	29 Jul 2009 11:23:46 -0000	1.13
+++ sub.html	16 Aug 2009 10:53:44 -0000	1.14
@@ -22,8 +22,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="sub.html#sub.attrs">sub.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="sub.html#sub.attrs">sub.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="sub-attr-mdl">

Index: title.html
===================================================================
RCS file: /sources/public/html5/markup/title.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- title.html	29 Jul 2009 11:23:46 -0000	1.12
+++ title.html	16 Aug 2009 10:53:45 -0000	1.13
@@ -22,7 +22,7 @@
         <div class="content-models" 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>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="title.html#title.attrs">title.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="title-attr-mdl">
@@ -44,8 +44,8 @@
         <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>
-  &amp; <a class="ref" href="base.html#base">base</a>?
-  &amp; (<a class="ref" href="common-models.html#common.elem.metadata">common.elem.metadata</a>*)</li></ul>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="base.html#base">base</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> (<a class="ref" href="common-models.html#common.elem.metadata">common.elem.metadata</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)</li></ul>
       </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.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- pre.html	29 Jul 2009 11:23:45 -0000	1.13
+++ pre.html	16 Aug 2009 10:53:44 -0000	1.14
@@ -24,8 +24,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="pre.html#pre.attrs">pre.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="pre.html#pre.attrs">pre.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="pre-attr-mdl">

Index: button.submit.html
===================================================================
RCS file: /sources/public/html5/markup/button.submit.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- button.submit.html	2 Aug 2009 07:07:42 -0000	1.18
+++ button.submit.html	16 Aug 2009 10:53:41 -0000	1.19
@@ -24,25 +24,25 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="button.submit.html#button.submit.attrs">button.submit.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="button.submit.html#button.submit.attrs">button.submit.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="button.submit-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#button.submit-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="button.submit.html#button.submit.attrs">button.submit.attrs</a> = <span class="pattern" id="button.submit.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-   &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-   &amp; <a class="ref" href="button.submit.html#button.submit.attrs.type" title="button.submit.attrs.type">type</a>?
-   &amp; <a class="ref" href="button.submit.html#button.submit.attrs.value" title="button.submit.attrs.value">value</a>?)
-  &amp; (<a class="ref" href="forms-attributes.html#shared-form.attrs.formaction" title="shared-form.attrs.formaction">formaction</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.formenctype" title="shared-form.attrs.formenctype">formenctype</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.formmethod" title="shared-form.attrs.formmethod">formmethod</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.formtarget" title="shared-form.attrs.formtarget">formtarget</a>?
-         &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.formnovalidate" title="shared-form.attrs.formnovalidate">formnovalidate</a>?)</span></p></div></div>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="button.submit.html#button.submit.attrs.type" title="button.submit.attrs.type">type</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+   <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="button.submit.html#button.submit.attrs.value" title="button.submit.attrs.value">value</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> (<a class="ref" href="forms-attributes.html#shared-form.attrs.formaction" title="shared-form.attrs.formaction">formaction</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.formenctype" title="shared-form.attrs.formenctype">formenctype</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.formmethod" title="shared-form.attrs.formmethod">formmethod</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.formtarget" title="shared-form.attrs.formtarget">formtarget</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+                                                                                       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.formnovalidate" title="shared-form.attrs.formnovalidate">formnovalidate</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>)</span></p></div></div>
       <div class="no-number no-toc" id="button.submit-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#button.submit-attributes">#</a></h2>
         <dl class="attr-defs">

Index: rp.html
===================================================================
RCS file: /sources/public/html5/markup/rp.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- rp.html	29 Jul 2009 11:23:45 -0000	1.13
+++ rp.html	16 Aug 2009 10:53:44 -0000	1.14
@@ -24,8 +24,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="rp.html#rp.attrs">rp.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="rp.html#rp.attrs">rp.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="rp-attr-mdl">
@@ -50,11 +50,11 @@
         <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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*),
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)<a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
    (<a class="ref" href="rt.html#rt">rt</a>
-    | (<a class="ref" href="rp.html#rp">rp</a>,
-       <a class="ref" href="rt.html#rt">rt</a>,
-       <a class="ref" href="rp.html#rp">rp</a>)))+</li></ul>
+    <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> (<a class="ref" href="rp.html#rp">rp</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+                                                                         <a class="ref" href="rt.html#rt">rt</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
+                                                                         <a class="ref" href="rp.html#rp">rp</a>)))<a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a></li></ul>
       </div>
       </div>
 <hr class="footerbreak"></hr>

Index: sup.html
===================================================================
RCS file: /sources/public/html5/markup/sup.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- sup.html	29 Jul 2009 11:23:46 -0000	1.13
+++ sup.html	16 Aug 2009 10:53:45 -0000	1.14
@@ -22,8 +22,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="sup.html#sup.attrs">sup.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="sup.html#sup.attrs">sup.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="sup-attr-mdl">

Index: forms-attributes.html
===================================================================
RCS file: /sources/public/html5/markup/forms-attributes.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- forms-attributes.html	5 Aug 2009 13:23:16 -0000	1.1
+++ forms-attributes.html	16 Aug 2009 10:53:42 -0000	1.2
@@ -12,15 +12,29 @@
 <span class="nav-next"><a href="datatypes.html">datatypes &#187;</a></span>
 </div>
 <div id="forms-attributes" class="section">
-        <h2>10. Forms attributes <a class="hash" href="#forms-attributes">#</a> <a class="toc-bak" href="Overview.html#forms-attributes-toc">T</a></h2>
+        <h2>8. Forms attributes <a class="hash" href="#forms-attributes">#</a> <a class="toc-bak" href="Overview.html#forms-attributes-toc">T</a></h2>
+    <p>This section defines attributes that are common to
+              a number of forms elements.</p>
     <dl class="attr-defs">
-        <dt><dfn class="attribute-name" id="input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</dfn> = <span class="attr-values">  "on" |  "off" </span><a class="hash" href="forms-attributes.html#input.attrs.autocomplete">#</a></dt><dd>Specifies whether the element represents an input
+        <dt><dfn class="attribute-name" id="input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</dfn> = <span class="attr-values">
+       "on"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  "off"
+    </span><a class="hash" href="forms-attributes.html#input.attrs.autocomplete">#</a></dt><dd>Specifies whether the element represents an input
         control for which a UA is meant to store the value entered
         by the user (so that the UA can prefill the form
-        later).</dd><dt><dfn class="attribute-name" id="shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</dfn> = <span class="attr-values">  "autofocus" |  "" </span><a class="hash" href="forms-attributes.html#shared-form.attrs.autofocus">#</a></dt><dd>Specifies that the element represents a control to which
+        later).</dd><dt><dfn class="attribute-name" id="shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</dfn> = <span class="attr-values">
+       "autofocus"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
+    </span><a class="hash" href="forms-attributes.html#shared-form.attrs.autofocus">#</a></dt><dd>Specifies that the element represents a control to which
         a UA is meant to give focus as soon as the document is
-        loaded.</dd><dt><dfn class="attribute-name" id="input.attrs.checked" title="input.attrs.checked">checked</dfn> = <span class="attr-values">  "checked" |  "" </span><a class="hash" href="forms-attributes.html#input.attrs.checked">#</a></dt><dd>Specifies that the element represents a selected
-        control.</dd><dt><dfn class="attribute-name" id="common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</dfn> = <span class="attr-values">  "disabled" |  "" </span><a class="hash" href="forms-attributes.html#common-form.attrs.disabled">#</a></dt><dd>Specifies that the element represents a disabled
+        loaded.</dd><dt><dfn class="attribute-name" id="input.attrs.checked" title="input.attrs.checked">checked</dfn> = <span class="attr-values">
+       "checked"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
+    </span><a class="hash" href="forms-attributes.html#input.attrs.checked">#</a></dt><dd>Specifies that the element represents a selected
+        control.</dd><dt><dfn class="attribute-name" id="common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</dfn> = <span class="attr-values">
+       "disabled"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
+    </span><a class="hash" href="forms-attributes.html#common-form.attrs.disabled">#</a></dt><dd>Specifies that the element represents a disabled
         control.</dd><dt><dfn class="attribute-name" id="common-form.attrs.form" title="common-form.attrs.form">form</dfn> = <span class="attr-values">
       <a class="ref" href="datatypes.html#common.data.idref" title="common.data.idref">idref</a>
     </span><a class="hash" href="forms-attributes.html#common-form.attrs.form">#</a></dt><dd>A
@@ -29,17 +43,18 @@
       <a class="ref" href="datatypes.html#common.data.uri" title="common.data.uri">uri</a>
     </span><a class="hash" href="forms-attributes.html#shared-form.attrs.formaction">#</a></dt><dd>The form-submission action for the element.</dd><dt><dfn class="attribute-name" id="shared-form.attrs.formenctype" title="shared-form.attrs.formenctype">formenctype</dfn> = <span class="attr-values">
        "application/x-www-form-urlencoded"
-  |  "multipart/form-data"
-  |  "text/plain"
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  "multipart/form-data"
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  "text/plain"
     </span><a class="hash" href="forms-attributes.html#shared-form.attrs.formenctype">#</a></dt><dd>A MIME type with which a UA is meant to associate this
         element for form submission.</dd><dt><dfn class="attribute-name" id="shared-form.attrs.formmethod" title="shared-form.attrs.formmethod">formmethod</dfn> = <span class="attr-values">
        "get"
-  |  "post"
-  |  "put"
-  |  "delete"
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  "post"
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  "put"
+  <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  "delete"
     </span><a class="hash" href="forms-attributes.html#shared-form.attrs.formmethod">#</a></dt><dd>The HTTP method with which a UA is meant to associate
         this element for form submission.</dd><dt><dfn class="attribute-name" id="shared-form.attrs.formnovalidate" title="shared-form.attrs.formnovalidate">formnovalidate</dfn> = <span class="attr-values">
-       "formnovalidate" |  ""
+       "formnovalidate"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
     </span><a class="hash" href="forms-attributes.html#shared-form.attrs.formnovalidate">#</a></dt><dd>Specifies that the element represents a control whose
         value is not meant to be validated during form
         submission.</dd><dt><dfn class="attribute-name" id="shared-form.attrs.formtarget" title="shared-form.attrs.formtarget">formtarget</dfn> = <span class="attr-values">
@@ -51,25 +66,34 @@
         <a href="datalist.html#datalist" class="element">datalist</a>
         with which to associate the element.</dd><dt><dfn class="attribute-name" id="shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</dfn> = <span class="attr-values">
       <a class="ref" href="datatypes.html#common.data.integer.positive" title="common.data.integer.positive">integer.positive</a>
-    </span><a class="hash" href="forms-attributes.html#shared-form.attrs.maxlength">#</a></dt><dd>The maximum allowed value length of the element.</dd><dt><dfn class="attribute-name" id="input.attrs.multiple" title="input.attrs.multiple">multiple</dfn> = <span class="attr-values">  "multiple" |  "" </span><a class="hash" href="forms-attributes.html#input.attrs.multiple">#</a></dt><dd>Specifies that the element allows multiple values.</dd><dt><dfn class="attribute-name" id="common-form.attrs.name" title="common-form.attrs.name">name</dfn> = <span class="attr-values"> string </span><a class="hash" href="forms-attributes.html#common-form.attrs.name">#</a></dt><dd>The name part of the name/value pair associated with this
+    </span><a class="hash" href="forms-attributes.html#shared-form.attrs.maxlength">#</a></dt><dd>The maximum allowed value length of the element.</dd><dt><dfn class="attribute-name" id="input.attrs.multiple" title="input.attrs.multiple">multiple</dfn> = <span class="attr-values">
+       "multiple"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
+    </span><a class="hash" href="forms-attributes.html#input.attrs.multiple">#</a></dt><dd>Specifies that the element allows multiple values.</dd><dt><dfn class="attribute-name" id="common-form.attrs.name" title="common-form.attrs.name">name</dfn> = <span class="attr-values"> string </span><a class="hash" href="forms-attributes.html#common-form.attrs.name">#</a></dt><dd>The name part of the name/value pair associated with this
         element for the purposes of form submission.</dd><dt><dfn class="attribute-name" id="shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</dfn> = <span class="attr-values">
       <a class="ref" href="datatypes.html#form.data.pattern" title="form.data.pattern">pattern</a>
     </span><a class="hash" href="forms-attributes.html#shared-form.attrs.pattern">#</a></dt><dd>Specifies a regular expression against which a UA is
         meant to check the value of the control represented by its
         element.</dd><dt><dfn class="attribute-name" id="shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</dfn> = <span class="attr-values"> string </span><a class="hash" href="forms-attributes.html#shared-form.attrs.placeholder">#</a></dt><dd>A short hint (one word or a short phrase) intended to
         aid the user when entering data into the control
-        represented by its element.</dd><dt><dfn class="attribute-name" id="shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</dfn> = <span class="attr-values">  "readonly" |  "" </span><a class="hash" href="forms-attributes.html#shared-form.attrs.readonly">#</a></dt><dd>Specifies that element represents a control whose value
-        is not meant to be edited.</dd><dt><dfn class="attribute-name" id="shared-form.attrs.required" title="shared-form.attrs.required">required</dfn> = <span class="attr-values">  "required" |  "" </span><a class="hash" href="forms-attributes.html#shared-form.attrs.required">#</a></dt><dd>Specifies that the element is a required part of form
+        represented by its element.</dd><dt><dfn class="attribute-name" id="shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</dfn> = <span class="attr-values">
+       "readonly"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
+    </span><a class="hash" href="forms-attributes.html#shared-form.attrs.readonly">#</a></dt><dd>Specifies that element represents a control whose value
+        is not meant to be edited.</dd><dt><dfn class="attribute-name" id="shared-form.attrs.required" title="shared-form.attrs.required">required</dfn> = <span class="attr-values">
+       "required"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
+    </span><a class="hash" href="forms-attributes.html#shared-form.attrs.required">#</a></dt><dd>Specifies that the element is a required part of form
       submission.</dd><dt><dfn class="attribute-name" id="shared-form.attrs.size" title="shared-form.attrs.size">size</dfn> = <span class="attr-values">
       <a class="ref" href="datatypes.html#common.data.integer.positive" title="common.data.integer.positive">integer.positive</a>
     </span><a class="hash" href="forms-attributes.html#shared-form.attrs.size">#</a></dt><dd>The number of options meant to be shown by the control
         represented by its element.</dd><dt><dfn class="attribute-name" id="input.attrs.step.float" title="input.attrs.step.float">step<span class="attr-qualifier">.float</span></dfn> = <span class="attr-values">
        "any"
-      | <a class="ref" href="datatypes.html#common.data.float.positive" title="common.data.float.positive">float.positive</a>
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="datatypes.html#common.data.float.positive" title="common.data.float.positive">float.positive</a>
     </span><a class="hash" href="forms-attributes.html#input.attrs.step.float">#</a></dt><dd>Specifies the value granularity of the element&#8217;s
         value.</dd><dt><dfn class="attribute-name" id="input.attrs.step.integer" title="input.attrs.step.integer">step<span class="attr-qualifier">.integer</span></dfn> = <span class="attr-values">
        "any"
-      | <a class="ref" href="datatypes.html#common.data.integer.positive" title="common.data.integer.positive">integer.positive</a>
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="datatypes.html#common.data.integer.positive" title="common.data.integer.positive">integer.positive</a>
     </span><a class="hash" href="forms-attributes.html#input.attrs.step.integer">#</a></dt><dd>Specifies the value granularity of the element&#8217;s
         value.</dd>
         </dl>

Index: details.html
===================================================================
RCS file: /sources/public/html5/markup/details.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- details.html	2 Aug 2009 07:07:42 -0000	1.13
+++ details.html	16 Aug 2009 10:53:41 -0000	1.14
@@ -22,21 +22,24 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#details-content">#</a></h2>
         <div class="content-models" id="details-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="details-mdl" href="details.html#details-mdl" class="element">details</a> = </span><span>
-      <a class="ref" href="legend.html#legend">legend</a>,
+      <a class="ref" href="legend.html#legend">legend</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
   (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
-  &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
-      &amp; <a class="ref" href="details.html#details.attrs">details.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="details.html#details.attrs">details.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="details-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#details-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="details.html#details.attrs">details.attrs</a> = <span class="pattern" id="details.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="details.html#details.attrs.open" title="details.attrs.open">open</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="details.html#details.attrs.open" title="details.attrs.open">open</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="details-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#details-attributes">#</a></h2>
         <dl class="attr-defs">
-            <dt><a class="attribute-name" id="details.attrs.open" title="details.attrs.open" href="details.html#details.attrs.open">open</a> = <span class="attr-values">  "open" |  "" </span> </dt>
+            <dt><a class="attribute-name" id="details.attrs.open" title="details.attrs.open" href="details.html#details.attrs.open">open</a> = <span class="attr-values">
+       "open"
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a>  ""
+    </span> </dt>
             <dd>Specifies that the contents of the
         <a href="details.html#details" class="element">details</a> element
         should be shown to the user.</dd>

Index: input.url.html
===================================================================
RCS file: /sources/public/html5/markup/input.url.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- input.url.html	2 Aug 2009 07:07:43 -0000	1.11
+++ input.url.html	16 Aug 2009 10:53:43 -0000	1.12
@@ -31,20 +31,20 @@
         <h2 class="element-subhead">Attribute model <a class="hash" href="#input.url-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="input.url.html#input.url.attrs">input.url.attrs</a> = <span class="pattern" id="input.url.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?
-  &amp; <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>?
-  &amp; <a class="ref" href="input.url.html#input.url.attrs.type" title="input.url.attrs.type">type</a>
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?
-  &amp; <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a>?
-  &amp; <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a>?
-  &amp; <a class="ref" href="input.url.html#input.url.attrs.value" title="input.url.attrs.value">value</a>?</span></p></div></div>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.url.html#input.url.attrs.type" title="input.url.attrs.type">type</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="input.url.html#input.url.attrs.value" title="input.url.attrs.value">value</a><a href="terminology.html#optional" title="OPTIONAL (ZERO OR ONE)" class="rnc-symbol">?</a></span></p></div></div>
       <div class="no-number no-toc" id="input.url-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#input.url-attributes">#</a></h2>
         <dl class="attr-defs">
@@ -55,7 +55,7 @@
           
             <dt><a class="attribute-name" id="input.url.attrs.value" title="input.url.attrs.value" href="input.url.html#input.url.attrs.value">value</a> = <span class="attr-values">
        ""
-      | <a class="ref" href="datatypes.html#common.data.uri.absolute" title="common.data.uri.absolute">uri.absolute</a>
+      <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="datatypes.html#common.data.uri.absolute" title="common.data.uri.absolute">uri.absolute</a>
     </span> </dt>
             <dd>An absolute URL.</dd>
           

Index: hgroup.html
===================================================================
RCS file: /sources/public/html5/markup/hgroup.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- hgroup.html	2 Aug 2009 11:48:35 -0000	1.10
+++ hgroup.html	16 Aug 2009 10:53:42 -0000	1.11
@@ -22,12 +22,12 @@
         <div class="content-models" 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>
-   | <a class="ref" href="h2.html#h2">h2</a>
-   | <a class="ref" href="h3.html#h3">h3</a>
-   | <a class="ref" href="h4.html#h4">h4</a>
-   | <a class="ref" href="h5.html#h5">h5</a>
-   | <a class="ref" href="h6.html#h6">h6</a>)+
-      &amp; <a class="ref" href="hgroup.html#hgroup.attrs">hgroup.attrs</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h2.html#h2">h2</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h3.html#h3">h3</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h4.html#h4">h4</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h5.html#h5">h5</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h6.html#h6">h6</a>)<a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a>
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="hgroup.html#hgroup.attrs">hgroup.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="hgroup-attr-mdl">

Index: h5.html
===================================================================
RCS file: /sources/public/html5/markup/h5.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- h5.html	29 Jul 2009 11:23:43 -0000	1.15
+++ h5.html	16 Aug 2009 10:53:42 -0000	1.16
@@ -22,8 +22,8 @@
         <div class="content-models" 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>
-  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
-      &amp; <a class="ref" href="h5.html#h5.attrs">h5.attrs</a>
+  <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><a href="terminology.html#zero-or-more" title="ZERO OR MORE" class="rnc-symbol">*</a>)
+      <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="h5.html#h5.attrs">h5.attrs</a>
     </span></p>
         </div>
       </div><div class="no-number no-toc" id="h5-attr-mdl">
@@ -58,11 +58,11 @@
         <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>
-   | <a class="ref" href="h2.html#h2">h2</a>
-   | <a class="ref" href="h3.html#h3">h3</a>
-   | <a class="ref" href="h4.html#h4">h4</a>
-   | <a class="ref" href="h5.html#h5">h5</a>
-   | <a class="ref" href="h6.html#h6">h6</a>)+</li></ul>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h2.html#h2">h2</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h3.html#h3">h3</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h4.html#h4">h4</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h5.html#h5">h5</a>
+   <a href="terminology.html#choice" title="EITHER/OR CHOICE" class="rnc-symbol">|</a> <a class="ref" href="h6.html#h6">h6</a>)<a href="terminology.html#one-or-more" title="ONE OR MORE" class="rnc-symbol">+</a></li></ul>
       </div>
       
       <div class="no-number no-toc" id="h5-display">
Received on Sunday, 16 August 2009 10:54:44 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Saturday, 18 December 2010 06:14:09 GMT