- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Sat, 30 Jan 2010 04:44:28 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup In directory hutz:/tmp/cvs-serv27927 Modified Files: Overview.html a.html abbr.html address.html area.html article.html aside.html audio.html b.html base.html bdo.html blockquote.html body.html br.html button.button.html button.html button.reset.html button.submit.html canvas.html caption.html cite.html code.html col.html colgroup.html command.checkbox.html command.command.html command.html command.radio.html common-attributes.html common-models.html datalist.html dd.html del.html dfn.html div.html dl.html dt.html em.html embed.html fieldset.html footer.html form.html forms-attributes.html h1.html h2.html h3.html h4.html h5.html h6.html head.html header.html hgroup.html hr.html html.html i.html iframe.html img.html input.button.html input.checkbox.html input.color.html input.date.html input.datetime-local.html input.datetime.html input.email.html input.file.html input.hidden.html input.html input.image.html input.month.html input.number.html input.password.html input.radio.html input.range.html input.reset.html input.search.html input.submit.html input.tel.html input.text.html input.time.html input.url.html input.week.html ins.html kbd.html keygen.html label.html legend.html li.html link.html map.html mark.html menu.html meta.charset.html meta.http-equiv.content-language.html meta.http-equiv.content-type.html meta.http-equiv.default-style.html meta.http-equiv.refresh.html meta.name.html meter.html nav.html noscript.html object.html ol.html optgroup.html option.html output.html p.html param.html pre.html progress.html q.html rp.html rt.html ruby.html samp.html schema.html script.html section.html select.html small.html source.html span.html spec.html strong.html style.css style.html sub.html sup.html table.html tbody.html td.html textarea.html tfoot.html th.html thead.html time.html title.html tr.html ul.html var.html video.html Log Message: added star for required attributes Index: body.html =================================================================== RCS file: /sources/public/html5/markup/body.html,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- body.html 29 Jan 2010 10:17:04 -0000 1.31 +++ body.html 30 Jan 2010 04:44:21 -0000 1.32 @@ -26,27 +26,27 @@ <div id="body-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="body-mdl" href="body.html#body-mdl" class="element">body</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="body.html#body.attrs">body.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="body-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#body-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="body.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="body.html#body.attrs.onafterprint" title="body.attrs.onafterprint">onafterprint</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="body.html#body.attrs.onbeforeprint" title="body.attrs.onbeforeprint">onbeforeprint</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="body.html#body.attrs.onbeforeunload" title="body.attrs.onbeforeunload">onbeforeunload</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="body.html#body.attrs.onhashchange" title="body.attrs.onhashchange">onhashchange</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="body.html#body.attrs.onmessage" title="body.attrs.onmessage">onmessage</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="body.html#body.attrs.onoffline" title="body.attrs.onoffline">onoffline</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="body.html#body.attrs.ononline" title="body.attrs.ononline">ononline</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="body.html#body.attrs.onpopstate" title="body.attrs.onpopstate">onpopstate</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="body.html#body.attrs.onredo" title="body.attrs.onredo">onredo</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="body.html#body.attrs.onresize" title="body.attrs.onresize">onresize</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="body.html#body.attrs.onstorage" title="body.attrs.onstorage">onstorage</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="body.html#body.attrs.onundo" title="body.attrs.onundo">onundo</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="body.html#body.attrs.onunload" title="body.attrs.onunload">onunload</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="body.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="body.html#body.attrs.onafterprint" title="body.attrs.onafterprint">onafterprint</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="body.html#body.attrs.onbeforeprint" title="body.attrs.onbeforeprint">onbeforeprint</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="body.html#body.attrs.onbeforeunload" title="body.attrs.onbeforeunload">onbeforeunload</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="body.html#body.attrs.onhashchange" title="body.attrs.onhashchange">onhashchange</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="body.html#body.attrs.onmessage" title="body.attrs.onmessage">onmessage</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="body.html#body.attrs.onoffline" title="body.attrs.onoffline">onoffline</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="body.html#body.attrs.ononline" title="body.attrs.ononline">ononline</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="body.html#body.attrs.onpopstate" title="body.attrs.onpopstate">onpopstate</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="body.html#body.attrs.onredo" title="body.attrs.onredo">onredo</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="body.html#body.attrs.onresize" title="body.attrs.onresize">onresize</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="body.html#body.attrs.onstorage" title="body.attrs.onstorage">onstorage</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="body.html#body.attrs.onundo" title="body.attrs.onundo">onundo</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="body.html#body.attrs.onunload" title="body.attrs.onunload">onunload</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="body-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#body-attributes">#</a></h2> <dl class="attr-defs"> @@ -132,7 +132,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> followed by + <li class="context-mdl"><a href="html.html#html-mdl">html</a> = <a class="ref" href="head.html#head">head</a> <span class="postfix followedby">followed by</span> <a class="ref" href="body.html#body">body</a></li></ul> </div> Index: legend.html =================================================================== RCS file: /sources/public/html5/markup/legend.html,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- legend.html 29 Jan 2010 10:17:07 -0000 1.26 +++ legend.html 30 Jan 2010 04:44:23 -0000 1.27 @@ -25,14 +25,14 @@ <div id="legend-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="legend-mdl" href="legend.html#legend-mdl" class="element">legend</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="legend.html#legend.attrs">legend.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="legend-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#legend-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="legend.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="legend.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="legend-tags"> @@ -46,9 +46,9 @@ <div class="no-number no-toc" id="legend-context"> <h2 class="element-subhead">Permitted contexts <a class="hash" href="#legend-context">#</a></h2> <ul> - <li class="context-mdl"><a href="fieldset.html#fieldset-mdl">fieldset</a> = <a class="ref" href="legend.html#legend">legend</a> <span class="postfix optional">[optional]</span> followed by + <li class="context-mdl"><a href="fieldset.html#fieldset-mdl">fieldset</a> = <a class="ref" href="legend.html#legend">legend</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> <span class="postfix followedby">followed by</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> )</li></ul> + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li></ul> </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.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- address.html 29 Jan 2010 10:17:04 -0000 1.29 +++ address.html 30 Jan 2010 04:44:20 -0000 1.30 @@ -25,14 +25,14 @@ <div id="address-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="address-mdl" href="address.html#address-mdl" class="element">address</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="address.html#address.attrs">address.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="address-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#address-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="address.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="address.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="address-constraints"> Index: button.html =================================================================== RCS file: /sources/public/html5/markup/button.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- button.html 29 Jan 2010 10:17:04 -0000 1.10 +++ button.html 30 Jan 2010 04:44:21 -0000 1.11 @@ -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> - or <a class="ref" href="button.reset.html#button.reset">button.reset</a> - or <a class="ref" href="button.button.html#button.button">button.button</a></dd></dl> + <span class="postfix or">or</span> <a class="ref" href="button.reset.html#button.reset">button.reset</a> + <span class="postfix or">or</span> <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.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- th.html 29 Jan 2010 10:17:08 -0000 1.31 +++ th.html 30 Jan 2010 04:44:25 -0000 1.32 @@ -23,18 +23,18 @@ <div id="th-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="th-mdl" href="th.html#th-mdl" class="element">th</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="th.html#th.attrs">th.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="th-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#th-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="th.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="th.html#th.attrs.scope" title="th.attrs.scope">scope</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="th.html#th.attrs.colspan" title="th.attrs.colspan">colspan</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="th.html#th.attrs.rowspan" title="th.attrs.rowspan">rowspan</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="th.html#th.attrs.headers" title="th.attrs.headers">headers</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="th.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="th.html#th.attrs.scope" title="th.attrs.scope">scope</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="th.html#th.attrs.colspan" title="th.attrs.colspan">colspan</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="th.html#th.attrs.rowspan" title="th.attrs.rowspan">rowspan</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="th.html#th.attrs.headers" title="th.attrs.headers">headers</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="th-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#th-attributes">#</a></h2> <dl class="attr-defs"> @@ -134,7 +134,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> - or <a class="ref" href="th.html#th">th</a>) <span class="postfix zeroormore">[zero or more]</span> </li></ul> + <span class="postfix or">or</span> <a class="ref" href="th.html#th">th</a>)<span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li></ul> </div> <div class="no-number no-toc" id="th-display"> Index: mark.html =================================================================== RCS file: /sources/public/html5/markup/mark.html,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- mark.html 29 Jan 2010 10:17:07 -0000 1.25 +++ mark.html 30 Jan 2010 04:44:24 -0000 1.26 @@ -25,14 +25,14 @@ <div id="mark-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="mark-mdl" href="mark.html#mark-mdl" class="element">mark</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="mark.html#mark.attrs">mark.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="mark-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#mark-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="mark.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="mark.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="mark-tags"> Index: Overview.html =================================================================== RCS file: /sources/public/html5/markup/Overview.html,v retrieving revision 1.368 retrieving revision 1.369 diff -u -d -r1.368 -r1.369 --- Overview.html 29 Jan 2010 05:25:48 -0000 1.368 +++ Overview.html 30 Jan 2010 04:44:20 -0000 1.369 @@ -12,7 +12,7 @@ <h1>HTML: The Markup Language</h1> <h2> W3C - Editor’s Draft <em>29 January 2010</em> + Editor’s Draft <em>30 January 2010</em> </h2> <dl> <dt>Latest Editor’s Draft:</dt> @@ -52,7 +52,7 @@ reports index</a> at http://www.w3.org/TR/. </em></p> <p> - This document is the 29 January 2010 Editor’s Draft of + This document is the 30 January 2010 Editor’s Draft of <cite>HTML: The Markup Language</cite>. To comment on this document, either submit your comments through the Index: br.html =================================================================== RCS file: /sources/public/html5/markup/br.html,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- br.html 29 Jan 2010 10:17:04 -0000 1.24 +++ br.html 30 Jan 2010 04:44:21 -0000 1.25 @@ -22,13 +22,14 @@ <div id="br-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="br-mdl" href="br.html#br-mdl" class="element">br</a> = </span><span> - empty & <a class="ref" href="br.html#br.attrs">br.attrs</a> + empty + & <a class="ref" href="br.html#br.attrs">br.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="br-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#br-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="br.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="br.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="br-constraints"> Index: input.email.html =================================================================== RCS file: /sources/public/html5/markup/input.email.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- input.email.html 29 Jan 2010 10:17:06 -0000 1.27 +++ input.email.html 30 Jan 2010 04:44:23 -0000 1.28 @@ -31,23 +31,23 @@ </div></div><div class="no-number no-toc" id="input.email-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.email-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="input.email.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.email.html#input.email.attrs.type" title="input.email.attrs.type">type</a> <span class="postfix required">[required]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a> <span class="postfix optional">[optional]</span> - & ((<a class="ref" href="forms-attributes.html#input.attrs.multiple" title="input.attrs.multiple">multiple</a> <span class="postfix required">[required]</span> - & <a class="ref" href="input.email.html#input.email.attrs.value.multiple" title="input.email.attrs.value.multiple">value.multiple</a> <span class="postfix optional">[optional]</span> ) - or <a class="ref" href="input.email.html#input.email.attrs.value.single" title="input.email.attrs.value.single">value.single</a> <span class="postfix optional">[optional]</span> ) <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="input.email.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.email.html#input.email.attrs.type" title="input.email.attrs.type">type</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> ((<a class="ref" href="forms-attributes.html#input.attrs.multiple" title="input.attrs.multiple">multiple</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="input.email.html#input.email.attrs.value.multiple" title="input.email.attrs.value.multiple">value.multiple</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ) + <span class="postfix or">or</span> <a class="ref" href="input.email.html#input.email.attrs.value.single" title="input.email.attrs.value.single">value.single</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )<span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="input.email-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.email-attributes">#</a></h2> <dl class="attr-defs"> Index: tr.html =================================================================== RCS file: /sources/public/html5/markup/tr.html,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- tr.html 29 Jan 2010 10:17:08 -0000 1.24 +++ tr.html 30 Jan 2010 04:44:26 -0000 1.25 @@ -23,14 +23,14 @@ <div id="tr-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="tr-mdl" href="tr.html#tr-mdl" class="element">tr</a> = </span><span> (<a class="ref" href="td.html#td">td</a> - or <a class="ref" href="th.html#th">th</a>) <span class="postfix zeroormore">[zero or more]</span> + <span class="postfix or">or</span> <a class="ref" href="th.html#th">th</a>)<span class="postfix zeroormore" title="ZERO OR MORE">*</span> & <a class="ref" href="tr.html#tr.attrs">tr.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="tr-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#tr-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="tr.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="tr.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="tr-constraints"> @@ -70,18 +70,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> <span class="postfix optional">[optional]</span> followed by - <a class="ref" href="colgroup.html#colgroup">colgroup</a> <span class="postfix zeroormore">[zero or more]</span> followed by - <a class="ref" href="thead.html#thead">thead</a> <span class="postfix optional">[optional]</span> followed by - ((<a class="ref" href="tfoot.html#tfoot">tfoot</a> followed by - (<a class="ref" href="tbody.html#tbody">tbody</a> <span class="postfix zeroormore">[zero or more]</span> - or <a class="ref" href="tr.html#tr">tr</a> <span class="postfix oneormore">[one or more]</span> )) - or ((<a class="ref" href="tbody.html#tbody">tbody</a> <span class="postfix zeroormore">[zero or more]</span> - or <a class="ref" href="tr.html#tr">tr</a> <span class="postfix oneormore">[one or more]</span> ) followed by - <a class="ref" href="tfoot.html#tfoot">tfoot</a> <span class="postfix optional">[optional]</span> ))</li> - <li class="context-mdl"><a href="thead.html#thead-mdl">thead</a> = <a class="ref" href="tr.html#tr">tr</a> <span class="postfix zeroormore">[zero or more]</span> </li> - <li class="context-mdl"><a href="tfoot.html#tfoot-mdl">tfoot</a> = <a class="ref" href="tr.html#tr">tr</a> <span class="postfix zeroormore">[zero or more]</span> </li> - <li class="context-mdl"><a href="tbody.html#tbody-mdl">tbody</a> = <a class="ref" href="tr.html#tr">tr</a> <span class="postfix zeroormore">[zero or more]</span> </li></ul> + <li class="context-mdl"><a href="table.html#table-mdl">table</a> = <a class="ref" href="caption.html#caption">caption</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> <span class="postfix followedby">followed by</span> + <a class="ref" href="colgroup.html#colgroup">colgroup</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> <span class="postfix followedby">followed by</span> + <a class="ref" href="thead.html#thead">thead</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> <span class="postfix followedby">followed by</span> + ((<a class="ref" href="tfoot.html#tfoot">tfoot</a> <span class="postfix followedby">followed by</span> + (<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> + <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> )) + <span class="postfix or">or</span> ((<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> + <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> ) <span class="postfix followedby">followed by</span> + <a class="ref" href="tfoot.html#tfoot">tfoot</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ))</li> + <li class="context-mdl"><a href="thead.html#thead-mdl">thead</a> = <a class="ref" href="tr.html#tr">tr</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li> + <li class="context-mdl"><a href="tfoot.html#tfoot-mdl">tfoot</a> = <a class="ref" href="tr.html#tr">tr</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li> + <li class="context-mdl"><a href="tbody.html#tbody-mdl">tbody</a> = <a class="ref" href="tr.html#tr">tr</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li></ul> </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.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- input.month.html 29 Jan 2010 10:17:06 -0000 1.27 +++ input.month.html 30 Jan 2010 04:44:23 -0000 1.28 @@ -31,20 +31,20 @@ </div></div><div class="no-number no-toc" id="input.month-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.month-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="input.month.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.month.html#input.month.attrs.type" title="input.month.attrs.type">type</a> <span class="postfix required">[required]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.month.html#input.month.attrs.min" title="input.month.attrs.min">min</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.month.html#input.month.attrs.max" title="input.month.attrs.max">max</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.step.integer" title="input.attrs.step.integer">step.integer</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.month.html#input.month.attrs.value" title="input.month.attrs.value">value</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="input.month.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.month.html#input.month.attrs.type" title="input.month.attrs.type">type</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.month.html#input.month.attrs.min" title="input.month.attrs.min">min</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.month.html#input.month.attrs.max" title="input.month.attrs.max">max</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.step.integer" title="input.attrs.step.integer">step.integer</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.month.html#input.month.attrs.value" title="input.month.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="input.month-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.month-attributes">#</a></h2> <dl class="attr-defs"> Index: iframe.html =================================================================== RCS file: /sources/public/html5/markup/iframe.html,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- iframe.html 29 Jan 2010 10:17:05 -0000 1.37 +++ iframe.html 30 Jan 2010 04:44:22 -0000 1.38 @@ -36,13 +36,13 @@ </div></div><div class="no-number no-toc" id="iframe-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#iframe-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="iframe.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="iframe.html#iframe.attrs.src" title="iframe.attrs.src">src</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="iframe.html#iframe.attrs.name" title="iframe.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="iframe.html#iframe.attrs.width" title="iframe.attrs.width">width</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="iframe.html#iframe.attrs.height" title="iframe.attrs.height">height</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="iframe.html#iframe.attrs.sandbox" title="iframe.attrs.sandbox">sandbox</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="iframe.html#iframe.attrs.seamless" title="iframe.attrs.seamless">seamless</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="iframe.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="iframe.html#iframe.attrs.src" title="iframe.attrs.src">src</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="iframe.html#iframe.attrs.name" title="iframe.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="iframe.html#iframe.attrs.width" title="iframe.attrs.width">width</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="iframe.html#iframe.attrs.height" title="iframe.attrs.height">height</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="iframe.html#iframe.attrs.sandbox" title="iframe.attrs.sandbox">sandbox</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="iframe.html#iframe.attrs.seamless" title="iframe.attrs.seamless">seamless</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="iframe-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#iframe-attributes">#</a></h2> <dl class="attr-defs"> @@ -75,7 +75,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" or "" </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" + or "" + </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: ins.html =================================================================== RCS file: /sources/public/html5/markup/ins.html,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- ins.html 29 Jan 2010 10:17:06 -0000 1.30 +++ ins.html 30 Jan 2010 04:44:23 -0000 1.31 @@ -25,22 +25,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> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <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> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="ins.html#ins.attrs">ins.attrs</a> </span></dd> </dl> </div></div><div class="no-number no-toc" id="ins-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#ins-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="ins.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="ins.html#ins.attrs.cite" title="ins.attrs.cite">cite</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="ins.html#ins.attrs.datetime" title="ins.attrs.datetime">datetime</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="ins.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="ins.html#ins.attrs.cite" title="ins.attrs.cite">cite</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="ins.html#ins.attrs.datetime" title="ins.attrs.datetime">datetime</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="ins-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#ins-attributes">#</a></h2> <dl class="attr-defs"> Index: abbr.html =================================================================== RCS file: /sources/public/html5/markup/abbr.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- abbr.html 29 Jan 2010 10:17:04 -0000 1.27 +++ abbr.html 30 Jan 2010 04:44:20 -0000 1.28 @@ -26,14 +26,14 @@ <div id="abbr-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="abbr-mdl" href="abbr.html#abbr-mdl" class="element">abbr</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="abbr.html#abbr.attrs">abbr.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="abbr-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#abbr-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="abbr.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="abbr.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="abbr-tags"> Index: div.html =================================================================== RCS file: /sources/public/html5/markup/div.html,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- div.html 29 Jan 2010 10:17:05 -0000 1.30 +++ div.html 30 Jan 2010 04:44:22 -0000 1.31 @@ -25,16 +25,16 @@ <div id="div-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="div-mdl" href="div.html#div-mdl" class="element">div</a> = </span><span> - <a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a> <span class="postfix zeroormore">[zero or more]</span> followed by + <a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> <span class="postfix followedby">followed by</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="div.html#div.attrs">div.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="div-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#div-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="div.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="div.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="div-constraints"> Index: meta.name.html =================================================================== RCS file: /sources/public/html5/markup/meta.name.html,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- meta.name.html 29 Jan 2010 10:17:07 -0000 1.28 +++ meta.name.html 30 Jan 2010 04:44:24 -0000 1.29 @@ -30,11 +30,11 @@ </div></div><div class="no-number no-toc" id="meta.name-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#meta.name-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="meta.name.attrs"><a class="ref" href="common-attributes.html#common.attrs.core" title="common.attrs.core">common.attrs.core</a> <span class="postfix required">[required]</span> - & <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a> <span class="postfix required">[required]</span> - & <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> <span class="postfix required">[required]</span> - & <a class="ref" href="meta.name.html#meta.name.attrs.name" title="meta.name.attrs.name">name</a> <span class="postfix required">[required]</span> - & <a class="ref" href="meta.name.html#meta.name.attrs.content" title="meta.name.attrs.content">content</a> <span class="postfix required">[required]</span></span></p></div></div> + <p><span class="pattern" id="meta.name.attrs"><a class="ref" href="common-attributes.html#common.attrs.core" title="common.attrs.core">common.attrs.core</a> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> + <span class="postfix &">&</span> <a class="ref" href="meta.name.html#meta.name.attrs.name" title="meta.name.attrs.name">name</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="meta.name.html#meta.name.attrs.content" title="meta.name.attrs.content">content</a><span class="postfix required" title="REQUIRED">★</span></span></p></div></div> <div class="no-number no-toc" id="meta.name-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#meta.name-attributes">#</a></h2> <dl class="attr-defs"> @@ -58,16 +58,16 @@ <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> - or <a class="ref" href="style.html#style-pattern">style</a> - or <a class="ref" href="meta.name.html#meta.name">meta.name</a> - or <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> - or <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> - or <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> - or <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> - or <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> - or <a class="ref" href="script.html#script">script</a> - or <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - or <a class="ref" href="command.html#command">command</a></li></ul> + <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> + <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> + <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a> + <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> + <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a></li></ul> </div> </div> <hr class="footerbreak"></hr> Index: table.html =================================================================== RCS file: /sources/public/html5/markup/table.html,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- table.html 29 Jan 2010 10:17:08 -0000 1.28 +++ table.html 30 Jan 2010 04:44:25 -0000 1.29 @@ -23,23 +23,23 @@ <div id="table-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="table-mdl" href="table.html#table-mdl" class="element">table</a> = </span><span> - <a class="ref" href="caption.html#caption">caption</a> <span class="postfix optional">[optional]</span> followed by - <a class="ref" href="colgroup.html#colgroup">colgroup</a> <span class="postfix zeroormore">[zero or more]</span> followed by - <a class="ref" href="thead.html#thead">thead</a> <span class="postfix optional">[optional]</span> followed by - ((<a class="ref" href="tfoot.html#tfoot">tfoot</a> followed by - (<a class="ref" href="tbody.html#tbody">tbody</a> <span class="postfix zeroormore">[zero or more]</span> - or <a class="ref" href="tr.html#tr">tr</a> <span class="postfix oneormore">[one or more]</span> )) - or ((<a class="ref" href="tbody.html#tbody">tbody</a> <span class="postfix zeroormore">[zero or more]</span> - or <a class="ref" href="tr.html#tr">tr</a> <span class="postfix oneormore">[one or more]</span> ) followed by - <a class="ref" href="tfoot.html#tfoot">tfoot</a> <span class="postfix optional">[optional]</span> )) + <a class="ref" href="caption.html#caption">caption</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> <span class="postfix followedby">followed by</span> + <a class="ref" href="colgroup.html#colgroup">colgroup</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> <span class="postfix followedby">followed by</span> + <a class="ref" href="thead.html#thead">thead</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> <span class="postfix followedby">followed by</span> + ((<a class="ref" href="tfoot.html#tfoot">tfoot</a> <span class="postfix followedby">followed by</span> + (<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> + <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> )) + <span class="postfix or">or</span> ((<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> + <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> ) <span class="postfix followedby">followed by</span> + <a class="ref" href="tfoot.html#tfoot">tfoot</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )) & <a class="ref" href="table.html#table.attrs">table.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="table-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#table-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="table.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="table.html#table.attrs.summary" title="table.attrs.summary">summary</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="table.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="table.html#table.attrs.summary" title="table.attrs.summary">summary</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="table-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#table-attributes">#</a></h2> <dl class="attr-defs"> Index: nav.html =================================================================== RCS file: /sources/public/html5/markup/nav.html,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- nav.html 29 Jan 2010 10:17:07 -0000 1.30 +++ nav.html 30 Jan 2010 04:44:24 -0000 1.31 @@ -25,14 +25,14 @@ <div id="nav-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="nav-mdl" href="nav.html#nav-mdl" class="element">nav</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="nav.html#nav.attrs">nav.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="nav-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#nav-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="nav.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="nav.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="nav-constraints"> Index: html.html =================================================================== RCS file: /sources/public/html5/markup/html.html,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- html.html 29 Jan 2010 10:17:05 -0000 1.29 +++ html.html 30 Jan 2010 04:44:22 -0000 1.30 @@ -28,7 +28,7 @@ <div id="html-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="html-mdl" href="html.html#html-mdl" class="element">html</a> = </span><span> - <a class="ref" href="head.html#head">head</a> followed by + <a class="ref" href="head.html#head">head</a> <span class="postfix followedby">followed by</span> <a class="ref" href="body.html#body">body</a> & <a class="ref" href="html.html#html.attrs">html.attrs</a> </span></p> @@ -36,8 +36,8 @@ </div></div><div class="no-number no-toc" id="html-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#html-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="html.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="html.html#html.attrs.manifest" title="html.attrs.manifest">manifest</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="html.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="html.html#html.attrs.manifest" title="html.attrs.manifest">manifest</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="html-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#html-attributes">#</a></h2> <dl class="attr-defs"> Index: meta.http-equiv.content-type.html =================================================================== RCS file: /sources/public/html5/markup/meta.http-equiv.content-type.html,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- meta.http-equiv.content-type.html 29 Jan 2010 10:17:07 -0000 1.31 +++ meta.http-equiv.content-type.html 30 Jan 2010 04:44:24 -0000 1.32 @@ -31,11 +31,11 @@ </div></div><div class="no-number no-toc" id="meta.http-equiv.content-type-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#meta.http-equiv.content-type-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="meta.http-equiv.content-type.attrs"><a class="ref" href="common-attributes.html#common.attrs.core" title="common.attrs.core">common.attrs.core</a> <span class="postfix required">[required]</span> - & <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a> <span class="postfix required">[required]</span> - & <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> <span class="postfix required">[required]</span> - & <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.attrs.http-equiv.content-type" title="meta.http-equiv.attrs.http-equiv.content-type">http-equiv.content-type</a> <span class="postfix required">[required]</span> - & <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.attrs.content.content-type" title="meta.http-equiv.attrs.content.content-type">content.content-type</a> <span class="postfix required">[required]</span></span></p></div></div> + <p><span class="pattern" id="meta.http-equiv.content-type.attrs"><a class="ref" href="common-attributes.html#common.attrs.core" title="common.attrs.core">common.attrs.core</a> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> + <span class="postfix &">&</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.attrs.http-equiv.content-type" title="meta.http-equiv.attrs.http-equiv.content-type">http-equiv.content-type</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.attrs.content.content-type" title="meta.http-equiv.attrs.content.content-type">content.content-type</a><span class="postfix required" title="REQUIRED">★</span></span></p></div></div> <div class="no-number no-toc" id="meta.http-equiv.content-type-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#meta.http-equiv.content-type-attributes">#</a></h2> <dl class="attr-defs"> @@ -86,16 +86,16 @@ <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> - or <a class="ref" href="style.html#style-pattern">style</a> - or <a class="ref" href="meta.name.html#meta.name">meta.name</a> - or <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> - or <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> - or <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> - or <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> - or <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> - or <a class="ref" href="script.html#script">script</a> - or <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - or <a class="ref" href="command.html#command">command</a></li></ul> + <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> + <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> + <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a> + <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> + <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a></li></ul> </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.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- footer.html 29 Jan 2010 10:17:05 -0000 1.30 +++ footer.html 30 Jan 2010 04:44:22 -0000 1.31 @@ -25,14 +25,14 @@ <div id="footer-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="footer-mdl" href="footer.html#footer-mdl" class="element">footer</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="footer.html#footer.attrs">footer.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="footer-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#footer-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="footer.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="footer.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="footer-constraints"> Index: meta.http-equiv.content-language.html =================================================================== RCS file: /sources/public/html5/markup/meta.http-equiv.content-language.html,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- meta.http-equiv.content-language.html 29 Jan 2010 10:17:07 -0000 1.24 +++ meta.http-equiv.content-language.html 30 Jan 2010 04:44:24 -0000 1.25 @@ -31,11 +31,11 @@ </div></div><div class="no-number no-toc" id="meta.http-equiv.content-language-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#meta.http-equiv.content-language-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="meta.http-equiv.content-language.attrs"><a class="ref" href="common-attributes.html#common.attrs.core" title="common.attrs.core">common.attrs.core</a> <span class="postfix required">[required]</span> - & <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a> <span class="postfix required">[required]</span> - & <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> <span class="postfix required">[required]</span> - & <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.attrs.http-equiv.content-language" title="meta.http-equiv.attrs.http-equiv.content-language">http-equiv.content-language</a> <span class="postfix required">[required]</span> - & <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.attrs.content.content-language" title="meta.http-equiv.attrs.content.content-language">content.content-language</a> <span class="postfix required">[required]</span></span></p></div></div> + <p><span class="pattern" id="meta.http-equiv.content-language.attrs"><a class="ref" href="common-attributes.html#common.attrs.core" title="common.attrs.core">common.attrs.core</a> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> + <span class="postfix &">&</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.attrs.http-equiv.content-language" title="meta.http-equiv.attrs.http-equiv.content-language">http-equiv.content-language</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.attrs.content.content-language" title="meta.http-equiv.attrs.content.content-language">content.content-language</a><span class="postfix required" title="REQUIRED">★</span></span></p></div></div> <div class="no-number no-toc" id="meta.http-equiv.content-language-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#meta.http-equiv.content-language-attributes">#</a></h2> <dl class="attr-defs"> @@ -74,16 +74,16 @@ <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> - or <a class="ref" href="style.html#style-pattern">style</a> - or <a class="ref" href="meta.name.html#meta.name">meta.name</a> - or <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> - or <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> - or <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> - or <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> - or <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> - or <a class="ref" href="script.html#script">script</a> - or <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - or <a class="ref" href="command.html#command">command</a></li></ul> + <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> + <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> + <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a> + <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> + <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a></li></ul> </div> </div> <hr class="footerbreak"></hr> Index: script.html =================================================================== RCS file: /sources/public/html5/markup/script.html,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- script.html 29 Jan 2010 10:17:08 -0000 1.35 +++ script.html 30 Jan 2010 04:44:25 -0000 1.36 @@ -35,16 +35,16 @@ </div></div><div class="no-number no-toc" id="script-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#script-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="script.html#script.attrs.type" title="script.attrs.type">type</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="script.html#script.attrs.language" title="script.attrs.language">language</a> <span class="postfix optional">[optional]</span> </p> - <p><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="script.html#script.attrs.src" title="script.attrs.src">src</a> <span class="postfix required">[required]</span> - & <a class="ref" href="script.html#script.attrs.defer" title="script.attrs.defer">defer</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="script.html#script.attrs.async" title="script.attrs.async">async</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="script.html#script.attrs.type" title="script.attrs.type">type</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="script.html#script.attrs.charset" title="script.attrs.charset">charset</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="script.html#script.attrs.language" title="script.attrs.language">language</a> <span class="postfix optional">[optional]</span> </p> + <p><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="script.html#script.attrs.type" title="script.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="script.html#script.attrs.language" title="script.attrs.language">language</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </p> + <p><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="script.html#script.attrs.src" title="script.attrs.src">src</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="script.html#script.attrs.defer" title="script.attrs.defer">defer</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="script.html#script.attrs.async" title="script.attrs.async">async</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="script.html#script.attrs.type" title="script.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="script.html#script.attrs.charset" title="script.attrs.charset">charset</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="script.html#script.attrs.language" title="script.attrs.language">language</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </p> </div></div> <div class="no-number no-toc" id="script-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#script-attributes">#</a></h2> @@ -62,11 +62,15 @@ </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" or "" </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" or "" + </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" or "" </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" or "" + </span> </dt> <dd>Specifies that the script should be executed asynchronously, as soon as it becomes available.</dd> @@ -104,16 +108,16 @@ <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> - or <a class="ref" href="style.html#style-pattern">style</a> - or <a class="ref" href="meta.name.html#meta.name">meta.name</a> - or <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> - or <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> - or <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> - or <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> - or <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> - or <a class="ref" href="script.html#script">script</a> - or <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - or <a class="ref" href="command.html#command">command</a></li> + <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> + <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> + <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a> + <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> + <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a></li> <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul> </div> Index: input.range.html =================================================================== RCS file: /sources/public/html5/markup/input.range.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- input.range.html 29 Jan 2010 10:17:06 -0000 1.27 +++ input.range.html 30 Jan 2010 04:44:23 -0000 1.28 @@ -31,18 +31,18 @@ </div></div><div class="no-number no-toc" id="input.range-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.range-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="input.range.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.range.html#input.range.attrs.type" title="input.range.attrs.type">type</a> <span class="postfix required">[required]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.range.html#input.range.attrs.min" title="input.range.attrs.min">min</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.range.html#input.range.attrs.max" title="input.range.attrs.max">max</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.range.html#input.range.attrs.value" title="input.range.attrs.value">value</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="input.range.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.range.html#input.range.attrs.type" title="input.range.attrs.type">type</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.range.html#input.range.attrs.min" title="input.range.attrs.min">min</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.range.html#input.range.attrs.max" title="input.range.attrs.max">max</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.range.html#input.range.attrs.value" title="input.range.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="input.range-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.range-attributes">#</a></h2> <dl class="attr-defs"> Index: audio.html =================================================================== RCS file: /sources/public/html5/markup/audio.html,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- audio.html 29 Jan 2010 10:17:04 -0000 1.35 +++ audio.html 30 Jan 2010 04:44:21 -0000 1.36 @@ -35,28 +35,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> - or <a class="ref" href="source.html#source">source</a> <span class="postfix zeroormore">[zero or more]</span> ) followed by + <span class="postfix or">or</span> <a class="ref" href="source.html#source">source</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) <span class="postfix followedby">followed by</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <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> - or <a class="ref" href="source.html#source">source</a> <span class="postfix zeroormore">[zero or more]</span> ) followed by + <span class="postfix or">or</span> <a class="ref" href="source.html#source">source</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) <span class="postfix followedby">followed by</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="audio.html#audio.attrs">audio.attrs</a> </span></dd> </dl> </div></div><div class="no-number no-toc" id="audio-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#audio-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="audio.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="audio.html#audio.attrs.autoplay" title="audio.attrs.autoplay">autoplay</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="audio.html#audio.attrs.autobuffer" title="audio.attrs.autobuffer">autobuffer</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="audio.html#audio.attrs.controls" title="audio.attrs.controls">controls</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="audio.html#audio.attrs.loop" title="audio.attrs.loop">loop</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="audio.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="audio.html#audio.attrs.autoplay" title="audio.attrs.autoplay">autoplay</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="audio.html#audio.attrs.autobuffer" title="audio.attrs.autobuffer">autobuffer</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="audio.html#audio.attrs.controls" title="audio.attrs.controls">controls</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="audio.html#audio.attrs.loop" title="audio.attrs.loop">loop</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="audio-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#audio-attributes">#</a></h2> <dl class="attr-defs"> Index: time.html =================================================================== RCS file: /sources/public/html5/markup/time.html,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- time.html 29 Jan 2010 10:17:08 -0000 1.28 +++ time.html 30 Jan 2010 04:44:25 -0000 1.29 @@ -23,16 +23,16 @@ <div id="time-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="time-mdl" href="time.html#time-mdl" class="element">time</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="time.html#time.attrs">time.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="time-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#time-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="time.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="time.html#time.attrs.datetime" title="time.attrs.datetime">datetime</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="time.html#time.attrs.pubdate" title="time.attrs.pubdate">pubdate</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="time.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="time.html#time.attrs.datetime" title="time.attrs.datetime">datetime</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="time.html#time.attrs.pubdate" title="time.attrs.pubdate">pubdate</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="time-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#time-attributes">#</a></h2> <dl class="attr-defs"> @@ -42,7 +42,9 @@ <dd>Specifies the date or time that the element represents.</dd> - <dt><a class="attribute-name" id="time.attrs.pubdate" title="time.attrs.pubdate" href="time.html#time.attrs.pubdate">pubdate</a> = <span class="attr-values"> "pubdate" or "" </span> </dt> + <dt><a class="attribute-name" id="time.attrs.pubdate" title="time.attrs.pubdate" href="time.html#time.attrs.pubdate">pubdate</a> = <span class="attr-values"> + "pubdate" or "" + </span> </dt> <dd>Indicates that the date and time given by the element is the publication date and time of the nearest ancestor <a href="article.html#article">article</a> Index: meta.http-equiv.default-style.html =================================================================== RCS file: /sources/public/html5/markup/meta.http-equiv.default-style.html,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- meta.http-equiv.default-style.html 29 Jan 2010 10:17:07 -0000 1.28 +++ meta.http-equiv.default-style.html 30 Jan 2010 04:44:24 -0000 1.29 @@ -31,11 +31,11 @@ </div></div><div class="no-number no-toc" id="meta.http-equiv.default-style-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#meta.http-equiv.default-style-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="meta.http-equiv.default-style.attrs"><a class="ref" href="common-attributes.html#common.attrs.core" title="common.attrs.core">common.attrs.core</a> <span class="postfix required">[required]</span> - & <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a> <span class="postfix required">[required]</span> - & <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> <span class="postfix required">[required]</span> - & <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.attrs.http-equiv.default-style" title="meta.http-equiv.attrs.http-equiv.default-style">http-equiv.default-style</a> <span class="postfix required">[required]</span> - & <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.attrs.content.default-style" title="meta.http-equiv.attrs.content.default-style">content.default-style</a> <span class="postfix required">[required]</span></span></p></div></div> + <p><span class="pattern" id="meta.http-equiv.default-style.attrs"><a class="ref" href="common-attributes.html#common.attrs.core" title="common.attrs.core">common.attrs.core</a> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> + <span class="postfix &">&</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.attrs.http-equiv.default-style" title="meta.http-equiv.attrs.http-equiv.default-style">http-equiv.default-style</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.attrs.content.default-style" title="meta.http-equiv.attrs.content.default-style">content.default-style</a><span class="postfix required" title="REQUIRED">★</span></span></p></div></div> <div class="no-number no-toc" id="meta.http-equiv.default-style-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#meta.http-equiv.default-style-attributes">#</a></h2> <dl class="attr-defs"> @@ -74,20 +74,20 @@ <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> - or <a class="ref" href="style.html#style-pattern">style</a> - or <a class="ref" href="meta.name.html#meta.name">meta.name</a> - or <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> - or <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> - or <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> - or <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> - or <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> - or <a class="ref" href="script.html#script">script</a> - or <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - or <a class="ref" href="command.html#command">command</a></li> + <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> + <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> + <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a> + <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> + <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a></li> <li class="context-mdl"><a href="noscript.html#noscript.elem.head">noscript.elem.head</a> = (<a class="ref" href="link.html#link">link</a> - or <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> - or <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> - or <a class="ref" href="style.html#style-pattern">style</a>) <span class="postfix zeroormore">[zero or more]</span> </li></ul> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> + <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a>)<span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li></ul> </div> </div> <hr class="footerbreak"></hr> Index: input.html =================================================================== RCS file: /sources/public/html5/markup/input.html,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- input.html 29 Jan 2010 10:17:06 -0000 1.11 +++ input.html 30 Jan 2010 04:44:23 -0000 1.12 @@ -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> - or <a class="ref" href="input.password.html#input.password">input.password</a> - or <a class="ref" href="input.checkbox.html#input.checkbox">input.checkbox</a> - or <a class="ref" href="input.radio.html#input.radio">input.radio</a> - or <a class="ref" href="input.button.html#input.button">input.button</a> - or <a class="ref" href="input.submit.html#input.submit">input.submit</a> - or <a class="ref" href="input.reset.html#input.reset">input.reset</a> - or <a class="ref" href="input.file.html#input.file">input.file</a> - or <a class="ref" href="input.hidden.html#input.hidden">input.hidden</a> - or <a class="ref" href="input.image.html#input.image">input.image</a> - or <a class="ref" href="input.datetime.html#input.datetime">input.datetime</a> - or <a class="ref" href="input.datetime-local.html#input.datetime-local">input.datetime-local</a> - or <a class="ref" href="input.date.html#input.date">input.date</a> - or <a class="ref" href="input.month.html#input.month">input.month</a> - or <a class="ref" href="input.time.html#input.time">input.time</a> - or <a class="ref" href="input.week.html#input.week">input.week</a> - or <a class="ref" href="input.number.html#input.number">input.number</a> - or <a class="ref" href="input.range.html#input.range">input.range</a> - or <a class="ref" href="input.email.html#input.email">input.email</a> - or <a class="ref" href="input.url.html#input.url">input.url</a> - or <a class="ref" href="input.search.html#input.search">input.search</a> - or <a class="ref" href="input.tel.html#input.tel">input.tel</a> - or <a class="ref" href="input.color.html#input.color">input.color</a></dd></dl> + <span class="postfix or">or</span> <a class="ref" href="input.password.html#input.password">input.password</a> + <span class="postfix or">or</span> <a class="ref" href="input.checkbox.html#input.checkbox">input.checkbox</a> + <span class="postfix or">or</span> <a class="ref" href="input.radio.html#input.radio">input.radio</a> + <span class="postfix or">or</span> <a class="ref" href="input.button.html#input.button">input.button</a> + <span class="postfix or">or</span> <a class="ref" href="input.submit.html#input.submit">input.submit</a> + <span class="postfix or">or</span> <a class="ref" href="input.reset.html#input.reset">input.reset</a> + <span class="postfix or">or</span> <a class="ref" href="input.file.html#input.file">input.file</a> + <span class="postfix or">or</span> <a class="ref" href="input.hidden.html#input.hidden">input.hidden</a> + <span class="postfix or">or</span> <a class="ref" href="input.image.html#input.image">input.image</a> + <span class="postfix or">or</span> <a class="ref" href="input.datetime.html#input.datetime">input.datetime</a> + <span class="postfix or">or</span> <a class="ref" href="input.datetime-local.html#input.datetime-local">input.datetime-local</a> + <span class="postfix or">or</span> <a class="ref" href="input.date.html#input.date">input.date</a> + <span class="postfix or">or</span> <a class="ref" href="input.month.html#input.month">input.month</a> + <span class="postfix or">or</span> <a class="ref" href="input.time.html#input.time">input.time</a> + <span class="postfix or">or</span> <a class="ref" href="input.week.html#input.week">input.week</a> + <span class="postfix or">or</span> <a class="ref" href="input.number.html#input.number">input.number</a> + <span class="postfix or">or</span> <a class="ref" href="input.range.html#input.range">input.range</a> + <span class="postfix or">or</span> <a class="ref" href="input.email.html#input.email">input.email</a> + <span class="postfix or">or</span> <a class="ref" href="input.url.html#input.url">input.url</a> + <span class="postfix or">or</span> <a class="ref" href="input.search.html#input.search">input.search</a> + <span class="postfix or">or</span> <a class="ref" href="input.tel.html#input.tel">input.tel</a> + <span class="postfix or">or</span> <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.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- command.html 29 Jan 2010 10:17:04 -0000 1.10 +++ command.html 30 Jan 2010 04:44:21 -0000 1.11 @@ -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> - or <a class="ref" href="command.radio.html#command.radio">command.radio</a> - or <a class="ref" href="command.checkbox.html#command.checkbox">command.checkbox</a></dd></dl> + <span class="postfix or">or</span> <a class="ref" href="command.radio.html#command.radio">command.radio</a> + <span class="postfix or">or</span> <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.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- keygen.html 29 Jan 2010 10:17:06 -0000 1.28 +++ keygen.html 30 Jan 2010 04:44:23 -0000 1.29 @@ -23,19 +23,20 @@ <div id="keygen-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="keygen-mdl" href="keygen.html#keygen-mdl" class="element">keygen</a> = </span><span> - empty & <a class="ref" href="keygen.html#keygen.attrs">keygen.attrs</a> + empty + & <a class="ref" href="keygen.html#keygen.attrs">keygen.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="keygen-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#keygen-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="keygen.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="keygen.html#keygen.attrs.challenge" title="keygen.attrs.challenge">challenge</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="keygen.html#keygen.attrs.keytype" title="keygen.attrs.keytype">keytype</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="keygen.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="keygen.html#keygen.attrs.challenge" title="keygen.attrs.challenge">challenge</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="keygen.html#keygen.attrs.keytype" title="keygen.attrs.keytype">keytype</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> <span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="keygen-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#keygen-attributes">#</a></h2> <dl class="attr-defs"> Index: command.command.html =================================================================== RCS file: /sources/public/html5/markup/command.command.html,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- command.command.html 29 Jan 2010 10:17:04 -0000 1.28 +++ command.command.html 30 Jan 2010 04:44:21 -0000 1.29 @@ -31,11 +31,11 @@ </div></div><div class="no-number no-toc" id="command.command-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#command.command-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="command.command.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="command.command.html#command.command.attrs.type" title="command.command.attrs.type">type</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="command.command.html#command.command.attrs.label" title="command.command.attrs.label">label</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="command.command.html#command.command.attrs.icon" title="command.command.attrs.icon">icon</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="command.command.html#command.command.attrs.disabled" title="command.command.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="command.command.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="command.command.html#command.command.attrs.type" title="command.command.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="command.command.html#command.command.attrs.label" title="command.command.attrs.label">label</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="command.command.html#command.command.attrs.icon" title="command.command.attrs.icon">icon</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="command.command.html#command.command.attrs.disabled" title="command.command.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="command.command-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#command.command-attributes">#</a></h2> <dl class="attr-defs"> @@ -51,7 +51,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" or "" </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" + or "" + </span> </dt> <dd>Specifies that the command is not currently available.</dd> @@ -69,16 +72,16 @@ <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> - or <a class="ref" href="style.html#style-pattern">style</a> - or <a class="ref" href="meta.name.html#meta.name">meta.name</a> - or <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> - or <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> - or <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> - or <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> - or <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> - or <a class="ref" href="script.html#script">script</a> - or <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - or <a class="ref" href="command.html#command">command</a></li> + <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> + <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> + <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a> + <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> + <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a></li> <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul> </div> </div> Index: progress.html =================================================================== RCS file: /sources/public/html5/markup/progress.html,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- progress.html 29 Jan 2010 10:17:07 -0000 1.28 +++ progress.html 30 Jan 2010 04:44:24 -0000 1.29 @@ -23,16 +23,16 @@ <div id="progress-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="progress-mdl" href="progress.html#progress-mdl" class="element">progress</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="progress.html#progress.attrs">progress.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="progress-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#progress-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="progress.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="progress.html#progress.attrs.value" title="progress.attrs.value">value</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="progress.html#progress.attrs.max" title="progress.attrs.max">max</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="progress.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="progress.html#progress.attrs.value" title="progress.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="progress.html#progress.attrs.max" title="progress.attrs.max">max</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="progress-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#progress-attributes">#</a></h2> <dl class="attr-defs"> Index: dfn.html =================================================================== RCS file: /sources/public/html5/markup/dfn.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- dfn.html 29 Jan 2010 10:17:05 -0000 1.27 +++ dfn.html 30 Jan 2010 04:44:22 -0000 1.28 @@ -25,14 +25,14 @@ <div id="dfn-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="dfn-mdl" href="dfn.html#dfn-mdl" class="element">dfn</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="dfn.html#dfn.attrs">dfn.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="dfn-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#dfn-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="dfn.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="dfn.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="dfn-constraints"> Index: schema.html =================================================================== RCS file: /sources/public/html5/markup/schema.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- schema.html 29 Jan 2010 10:17:07 -0000 1.5 +++ schema.html 30 Jan 2010 04:44:25 -0000 1.6 @@ -104,140 +104,140 @@ <div class='define' id='common.elem.metadata-define'> <div class='patternname' id='the-common.elem.metadata'><a href='#the-common.elem.metadata'>common.elem.metadata</a> =</div> <span class='pattern' id='common.elem.metadata'><a class='ref' href='#link'>link</a> - or <a class='ref' href='#style'>style</a> - or <a class='ref' href='#meta.name'>meta.name</a> - or <a class='ref' href='#meta.http-equiv.refresh'>meta.http-equiv.refresh</a> - or <a class='ref' href='#meta.http-equiv.default-style'>meta.http-equiv.default-style</a> - or <a class='ref' href='#meta.http-equiv.content-language'>meta.http-equiv.content-language</a> - or <a class='ref' href='#meta.charset'>meta.charset</a> - or <a class='ref' href='#meta.http-equiv.content-type'>meta.http-equiv.content-type</a> - or <a class='ref' href='#script'>script</a> [...3827 lines suppressed...] </span> </div> <div class='define' id='meter.attrs-define'> <div class='patternname' id='the-meter.attrs'><a href='#the-meter.attrs'>meter.attrs</a> =</div> <span class='pattern' id='meter.attrs'><a class='ref' href='#common.attrs'>common.attrs</a> - & <a class='ref' href='#meter.attrs.value' title='meter.attrs.value'>value</a> - & <a class='ref' href='#meter.attrs.min' title='meter.attrs.min'>min</a> <span class='postfix optional'>[optional]</span> - & <a class='ref' href='#meter.attrs.low' title='meter.attrs.low'>low</a> <span class='postfix optional'>[optional]</span> - & <a class='ref' href='#meter.attrs.high' title='meter.attrs.high'>high</a> <span class='postfix optional'>[optional]</span> - & <a class='ref' href='#meter.attrs.max' title='meter.attrs.max'>max</a> <span class='postfix optional'>[optional]</span> - & <a class='ref' href='#meter.attrs.optimum' title='meter.attrs.optimum'>optimum</a> <span class='postfix optional'>[optional]</span> </span> + <span class='postfix &'>&</span> <a class='ref' href='#meter.attrs.value' title='meter.attrs.value'>value</a> + <span class='postfix &'>&</span> <a class='ref' href='#meter.attrs.min' title='meter.attrs.min'>min</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> + <span class='postfix &'>&</span> <a class='ref' href='#meter.attrs.low' title='meter.attrs.low'>low</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> + <span class='postfix &'>&</span> <a class='ref' href='#meter.attrs.high' title='meter.attrs.high'>high</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> + <span class='postfix &'>&</span> <a class='ref' href='#meter.attrs.max' title='meter.attrs.max'>max</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> + <span class='postfix &'>&</span> <a class='ref' href='#meter.attrs.optimum' title='meter.attrs.optimum'>optimum</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> </span> </div> <div class='define' id='meter.attrs.value-define'> <div class='patternname' id='the-meter.attrs.value'><a href='#the-meter.attrs.value'>value</a> =</div> Index: textarea.html =================================================================== RCS file: /sources/public/html5/markup/textarea.html,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- textarea.html 29 Jan 2010 10:17:08 -0000 1.30 +++ textarea.html 30 Jan 2010 04:44:25 -0000 1.31 @@ -30,20 +30,20 @@ </div></div><div class="no-number no-toc" id="textarea-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#textarea-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="textarea.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> <span class="postfix optional">[optional]</span> ) - & (<a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="textarea.html#textarea.attrs.rows" title="textarea.attrs.rows">rows</a> <span class="postfix optional">[optional]</span> - & ((<a class="ref" href="textarea.html#textarea.attrs.wrap.hard" title="textarea.attrs.wrap.hard">wrap.hard</a> <span class="postfix required">[required]</span> - & <a class="ref" href="textarea.html#textarea.attrs.cols" title="textarea.attrs.cols">cols</a> <span class="postfix required">[required]</span>) - or (<a class="ref" href="textarea.html#textarea.attrs.wrap.soft" title="textarea.attrs.wrap.soft">wrap.soft</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="textarea.html#textarea.attrs.cols" title="textarea.attrs.cols">cols</a> <span class="postfix optional">[optional]</span> )))</span></p></div></div> + <p><span class="pattern" id="textarea.attrs">(<a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ) + <span class="postfix &">&</span> (<a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="textarea.html#textarea.attrs.rows" title="textarea.attrs.rows">rows</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> ((<a class="ref" href="textarea.html#textarea.attrs.wrap.hard" title="textarea.attrs.wrap.hard">wrap.hard</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="textarea.html#textarea.attrs.cols" title="textarea.attrs.cols">cols</a><span class="postfix required" title="REQUIRED">★</span>) + <span class="postfix or">or</span> (<a class="ref" href="textarea.html#textarea.attrs.wrap.soft" title="textarea.attrs.wrap.soft">wrap.soft</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="textarea.html#textarea.attrs.cols" title="textarea.attrs.cols">cols</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )))</span></p></div></div> <div class="no-number no-toc" id="textarea-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#textarea-attributes">#</a></h2> <dl class="attr-defs"> Index: cite.html =================================================================== RCS file: /sources/public/html5/markup/cite.html,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- cite.html 29 Jan 2010 10:17:04 -0000 1.26 +++ cite.html 30 Jan 2010 04:44:21 -0000 1.27 @@ -27,14 +27,14 @@ <div id="cite-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="cite-mdl" href="cite.html#cite-mdl" class="element">cite</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="cite.html#cite.attrs">cite.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="cite-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#cite-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="cite.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="cite.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="cite-tags"> Index: meter.html =================================================================== RCS file: /sources/public/html5/markup/meter.html,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- meter.html 29 Jan 2010 10:17:07 -0000 1.29 +++ meter.html 30 Jan 2010 04:44:24 -0000 1.30 @@ -24,20 +24,20 @@ <div id="meter-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="meter-mdl" href="meter.html#meter-mdl" class="element">meter</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="meter.html#meter.attrs">meter.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="meter-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#meter-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="meter.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="meter.html#meter.attrs.value" title="meter.attrs.value">value</a> <span class="postfix required">[required]</span> - & <a class="ref" href="meter.html#meter.attrs.min" title="meter.attrs.min">min</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="meter.html#meter.attrs.low" title="meter.attrs.low">low</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="meter.html#meter.attrs.high" title="meter.attrs.high">high</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="meter.html#meter.attrs.max" title="meter.attrs.max">max</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="meter.html#meter.attrs.optimum" title="meter.attrs.optimum">optimum</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="meter.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="meter.html#meter.attrs.value" title="meter.attrs.value">value</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="meter.html#meter.attrs.min" title="meter.attrs.min">min</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="meter.html#meter.attrs.low" title="meter.attrs.low">low</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="meter.html#meter.attrs.high" title="meter.attrs.high">high</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="meter.html#meter.attrs.max" title="meter.attrs.max">max</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="meter.html#meter.attrs.optimum" title="meter.attrs.optimum">optimum</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="meter-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#meter-attributes">#</a></h2> <dl class="attr-defs"> Index: input.button.html =================================================================== RCS file: /sources/public/html5/markup/input.button.html,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- input.button.html 29 Jan 2010 10:17:06 -0000 1.28 +++ input.button.html 30 Jan 2010 04:44:22 -0000 1.29 @@ -30,13 +30,13 @@ </div></div><div class="no-number no-toc" id="input.button-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.button-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="input.button.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.button.html#input.button.attrs.type" title="input.button.attrs.type">type</a> <span class="postfix required">[required]</span> - & <a class="ref" href="input.button.html#input.button.attrs.value" title="input.button.attrs.value">value</a> <span class="postfix optional">[optional]</span> ) - & <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="input.button.attrs">(<a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.button.html#input.button.attrs.type" title="input.button.attrs.type">type</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="input.button.html#input.button.attrs.value" title="input.button.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ) + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="input.button-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.button-attributes">#</a></h2> <dl class="attr-defs"> Index: aside.html =================================================================== RCS file: /sources/public/html5/markup/aside.html,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- aside.html 29 Jan 2010 10:17:04 -0000 1.30 +++ aside.html 30 Jan 2010 04:44:21 -0000 1.31 @@ -25,16 +25,16 @@ <div id="aside-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="aside-mdl" href="aside.html#aside-mdl" class="element">aside</a> = </span><span> - <a class="ref" href="style.html#style-pattern">style</a> <span class="postfix zeroormore">[zero or more]</span> followed by + <a class="ref" href="style.html#style-pattern">style</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> <span class="postfix followedby">followed by</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="aside.html#aside.attrs">aside.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="aside-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#aside-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="aside.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="aside.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="aside-constraints"> Index: section.html =================================================================== RCS file: /sources/public/html5/markup/section.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- section.html 29 Jan 2010 10:17:08 -0000 1.32 +++ section.html 30 Jan 2010 04:44:25 -0000 1.33 @@ -23,16 +23,16 @@ <div id="section-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="section-mdl" href="section.html#section-mdl" class="element">section</a> = </span><span> - <a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a> <span class="postfix zeroormore">[zero or more]</span> followed by + <a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> <span class="postfix followedby">followed by</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="section.html#section.attrs">section.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="section-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#section-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="section.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="section.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="section-constraints"> Index: link.html =================================================================== RCS file: /sources/public/html5/markup/link.html,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- link.html 29 Jan 2010 10:17:07 -0000 1.29 +++ link.html 30 Jan 2010 04:44:24 -0000 1.30 @@ -24,19 +24,20 @@ <div id="link-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="link-mdl" href="link.html#link-mdl" class="element">link</a> = </span><span> - empty & <a class="ref" href="link.html#link.attrs">link.attrs</a> + empty + & <a class="ref" href="link.html#link.attrs">link.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="link-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#link-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="link.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="link.html#link.attrs.href" title="link.attrs.href">href</a> <span class="postfix required">[required]</span> - & <a class="ref" href="link.html#link.attrs.rel" title="link.attrs.rel">rel</a> <span class="postfix required">[required]</span> - & <a class="ref" href="link.html#link.attrs.hreflang" title="link.attrs.hreflang">hreflang</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="link.html#link.attrs.media" title="link.attrs.media">media</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="link.html#link.attrs.type" title="link.attrs.type">type</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="link.html#link.attrs.sizes" title="link.attrs.sizes">sizes</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="link.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="link.html#link.attrs.href" title="link.attrs.href">href</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="link.html#link.attrs.rel" title="link.attrs.rel">rel</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="link.html#link.attrs.hreflang" title="link.attrs.hreflang">hreflang</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="link.html#link.attrs.media" title="link.attrs.media">media</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="link.html#link.attrs.type" title="link.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="link.html#link.attrs.sizes" title="link.attrs.sizes">sizes</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="link-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#link-attributes">#</a></h2> <dl class="attr-defs"> @@ -76,7 +77,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" - or <a class="ref" href="datatypes.html#common.data.sizes" title="common.data.sizes">sizes</a> + <span class="postfix or">or</span> <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> @@ -126,20 +127,20 @@ <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> - or <a class="ref" href="style.html#style-pattern">style</a> - or <a class="ref" href="meta.name.html#meta.name">meta.name</a> - or <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> - or <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> - or <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> - or <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> - or <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> - or <a class="ref" href="script.html#script">script</a> - or <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - or <a class="ref" href="command.html#command">command</a></li> + <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> + <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> + <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a> + <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> + <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a></li> <li class="context-mdl"><a href="noscript.html#noscript.elem.head">noscript.elem.head</a> = (<a class="ref" href="link.html#link">link</a> - or <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> - or <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> - or <a class="ref" href="style.html#style-pattern">style</a>) <span class="postfix zeroormore">[zero or more]</span> </li></ul> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> + <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a>)<span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li></ul> </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.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- meta.http-equiv.refresh.html 29 Jan 2010 10:17:07 -0000 1.26 +++ meta.http-equiv.refresh.html 30 Jan 2010 04:44:24 -0000 1.27 @@ -35,11 +35,11 @@ </div></div><div class="no-number no-toc" id="meta.http-equiv.refresh-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#meta.http-equiv.refresh-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="meta.http-equiv.refresh.attrs"><a class="ref" href="common-attributes.html#common.attrs.core" title="common.attrs.core">common.attrs.core</a> <span class="postfix required">[required]</span> - & <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a> <span class="postfix required">[required]</span> - & <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> <span class="postfix required">[required]</span> - & <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.attrs.http-equiv.refresh" title="meta.http-equiv.attrs.http-equiv.refresh">http-equiv.refresh</a> <span class="postfix required">[required]</span> - & <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.attrs.content.refresh" title="meta.http-equiv.attrs.content.refresh">content.refresh</a> <span class="postfix required">[required]</span></span></p></div></div> + <p><span class="pattern" id="meta.http-equiv.refresh.attrs"><a class="ref" href="common-attributes.html#common.attrs.core" title="common.attrs.core">common.attrs.core</a> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> + <span class="postfix &">&</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.attrs.http-equiv.refresh" title="meta.http-equiv.attrs.http-equiv.refresh">http-equiv.refresh</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.attrs.content.refresh" title="meta.http-equiv.attrs.content.refresh">content.refresh</a><span class="postfix required" title="REQUIRED">★</span></span></p></div></div> <div class="no-number no-toc" id="meta.http-equiv.refresh-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#meta.http-equiv.refresh-attributes">#</a></h2> <dl class="attr-defs"> @@ -78,20 +78,20 @@ <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> - or <a class="ref" href="style.html#style-pattern">style</a> - or <a class="ref" href="meta.name.html#meta.name">meta.name</a> - or <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> - or <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> - or <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> - or <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> - or <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> - or <a class="ref" href="script.html#script">script</a> - or <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - or <a class="ref" href="command.html#command">command</a></li> + <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> + <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> + <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a> + <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> + <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a></li> <li class="context-mdl"><a href="noscript.html#noscript.elem.head">noscript.elem.head</a> = (<a class="ref" href="link.html#link">link</a> - or <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> - or <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> - or <a class="ref" href="style.html#style-pattern">style</a>) <span class="postfix zeroormore">[zero or more]</span> </li></ul> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> + <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a>)<span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li></ul> </div> </div> <hr class="footerbreak"></hr> Index: area.html =================================================================== RCS file: /sources/public/html5/markup/area.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- area.html 29 Jan 2010 10:17:04 -0000 1.32 +++ area.html 30 Jan 2010 04:44:20 -0000 1.33 @@ -25,27 +25,28 @@ <div id="area-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="area-mdl" href="area.html#area-mdl" class="element">area</a> = </span><span> - empty & <a class="ref" href="area.html#area.attrs">area.attrs</a> + empty + & <a class="ref" href="area.html#area.attrs">area.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="area-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#area-attr-mdl">#</a></h2> - <div class="attr-content-models"><p><span class="pattern" id="area.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & (<a class="ref" href="area.html#area.attrs.alt" title="area.attrs.alt">alt</a> <span class="postfix required">[required]</span> - & <a class="ref" href="area.html#area.attrs.href" title="area.attrs.href">href</a>) <span class="postfix optional">[optional]</span> - & <a class="ref" href="area.html#area.attrs.target" title="area.attrs.target">target</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="area.html#area.attrs.ping" title="area.attrs.ping">ping</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="area.html#area.attrs.rel" title="area.attrs.rel">rel</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="area.html#area.attrs.media" title="area.attrs.media">media</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="area.html#area.attrs.hreflang" title="area.attrs.hreflang">hreflang</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="area.html#area.attrs.type" title="area.attrs.type">type</a> <span class="postfix optional">[optional]</span> - & <br></br>(<a class="ref" href="area.html#area.attrs.shape.rect" title="area.attrs.shape.rect">shape.rect</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="area.html#area.attrs.coords.rect" title="area.attrs.coords.rect">coords.rect</a> <span class="postfix required">[required]</span>) - or (<a class="ref" href="area.html#area.attrs.shape.circle" title="area.attrs.shape.circle">shape.circle</a> <span class="postfix required">[required]</span> - & <a class="ref" href="area.html#area.attrs.coords.circle" title="area.attrs.coords.circle">coords.circle</a> <span class="postfix required">[required]</span>) - or (<a class="ref" href="area.html#area.attrs.shape.poly" title="area.attrs.shape.poly">shape.poly</a> <span class="postfix required">[required]</span> - & <a class="ref" href="area.html#area.attrs.coords.poly" title="area.attrs.coords.poly">coords.poly</a> <span class="postfix required">[required]</span>) - or <a class="ref" href="area.html#area.attrs.shape.default" title="area.attrs.shape.default">shape.default</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <div class="attr-content-models"><p><span class="pattern" id="area.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> (<a class="ref" href="area.html#area.attrs.alt" title="area.attrs.alt">alt</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="area.html#area.attrs.href" title="area.attrs.href">href</a>)<span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="area.html#area.attrs.target" title="area.attrs.target">target</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="area.html#area.attrs.ping" title="area.attrs.ping">ping</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="area.html#area.attrs.rel" title="area.attrs.rel">rel</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="area.html#area.attrs.media" title="area.attrs.media">media</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="area.html#area.attrs.hreflang" title="area.attrs.hreflang">hreflang</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="area.html#area.attrs.type" title="area.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <br></br>(<a class="ref" href="area.html#area.attrs.shape.rect" title="area.attrs.shape.rect">shape.rect</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="area.html#area.attrs.coords.rect" title="area.attrs.coords.rect">coords.rect</a><span class="postfix required" title="REQUIRED">★</span>) + <span class="postfix or">or</span> (<a class="ref" href="area.html#area.attrs.shape.circle" title="area.attrs.shape.circle">shape.circle</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="area.html#area.attrs.coords.circle" title="area.attrs.coords.circle">coords.circle</a><span class="postfix required" title="REQUIRED">★</span>) + <span class="postfix or">or</span> (<a class="ref" href="area.html#area.attrs.shape.poly" title="area.attrs.shape.poly">shape.poly</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="area.html#area.attrs.coords.poly" title="area.attrs.coords.poly">coords.poly</a><span class="postfix required" title="REQUIRED">★</span>) + <span class="postfix or">or</span> <a class="ref" href="area.html#area.attrs.shape.default" title="area.attrs.shape.default">shape.default</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="area-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#area-attributes">#</a></h2> <dl class="attr-defs"> Index: input.text.html =================================================================== RCS file: /sources/public/html5/markup/input.text.html,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- input.text.html 29 Jan 2010 10:17:06 -0000 1.28 +++ input.text.html 30 Jan 2010 04:44:23 -0000 1.29 @@ -30,21 +30,21 @@ </div></div><div class="no-number no-toc" id="input.text-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.text-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="input.text.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.text.html#input.text.attrs.type" title="input.text.attrs.type">type</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.text.html#input.text.attrs.value" title="input.text.attrs.value">value</a> <span class="postfix optional">[optional]</span> ) - & (<a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a> <span class="postfix optional">[optional]</span> )</span></p></div></div> + <p><span class="pattern" id="input.text.attrs">(<a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.text.html#input.text.attrs.type" title="input.text.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.text.html#input.text.attrs.value" title="input.text.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ) + <span class="postfix &">&</span> (<a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )</span></p></div></div> <div class="no-number no-toc" id="input.text-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.text-attributes">#</a></h2> <dl class="attr-defs"> Index: samp.html =================================================================== RCS file: /sources/public/html5/markup/samp.html,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- samp.html 29 Jan 2010 10:17:07 -0000 1.26 +++ samp.html 30 Jan 2010 04:44:24 -0000 1.27 @@ -24,14 +24,14 @@ <div id="samp-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="samp-mdl" href="samp.html#samp-mdl" class="element">samp</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="samp.html#samp.attrs">samp.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="samp-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#samp-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="samp.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="samp.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="samp-tags"> Index: h6.html =================================================================== RCS file: /sources/public/html5/markup/h6.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- h6.html 29 Jan 2010 10:17:05 -0000 1.32 +++ h6.html 30 Jan 2010 04:44:22 -0000 1.33 @@ -25,14 +25,14 @@ <div id="h6-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="h6-mdl" href="h6.html#h6-mdl" class="element">h6</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="h6.html#h6.attrs">h6.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="h6-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#h6-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="h6.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="h6.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="h6-constraints"> @@ -61,11 +61,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> - or <a class="ref" href="h2.html#h2">h2</a> - or <a class="ref" href="h3.html#h3">h3</a> - or <a class="ref" href="h4.html#h4">h4</a> - or <a class="ref" href="h5.html#h5">h5</a> - or <a class="ref" href="h6.html#h6">h6</a>) <span class="postfix oneormore">[one or more]</span> </li></ul> + <span class="postfix or">or</span> <a class="ref" href="h2.html#h2">h2</a> + <span class="postfix or">or</span> <a class="ref" href="h3.html#h3">h3</a> + <span class="postfix or">or</span> <a class="ref" href="h4.html#h4">h4</a> + <span class="postfix or">or</span> <a class="ref" href="h5.html#h5">h5</a> + <span class="postfix or">or</span> <a class="ref" href="h6.html#h6">h6</a>)<span class="postfix oneormore" title="ONE OR MORE">+</span> </li></ul> </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.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- input.checkbox.html 29 Jan 2010 10:17:06 -0000 1.28 +++ input.checkbox.html 30 Jan 2010 04:44:22 -0000 1.29 @@ -30,15 +30,15 @@ </div></div><div class="no-number no-toc" id="input.checkbox-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.checkbox-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="input.checkbox.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.checkbox.html#input.checkbox.attrs.type" title="input.checkbox.attrs.type">type</a> <span class="postfix required">[required]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.checked" title="input.attrs.checked">checked</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.checkbox.html#input.checkbox.attrs.value" title="input.checkbox.attrs.value">value</a> <span class="postfix optional">[optional]</span> ) - & (<a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> <span class="postfix optional">[optional]</span> )</span></p></div></div> + <p><span class="pattern" id="input.checkbox.attrs">(<a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.checkbox.html#input.checkbox.attrs.type" title="input.checkbox.attrs.type">type</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.checked" title="input.attrs.checked">checked</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.checkbox.html#input.checkbox.attrs.value" title="input.checkbox.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ) + <span class="postfix &">&</span> (<a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )</span></p></div></div> <div class="no-number no-toc" id="input.checkbox-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.checkbox-attributes">#</a></h2> <dl class="attr-defs"> Index: a.html =================================================================== RCS file: /sources/public/html5/markup/a.html,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- a.html 29 Jan 2010 10:17:04 -0000 1.40 +++ a.html 30 Jan 2010 04:44:20 -0000 1.41 @@ -25,28 +25,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> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <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> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="a.html#a.attrs">a.attrs</a> </span></dd> </dl> </div></div><div class="no-number no-toc" id="a-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#a-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="a.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="a.html#a.attrs.name" title="a.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="a.html#a.attrs.href" title="a.attrs.href">href</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="a.html#a.attrs.target" title="a.attrs.target">target</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="a.html#a.attrs.rel" title="a.attrs.rel">rel</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="a.html#a.attrs.hreflang" title="a.attrs.hreflang">hreflang</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="a.html#a.attrs.media" title="a.attrs.media">media</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="a.html#a.attrs.type" title="a.attrs.type">type</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="a.html#a.attrs.ping" title="a.attrs.ping">ping</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="a.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="a.html#a.attrs.name" title="a.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="a.html#a.attrs.href" title="a.attrs.href">href</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="a.html#a.attrs.target" title="a.attrs.target">target</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="a.html#a.attrs.rel" title="a.attrs.rel">rel</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="a.html#a.attrs.hreflang" title="a.attrs.hreflang">hreflang</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="a.html#a.attrs.media" title="a.attrs.media">media</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="a.html#a.attrs.type" title="a.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="a.html#a.attrs.ping" title="a.attrs.ping">ping</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="a-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#a-attributes">#</a></h2> <dl class="attr-defs"> Index: object.html =================================================================== RCS file: /sources/public/html5/markup/object.html,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- object.html 29 Jan 2010 10:17:07 -0000 1.34 +++ object.html 30 Jan 2010 04:44:24 -0000 1.35 @@ -23,31 +23,31 @@ <dl id="object-mdls"> <dt class="content-model"><span class="element-pattern-name" id="object.elem.flow"><a class="hash" href="object.html#object.elem.flow"><span class="element">object</span>.elem.flow</a> = </span></dt> <dd class="elem-mdl"><span> - <a class="ref" href="param.html#param">param</a> <span class="postfix zeroormore">[zero or more]</span> followed by + <a class="ref" href="param.html#param">param</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> <span class="postfix followedby">followed by</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="object.html#object.attrs">object.attrs</a> </span></dd> <dt class="content-model"><span class="element-pattern-name" id="object.elem.phrasing"><a class="hash" href="object.html#object.elem.phrasing"><span class="element">object</span>.elem.phrasing</a> = </span></dt> <dd class="elem-mdl"><span> - <a class="ref" href="param.html#param">param</a> <span class="postfix zeroormore">[zero or more]</span> followed by + <a class="ref" href="param.html#param">param</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> <span class="postfix followedby">followed by</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="object.html#object.attrs">object.attrs</a> </span></dd> </dl> </div></div><div class="no-number no-toc" id="object-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#object-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="object.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & ((<a class="ref" href="object.html#object.attrs.data" title="object.attrs.data">data</a> <span class="postfix required">[required]</span> - & <a class="ref" href="object.html#object.attrs.type" title="object.attrs.type">type</a> <span class="postfix optional">[optional]</span> ) - or <a class="ref" href="object.html#object.attrs.type" title="object.attrs.type">type</a> <span class="postfix required">[required]</span>) - & <a class="ref" href="object.html#object.attrs.height" title="object.attrs.height">height</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="object.html#object.attrs.width" title="object.attrs.width">width</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="object.html#object.attrs.usemap" title="object.attrs.usemap">usemap</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="object.html#object.attrs.name" title="object.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="object.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> ((<a class="ref" href="object.html#object.attrs.data" title="object.attrs.data">data</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="object.html#object.attrs.type" title="object.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ) + <span class="postfix or">or</span> <a class="ref" href="object.html#object.attrs.type" title="object.attrs.type">type</a><span class="postfix required" title="REQUIRED">★</span>) + <span class="postfix &">&</span> <a class="ref" href="object.html#object.attrs.height" title="object.attrs.height">height</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="object.html#object.attrs.width" title="object.attrs.width">width</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="object.html#object.attrs.usemap" title="object.attrs.usemap">usemap</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="object.html#object.attrs.name" title="object.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="object-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#object-attributes">#</a></h2> <dl class="attr-defs"> Index: input.tel.html =================================================================== RCS file: /sources/public/html5/markup/input.tel.html,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- input.tel.html 29 Jan 2010 10:17:06 -0000 1.26 +++ input.tel.html 30 Jan 2010 04:44:23 -0000 1.27 @@ -30,21 +30,21 @@ </div></div><div class="no-number no-toc" id="input.tel-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.tel-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="input.tel.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.tel.html#input.tel.attrs.type" title="input.tel.attrs.type">type</a> <span class="postfix required">[required]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.tel.html#input.tel.attrs.value" title="input.tel.attrs.value">value</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="input.tel.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.tel.html#input.tel.attrs.type" title="input.tel.attrs.type">type</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.tel.html#input.tel.attrs.value" title="input.tel.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="input.tel-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.tel-attributes">#</a></h2> <dl class="attr-defs"> Index: h4.html =================================================================== RCS file: /sources/public/html5/markup/h4.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- h4.html 29 Jan 2010 10:17:05 -0000 1.32 +++ h4.html 30 Jan 2010 04:44:22 -0000 1.33 @@ -25,14 +25,14 @@ <div id="h4-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="h4-mdl" href="h4.html#h4-mdl" class="element">h4</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="h4.html#h4.attrs">h4.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="h4-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#h4-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="h4.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="h4.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="h4-constraints"> @@ -61,11 +61,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> - or <a class="ref" href="h2.html#h2">h2</a> - or <a class="ref" href="h3.html#h3">h3</a> - or <a class="ref" href="h4.html#h4">h4</a> - or <a class="ref" href="h5.html#h5">h5</a> - or <a class="ref" href="h6.html#h6">h6</a>) <span class="postfix oneormore">[one or more]</span> </li></ul> + <span class="postfix or">or</span> <a class="ref" href="h2.html#h2">h2</a> + <span class="postfix or">or</span> <a class="ref" href="h3.html#h3">h3</a> + <span class="postfix or">or</span> <a class="ref" href="h4.html#h4">h4</a> + <span class="postfix or">or</span> <a class="ref" href="h5.html#h5">h5</a> + <span class="postfix or">or</span> <a class="ref" href="h6.html#h6">h6</a>)<span class="postfix oneormore" title="ONE OR MORE">+</span> </li></ul> </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.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- header.html 29 Jan 2010 10:17:05 -0000 1.30 +++ header.html 30 Jan 2010 04:44:22 -0000 1.31 @@ -25,14 +25,14 @@ <div id="header-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="header-mdl" href="header.html#header-mdl" class="element">header</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="header.html#header.attrs">header.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="header-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#header-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="header.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="header.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="header-constraints"> Index: b.html =================================================================== RCS file: /sources/public/html5/markup/b.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- b.html 29 Jan 2010 10:17:04 -0000 1.27 +++ b.html 30 Jan 2010 04:44:21 -0000 1.28 @@ -28,14 +28,14 @@ <div id="b-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="b-mdl" href="b.html#b-mdl" class="element">b</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="b.html#b.attrs">b.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="b-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#b-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="b.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="b.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="b-tags"> Index: img.html =================================================================== RCS file: /sources/public/html5/markup/img.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- img.html 29 Jan 2010 10:17:06 -0000 1.32 +++ img.html 30 Jan 2010 04:44:22 -0000 1.33 @@ -22,20 +22,21 @@ <div id="img-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="img-mdl" href="img.html#img-mdl" class="element">img</a> = </span><span> - empty & <a class="ref" href="img.html#img.attrs">img.attrs</a> + empty + & <a class="ref" href="img.html#img.attrs">img.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="img-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#img-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="img.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="img.html#img.attrs.src" title="img.attrs.src">src</a> <span class="postfix required">[required]</span> - & <a class="ref" href="img.html#img.attrs.alt" title="img.attrs.alt">alt</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="img.html#img.attrs.height" title="img.attrs.height">height</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="img.html#img.attrs.width" title="img.attrs.width">width</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="img.html#img.attrs.usemap" title="img.attrs.usemap">usemap</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="img.html#img.attrs.ismap" title="img.attrs.ismap">ismap</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="img.html#img.attrs.border" title="img.attrs.border">border</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="img.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="img.html#img.attrs.src" title="img.attrs.src">src</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="img.html#img.attrs.alt" title="img.attrs.alt">alt</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="img.html#img.attrs.height" title="img.attrs.height">height</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="img.html#img.attrs.width" title="img.attrs.width">width</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="img.html#img.attrs.usemap" title="img.attrs.usemap">usemap</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="img.html#img.attrs.ismap" title="img.attrs.ismap">ismap</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="img.html#img.attrs.border" title="img.attrs.border">border</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="img-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#img-attributes">#</a></h2> <dl class="attr-defs"> @@ -69,7 +70,9 @@ 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" or "" </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" or "" + </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.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- bdo.html 29 Jan 2010 10:17:04 -0000 1.29 +++ bdo.html 30 Jan 2010 04:44:21 -0000 1.30 @@ -26,14 +26,14 @@ <div id="bdo-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="bdo-mdl" href="bdo.html#bdo-mdl" class="element">bdo</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="bdo.html#bdo.attrs">bdo.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="bdo-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#bdo-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="bdo.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="bdo.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="bdo-constraints"> Index: input.number.html =================================================================== RCS file: /sources/public/html5/markup/input.number.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- input.number.html 29 Jan 2010 10:17:06 -0000 1.27 +++ input.number.html 30 Jan 2010 04:44:23 -0000 1.28 @@ -31,20 +31,20 @@ </div></div><div class="no-number no-toc" id="input.number-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.number-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="input.number.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.number.html#input.number.attrs.type" title="input.number.attrs.type">type</a> <span class="postfix required">[required]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.number.html#input.number.attrs.min" title="input.number.attrs.min">min</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.number.html#input.number.attrs.max" title="input.number.attrs.max">max</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.number.html#input.number.attrs.value" title="input.number.attrs.value">value</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="input.number.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.number.html#input.number.attrs.type" title="input.number.attrs.type">type</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.number.html#input.number.attrs.min" title="input.number.attrs.min">min</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.number.html#input.number.attrs.max" title="input.number.attrs.max">max</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.number.html#input.number.attrs.value" title="input.number.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="input.number-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.number-attributes">#</a></h2> <dl class="attr-defs"> Index: col.html =================================================================== RCS file: /sources/public/html5/markup/col.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- col.html 29 Jan 2010 10:17:04 -0000 1.27 +++ col.html 30 Jan 2010 04:44:21 -0000 1.28 @@ -24,14 +24,15 @@ <div id="col-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="col-mdl" href="col.html#col-mdl" class="element">col</a> = </span><span> - empty & <a class="ref" href="col.html#col.attrs">col.attrs</a> + empty + & <a class="ref" href="col.html#col.attrs">col.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="col-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#col-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="col.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="col.html#col.attrs.span" title="col.attrs.span">span</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="col.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="col.html#col.attrs.span" title="col.attrs.span">span</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="col-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#col-attributes">#</a></h2> <dl class="attr-defs"> @@ -78,8 +79,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> <span class="postfix zeroormore">[zero or more]</span> - or <a class="ref" href="colgroup.html#colgroup.attrs.span" title="colgroup.attrs.span">span</a> <span class="postfix optional">[optional]</span> </li></ul> + <li class="context-mdl"><a href="colgroup.html#colgroup-mdl">colgroup</a> = <a class="ref" href="col.html#col">col</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> + <span class="postfix or">or</span> <a class="ref" href="colgroup.html#colgroup.attrs.span" title="colgroup.attrs.span">span</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </li></ul> </div> <div class="no-number no-toc" id="col-display"> Index: command.radio.html =================================================================== RCS file: /sources/public/html5/markup/command.radio.html,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- command.radio.html 29 Jan 2010 10:17:05 -0000 1.28 +++ command.radio.html 30 Jan 2010 04:44:21 -0000 1.29 @@ -31,13 +31,13 @@ </div></div><div class="no-number no-toc" id="command.radio-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#command.radio-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="command.radio.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & (<a class="ref" href="command.radio.html#command.radio.attrs.type" title="command.radio.attrs.type">type</a> <span class="postfix required">[required]</span> - & <a class="ref" href="command.radio.html#command.radio.attrs.radiogroup" title="command.radio.attrs.radiogroup">radiogroup</a> <span class="postfix required">[required]</span> - & <a class="ref" href="command.radio.html#command.radio.attrs.checked" title="command.radio.attrs.checked">checked</a> <span class="postfix optional">[optional]</span> ) - & <a class="ref" href="command.radio.html#command.radio.attrs.label" title="command.radio.attrs.label">label</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="command.radio.html#command.radio.attrs.icon" title="command.radio.attrs.icon">icon</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="command.radio.html#command.radio.attrs.disabled" title="command.radio.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="command.radio.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> (<a class="ref" href="command.radio.html#command.radio.attrs.type" title="command.radio.attrs.type">type</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="command.radio.html#command.radio.attrs.radiogroup" title="command.radio.attrs.radiogroup">radiogroup</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="command.radio.html#command.radio.attrs.checked" title="command.radio.attrs.checked">checked</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ) + <span class="postfix &">&</span> <a class="ref" href="command.radio.html#command.radio.attrs.label" title="command.radio.attrs.label">label</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="command.radio.html#command.radio.attrs.icon" title="command.radio.attrs.icon">icon</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="command.radio.html#command.radio.attrs.disabled" title="command.radio.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="command.radio-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#command.radio-attributes">#</a></h2> <dl class="attr-defs"> @@ -49,7 +49,9 @@ <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" or "" </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" or "" + </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> @@ -60,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" or "" </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" + or "" + </span> </dt> <dd>Specifies that the command is not currently available.</dd> @@ -78,16 +83,16 @@ <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> - or <a class="ref" href="style.html#style-pattern">style</a> - or <a class="ref" href="meta.name.html#meta.name">meta.name</a> - or <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> - or <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> - or <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> - or <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> - or <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> - or <a class="ref" href="script.html#script">script</a> - or <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - or <a class="ref" href="command.html#command">command</a></li> + <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> + <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> + <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a> + <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> + <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a></li> <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul> </div> </div> Index: input.datetime.html =================================================================== RCS file: /sources/public/html5/markup/input.datetime.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- input.datetime.html 29 Jan 2010 10:17:06 -0000 1.27 +++ input.datetime.html 30 Jan 2010 04:44:23 -0000 1.28 @@ -32,20 +32,20 @@ </div></div><div class="no-number no-toc" id="input.datetime-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.datetime-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="input.datetime.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.datetime.html#input.datetime.attrs.type" title="input.datetime.attrs.type">type</a> <span class="postfix required">[required]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.datetime.html#input.datetime.attrs.min" title="input.datetime.attrs.min">min</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.datetime.html#input.datetime.attrs.max" title="input.datetime.attrs.max">max</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.datetime.html#input.datetime.attrs.value" title="input.datetime.attrs.value">value</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="input.datetime.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.datetime.html#input.datetime.attrs.type" title="input.datetime.attrs.type">type</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.datetime.html#input.datetime.attrs.min" title="input.datetime.attrs.min">min</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.datetime.html#input.datetime.attrs.max" title="input.datetime.attrs.max">max</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.datetime.html#input.datetime.attrs.value" title="input.datetime.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="input.datetime-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.datetime-attributes">#</a></h2> <dl class="attr-defs"> Index: input.password.html =================================================================== RCS file: /sources/public/html5/markup/input.password.html,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- input.password.html 29 Jan 2010 10:17:06 -0000 1.28 +++ input.password.html 30 Jan 2010 04:44:23 -0000 1.29 @@ -30,20 +30,20 @@ </div></div><div class="no-number no-toc" id="input.password-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.password-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="input.password.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.password.html#input.password.attrs.type" title="input.password.attrs.type">type</a> <span class="postfix required">[required]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.password.html#input.password.attrs.value" title="input.password.attrs.value">value</a> <span class="postfix optional">[optional]</span> ) - & (<a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a> <span class="postfix optional">[optional]</span> )</span></p></div></div> + <p><span class="pattern" id="input.password.attrs">(<a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.password.html#input.password.attrs.type" title="input.password.attrs.type">type</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.password.html#input.password.attrs.value" title="input.password.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ) + <span class="postfix &">&</span> (<a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )</span></p></div></div> <div class="no-number no-toc" id="input.password-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.password-attributes">#</a></h2> <dl class="attr-defs"> Index: embed.html =================================================================== RCS file: /sources/public/html5/markup/embed.html,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- embed.html 29 Jan 2010 10:17:05 -0000 1.30 +++ embed.html 30 Jan 2010 04:44:22 -0000 1.31 @@ -22,17 +22,18 @@ <div id="embed-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="embed-mdl" href="embed.html#embed-mdl" class="element">embed</a> = </span><span> - empty & <a class="ref" href=".html#embed.attrs">embed.attrs</a> + empty + & <a class="ref" href=".html#embed.attrs">embed.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="embed-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#embed-attr-mdl">#</a></h2> - <div class="attr-content-models"><div class="attr-content-model"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="embed.html#embed.attrs.src" title="embed.attrs.src">src</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="embed.html#embed.attrs.type" title="embed.attrs.type">type</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="embed.html#embed.attrs.height" title="embed.attrs.height">height</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="embed.html#embed.attrs.width" title="embed.attrs.width">width</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href=".html#embed.attrs.other" title="embed.attrs.other">embed.attrs.other</a> <span class="postfix zeroormore">[zero or more]</span> </div><div class="attr-content-model"><span class="attr-prose-desc">Any other attribute that has no namespace.</span></div></div></div> + <div class="attr-content-models"><div class="attr-content-model"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="embed.html#embed.attrs.src" title="embed.attrs.src">src</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="embed.html#embed.attrs.type" title="embed.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="embed.html#embed.attrs.height" title="embed.attrs.height">height</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="embed.html#embed.attrs.width" title="embed.attrs.width">width</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <span class="attr-prose-desc">Any other attribute that has no namespace</span></div></div></div> <div class="no-number no-toc" id="embed-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#embed-attributes">#</a></h2> <dl class="attr-defs"> Index: dd.html =================================================================== RCS file: /sources/public/html5/markup/dd.html,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- dd.html 29 Jan 2010 10:17:05 -0000 1.30 +++ dd.html 30 Jan 2010 04:44:21 -0000 1.31 @@ -27,14 +27,14 @@ <div id="dd-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="dd-mdl" href="dd.html#dd-mdl" class="element">dd</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="dd.html#dd.attrs">dd.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="dd-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#dd-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="dd.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="dd.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="dd-tags"> @@ -52,8 +52,8 @@ <div class="no-number no-toc" id="dd-context"> <h2 class="element-subhead">Permitted contexts <a class="hash" href="#dd-context">#</a></h2> <ul> - <li class="context-mdl"><a href="dl.html#dl-mdl">dl</a> = (<a class="ref" href="dt.html#dt">dt</a> <span class="postfix oneormore">[one or more]</span> followed by - <a class="ref" href="dd.html#dd">dd</a> <span class="postfix oneormore">[one or more]</span> ) <span class="postfix zeroormore">[zero or more]</span> </li></ul> + <li class="context-mdl"><a href="dl.html#dl-mdl">dl</a> = (<a class="ref" href="dt.html#dt">dt</a><span class="postfix oneormore" title="ONE OR MORE">+</span> <span class="postfix followedby">followed by</span> + <a class="ref" href="dd.html#dd">dd</a><span class="postfix oneormore" title="ONE OR MORE">+</span> )<span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li></ul> </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.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- common-models.html 29 Jan 2010 10:17:05 -0000 1.21 +++ common-models.html 30 Jan 2010 04:44:21 -0000 1.22 @@ -24,41 +24,41 @@ <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> - or <a class="ref" href="a.html#a.elem.flow">a.elem.flow</a> - or <a class="ref" href="p.html#p">p</a> - or <a class="ref" href="hr.html#hr">hr</a> - or <a class="ref" href="pre.html#pre">pre</a> - or <a class="ref" href="ul.html#ul">ul</a> - or <a class="ref" href="ol.html#ol">ol</a> - or <a class="ref" href="dl.html#dl">dl</a> - or <a class="ref" href="div.html#div">div</a> - or <a class="ref" href="h1.html#h1">h1</a> - or <a class="ref" href="h2.html#h2">h2</a> - or <a class="ref" href="h3.html#h3">h3</a> - or <a class="ref" href="h4.html#h4">h4</a> - or <a class="ref" href="h5.html#h5">h5</a> - or <a class="ref" href="h6.html#h6">h6</a> - or <a class="ref" href="hgroup.html#hgroup">hgroup</a> - or <a class="ref" href="address.html#address">address</a> - or <a class="ref" href="blockquote.html#blockquote">blockquote</a> - or <a class="ref" href="ins.html#ins.elem.flow">ins.elem.flow</a> - or <a class="ref" href="del.html#del.elem.flow">del.elem.flow</a> - or <a class="ref" href="object.html#object.elem.flow">object.elem.flow</a> - or <a class="ref" href="map.html#map.elem.flow">map.elem.flow</a> - or <a class="ref" href="noscript.html#noscript.elem.flow">noscript.elem.flow</a> - or <a class="ref" href="section.html#section">section</a> - or <a class="ref" href="nav.html#nav">nav</a> - or <a class="ref" href="article.html#article">article</a> - or <a class="ref" href="aside.html#aside">aside</a> - or <a class="ref" href="header.html#header">header</a> - or <a class="ref" href="footer.html#footer">footer</a> - or <a class="ref" href="video.html#video.elem.flow">video.elem.flow</a> - or <a class="ref" href="audio.html#audio.elem.flow">audio.elem.flow</a> - or <a class="ref" href="table.html#table">table</a> - or <a class="ref" href="form.html#form">form</a> - or <a class="ref" href="fieldset.html#fieldset">fieldset</a> - or <a class="ref" href="menu.html#menu">menu</a> - or <a class="ref" href="canvas.html#canvas.elem.flow">canvas.elem.flow</a> + <span class="postfix or">or</span> <a class="ref" href="a.html#a.elem.flow">a.elem.flow</a> + <span class="postfix or">or</span> <a class="ref" href="p.html#p">p</a> + <span class="postfix or">or</span> <a class="ref" href="hr.html#hr">hr</a> + <span class="postfix or">or</span> <a class="ref" href="pre.html#pre">pre</a> + <span class="postfix or">or</span> <a class="ref" href="ul.html#ul">ul</a> + <span class="postfix or">or</span> <a class="ref" href="ol.html#ol">ol</a> + <span class="postfix or">or</span> <a class="ref" href="dl.html#dl">dl</a> + <span class="postfix or">or</span> <a class="ref" href="div.html#div">div</a> + <span class="postfix or">or</span> <a class="ref" href="h1.html#h1">h1</a> + <span class="postfix or">or</span> <a class="ref" href="h2.html#h2">h2</a> + <span class="postfix or">or</span> <a class="ref" href="h3.html#h3">h3</a> + <span class="postfix or">or</span> <a class="ref" href="h4.html#h4">h4</a> + <span class="postfix or">or</span> <a class="ref" href="h5.html#h5">h5</a> + <span class="postfix or">or</span> <a class="ref" href="h6.html#h6">h6</a> + <span class="postfix or">or</span> <a class="ref" href="hgroup.html#hgroup">hgroup</a> + <span class="postfix or">or</span> <a class="ref" href="address.html#address">address</a> + <span class="postfix or">or</span> <a class="ref" href="blockquote.html#blockquote">blockquote</a> + <span class="postfix or">or</span> <a class="ref" href="ins.html#ins.elem.flow">ins.elem.flow</a> + <span class="postfix or">or</span> <a class="ref" href="del.html#del.elem.flow">del.elem.flow</a> + <span class="postfix or">or</span> <a class="ref" href="object.html#object.elem.flow">object.elem.flow</a> + <span class="postfix or">or</span> <a class="ref" href="map.html#map.elem.flow">map.elem.flow</a> + <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.flow">noscript.elem.flow</a> + <span class="postfix or">or</span> <a class="ref" href="section.html#section">section</a> + <span class="postfix or">or</span> <a class="ref" href="nav.html#nav">nav</a> + <span class="postfix or">or</span> <a class="ref" href="article.html#article">article</a> + <span class="postfix or">or</span> <a class="ref" href="aside.html#aside">aside</a> + <span class="postfix or">or</span> <a class="ref" href="header.html#header">header</a> + <span class="postfix or">or</span> <a class="ref" href="footer.html#footer">footer</a> + <span class="postfix or">or</span> <a class="ref" href="video.html#video.elem.flow">video.elem.flow</a> + <span class="postfix or">or</span> <a class="ref" href="audio.html#audio.elem.flow">audio.elem.flow</a> + <span class="postfix or">or</span> <a class="ref" href="table.html#table">table</a> + <span class="postfix or">or</span> <a class="ref" href="form.html#form">form</a> + <span class="postfix or">or</span> <a class="ref" href="fieldset.html#fieldset">fieldset</a> + <span class="postfix or">or</span> <a class="ref" href="menu.html#menu">menu</a> + <span class="postfix or">or</span> <a class="ref" href="canvas.html#canvas.elem.flow">canvas.elem.flow</a> </dd> </dl> </div> @@ -67,16 +67,16 @@ <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> - or <a class="ref" href="style.html#style-pattern">style</a> - or <a class="ref" href="meta.name.html#meta.name">meta.name</a> - or <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> - or <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> - or <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> - or <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> - or <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> - or <a class="ref" href="script.html#script">script</a> - or <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - or <a class="ref" href="command.html#command">command</a> + <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> + <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> + <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a> + <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> + <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a> </dd> </dl> </div> @@ -85,51 +85,51 @@ <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> - or <a class="ref" href="em.html#em">em</a> - or <a class="ref" href="strong.html#strong">strong</a> - or <a class="ref" href="small.html#small">small</a> - or <a class="ref" href="mark.html#mark">mark</a> - or <a class="ref" href="abbr.html#abbr">abbr</a> - or <a class="ref" href="dfn.html#dfn">dfn</a> - or <a class="ref" href="i.html#i">i</a> - or <a class="ref" href="b.html#b">b</a> - or <a class="ref" href="code.html#code">code</a> - or <a class="ref" href="var.html#var">var</a> - or <a class="ref" href="samp.html#samp">samp</a> - or <a class="ref" href="kbd.html#kbd">kbd</a> - or <a class="ref" href="sup.html#sup">sup</a> - or <a class="ref" href="sub.html#sub">sub</a> - or <a class="ref" href="q.html#q">q</a> - or <a class="ref" href="cite.html#cite">cite</a> - or <a class="ref" href="span.html#span">span</a> - or <a class="ref" href="bdo.html#bdo">bdo</a> - or <a class="ref" href="br.html#br">br</a> - or <a class="ref" href="ins.html#ins.elem.phrasing">ins.elem.phrasing</a> - or <a class="ref" href="del.html#del.elem.phrasing">del.elem.phrasing</a> - or <a class="ref" href="img.html#img">img</a> - or <a class="ref" href="embed.html#embed">embed</a> - or <a class="ref" href="object.html#object.elem.phrasing">object.elem.phrasing</a> - or <a class="ref" href="iframe.html#iframe">iframe</a> - or <a class="ref" href="map.html#map.elem.phrasing">map.elem.phrasing</a> - or <a class="ref" href="area.html#area">area</a> - or <a class="ref" href="script.html#script">script</a> - or <a class="ref" href="noscript.html#noscript.elem.phrasing">noscript.elem.phrasing</a> - or <a class="ref" href="ruby.html#ruby">ruby</a> - or <a class="ref" href="video.html#video.elem.phrasing">video.elem.phrasing</a> - or <a class="ref" href="audio.html#audio.elem.phrasing">audio.elem.phrasing</a> - or <a class="ref" href="input.html#input">input</a> - or <a class="ref" href="textarea.html#textarea">textarea</a> - or <a class="ref" href="select.html#select">select</a> - or <a class="ref" href="button.html#button">button</a> - or <a class="ref" href="label.html#label">label</a> - or <a class="ref" href="output.html#output">output</a> - or <a class="ref" href="datalist.html#datalist">datalist</a> - or <a class="ref" href="keygen.html#keygen">keygen</a> - or <a class="ref" href="progress.html#progress">progress</a> - or <a class="ref" href="command.html#command">command</a> - or <a class="ref" href="canvas.html#canvas.elem.phrasing">canvas.elem.phrasing</a> - or <a class="ref" href="time.html#time">time</a> - or <a class="ref" href="meter.html#meter">meter</a> + <span class="postfix or">or</span> <a class="ref" href="em.html#em">em</a> + <span class="postfix or">or</span> <a class="ref" href="strong.html#strong">strong</a> + <span class="postfix or">or</span> <a class="ref" href="small.html#small">small</a> + <span class="postfix or">or</span> <a class="ref" href="mark.html#mark">mark</a> + <span class="postfix or">or</span> <a class="ref" href="abbr.html#abbr">abbr</a> + <span class="postfix or">or</span> <a class="ref" href="dfn.html#dfn">dfn</a> + <span class="postfix or">or</span> <a class="ref" href="i.html#i">i</a> + <span class="postfix or">or</span> <a class="ref" href="b.html#b">b</a> + <span class="postfix or">or</span> <a class="ref" href="code.html#code">code</a> + <span class="postfix or">or</span> <a class="ref" href="var.html#var">var</a> + <span class="postfix or">or</span> <a class="ref" href="samp.html#samp">samp</a> + <span class="postfix or">or</span> <a class="ref" href="kbd.html#kbd">kbd</a> + <span class="postfix or">or</span> <a class="ref" href="sup.html#sup">sup</a> + <span class="postfix or">or</span> <a class="ref" href="sub.html#sub">sub</a> + <span class="postfix or">or</span> <a class="ref" href="q.html#q">q</a> + <span class="postfix or">or</span> <a class="ref" href="cite.html#cite">cite</a> + <span class="postfix or">or</span> <a class="ref" href="span.html#span">span</a> + <span class="postfix or">or</span> <a class="ref" href="bdo.html#bdo">bdo</a> + <span class="postfix or">or</span> <a class="ref" href="br.html#br">br</a> + <span class="postfix or">or</span> <a class="ref" href="ins.html#ins.elem.phrasing">ins.elem.phrasing</a> + <span class="postfix or">or</span> <a class="ref" href="del.html#del.elem.phrasing">del.elem.phrasing</a> + <span class="postfix or">or</span> <a class="ref" href="img.html#img">img</a> + <span class="postfix or">or</span> <a class="ref" href="embed.html#embed">embed</a> + <span class="postfix or">or</span> <a class="ref" href="object.html#object.elem.phrasing">object.elem.phrasing</a> + <span class="postfix or">or</span> <a class="ref" href="iframe.html#iframe">iframe</a> + <span class="postfix or">or</span> <a class="ref" href="map.html#map.elem.phrasing">map.elem.phrasing</a> + <span class="postfix or">or</span> <a class="ref" href="area.html#area">area</a> + <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a> + <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.phrasing">noscript.elem.phrasing</a> + <span class="postfix or">or</span> <a class="ref" href="ruby.html#ruby">ruby</a> + <span class="postfix or">or</span> <a class="ref" href="video.html#video.elem.phrasing">video.elem.phrasing</a> + <span class="postfix or">or</span> <a class="ref" href="audio.html#audio.elem.phrasing">audio.elem.phrasing</a> + <span class="postfix or">or</span> <a class="ref" href="input.html#input">input</a> + <span class="postfix or">or</span> <a class="ref" href="textarea.html#textarea">textarea</a> + <span class="postfix or">or</span> <a class="ref" href="select.html#select">select</a> + <span class="postfix or">or</span> <a class="ref" href="button.html#button">button</a> + <span class="postfix or">or</span> <a class="ref" href="label.html#label">label</a> + <span class="postfix or">or</span> <a class="ref" href="output.html#output">output</a> + <span class="postfix or">or</span> <a class="ref" href="datalist.html#datalist">datalist</a> + <span class="postfix or">or</span> <a class="ref" href="keygen.html#keygen">keygen</a> + <span class="postfix or">or</span> <a class="ref" href="progress.html#progress">progress</a> + <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a> + <span class="postfix or">or</span> <a class="ref" href="canvas.html#canvas.elem.phrasing">canvas.elem.phrasing</a> + <span class="postfix or">or</span> <a class="ref" href="time.html#time">time</a> + <span class="postfix or">or</span> <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.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- ul.html 29 Jan 2010 10:17:08 -0000 1.24 +++ ul.html 30 Jan 2010 04:44:26 -0000 1.25 @@ -24,14 +24,14 @@ <div id="ul-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="ul-mdl" href="ul.html#ul-mdl" class="element">ul</a> = </span><span> - <a class="ref" href="li.html#li-pattern">li</a> <span class="postfix zeroormore">[zero or more]</span> + <a class="ref" href="li.html#li-pattern">li</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> & <a class="ref" href="ul.html#ul.attrs">ul.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="ul-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#ul-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="ul.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="ul.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="ul-constraints"> Index: input.time.html =================================================================== RCS file: /sources/public/html5/markup/input.time.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- input.time.html 29 Jan 2010 10:17:06 -0000 1.27 +++ input.time.html 30 Jan 2010 04:44:23 -0000 1.28 @@ -31,20 +31,20 @@ </div></div><div class="no-number no-toc" id="input.time-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.time-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="input.time.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.time.html#input.time.attrs.type" title="input.time.attrs.type">type</a> <span class="postfix required">[required]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.time.html#input.time.attrs.min" title="input.time.attrs.min">min</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.time.html#input.time.attrs.max" title="input.time.attrs.max">max</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.time.html#input.time.attrs.value" title="input.time.attrs.value">value</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="input.time.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.time.html#input.time.attrs.type" title="input.time.attrs.type">type</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.time.html#input.time.attrs.min" title="input.time.attrs.min">min</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.time.html#input.time.attrs.max" title="input.time.attrs.max">max</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.time.html#input.time.attrs.value" title="input.time.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="input.time-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.time-attributes">#</a></h2> <dl class="attr-defs"> Index: dt.html =================================================================== RCS file: /sources/public/html5/markup/dt.html,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- dt.html 29 Jan 2010 10:17:05 -0000 1.30 +++ dt.html 30 Jan 2010 04:44:22 -0000 1.31 @@ -27,14 +27,14 @@ <div id="dt-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="dt-mdl" href="dt.html#dt-mdl" class="element">dt</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="dt.html#dt.attrs">dt.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="dt-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#dt-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="dt.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="dt.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="dt-tags"> @@ -51,8 +51,8 @@ <div class="no-number no-toc" id="dt-context"> <h2 class="element-subhead">Permitted contexts <a class="hash" href="#dt-context">#</a></h2> <ul> - <li class="context-mdl"><a href="dl.html#dl-mdl">dl</a> = (<a class="ref" href="dt.html#dt">dt</a> <span class="postfix oneormore">[one or more]</span> followed by - <a class="ref" href="dd.html#dd">dd</a> <span class="postfix oneormore">[one or more]</span> ) <span class="postfix zeroormore">[zero or more]</span> </li></ul> + <li class="context-mdl"><a href="dl.html#dl-mdl">dl</a> = (<a class="ref" href="dt.html#dt">dt</a><span class="postfix oneormore" title="ONE OR MORE">+</span> <span class="postfix followedby">followed by</span> + <a class="ref" href="dd.html#dd">dd</a><span class="postfix oneormore" title="ONE OR MORE">+</span> )<span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li></ul> </div> <div class="no-number no-toc" id="dt-display"> Index: strong.html =================================================================== RCS file: /sources/public/html5/markup/strong.html,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- strong.html 29 Jan 2010 10:17:08 -0000 1.26 +++ strong.html 30 Jan 2010 04:44:25 -0000 1.27 @@ -23,14 +23,14 @@ <div id="strong-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="strong-mdl" href="strong.html#strong-mdl" class="element">strong</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="strong.html#strong.attrs">strong.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="strong-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#strong-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="strong.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="strong.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="strong-tags"> Index: q.html =================================================================== RCS file: /sources/public/html5/markup/q.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- q.html 29 Jan 2010 10:17:07 -0000 1.27 +++ q.html 30 Jan 2010 04:44:24 -0000 1.28 @@ -23,15 +23,15 @@ <div id="q-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="q-mdl" href="q.html#q-mdl" class="element">q</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="q.html#q.attrs">q.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="q-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#q-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="q.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="q.html#q.attrs.cite" title="q.attrs.cite">cite</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="q.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="q.html#q.attrs.cite" title="q.attrs.cite">cite</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="q-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#q-attributes">#</a></h2> <dl class="attr-defs"> Index: li.html =================================================================== RCS file: /sources/public/html5/markup/li.html,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- li.html 29 Jan 2010 10:17:07 -0000 1.30 +++ li.html 30 Jan 2010 04:44:24 -0000 1.31 @@ -24,26 +24,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> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <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> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <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> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="li.html#mli.attrs">mli.attrs</a> </span></dd> </dl> </div></div><div class="no-number no-toc" id="li-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#li-attr-mdl">#</a></h2> - <div class="attr-content-models"><p><span class="pattern" id="li.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p><p><span class="pattern" id="oli.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="li.html#oli.attrs.value" title="oli.attrs.value">value</a> <span class="postfix optional">[optional]</span> </span></p><p><span class="pattern" id="mli.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <div class="attr-content-models"><p><span class="pattern" id="li.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p><p><span class="pattern" id="oli.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="li.html#oli.attrs.value" title="oli.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p><p><span class="pattern" id="mli.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="li-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#li-attributes">#</a></h2> <dl class="attr-defs"> @@ -77,11 +77,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> <span class="postfix zeroormore">[zero or more]</span> </li> - <li class="context-mdl"><a href="ol.html#ol-mdl">ol</a> = <a class="ref" href="li.html#oli">oli</a> <span class="postfix zeroormore">[zero or more]</span> </li> - <li class="context-mdl"><a href="menu.html#menu-mdl">menu</a> = <a class="ref" href="li.html#mli">mli</a> <span class="postfix zeroormore">[zero or more]</span> - or (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> )</li></ul> + <li class="context-mdl"><a href="ul.html#ul-mdl">ul</a> = <a class="ref" href="li.html#li-pattern">li</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li> + <li class="context-mdl"><a href="ol.html#ol-mdl">ol</a> = <a class="ref" href="li.html#oli">oli</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li> + <li class="context-mdl"><a href="menu.html#menu-mdl">menu</a> = <a class="ref" href="li.html#mli">mli</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> + <span class="postfix or">or</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li></ul> </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.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- style.html 29 Jan 2010 10:17:08 -0000 1.31 +++ style.html 30 Jan 2010 04:44:25 -0000 1.32 @@ -37,13 +37,13 @@ </div></div><div class="no-number no-toc" id="style-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#style-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="style.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="style.html#style.attrs.type" title="style.attrs.type">type</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="style.html#style.attrs.media" title="style.attrs.media">media</a> <span class="postfix optional">[optional]</span> </span></p> - <p><span class="pattern" id="style.scoped.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="style.html#style.attrs.type" title="style.attrs.type">type</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="style.html#style.attrs.media" title="style.attrs.media">media</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="style.html#style.attrs.scoped" title="style.attrs.scoped">scoped</a> <span class="postfix required">[required]</span></span></p></div></div> + <p><span class="pattern" id="style.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="style.html#style.attrs.type" title="style.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="style.html#style.attrs.media" title="style.attrs.media">media</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p> + <p><span class="pattern" id="style.scoped.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="style.html#style.attrs.type" title="style.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="style.html#style.attrs.media" title="style.attrs.media">media</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="style.html#style.attrs.scoped" title="style.attrs.scoped">scoped</a><span class="postfix required" title="REQUIRED">★</span></span></p></div></div> <div class="no-number no-toc" id="style-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#style-attributes">#</a></h2> <dl class="attr-defs"> @@ -57,7 +57,9 @@ </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" or "" </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" or "" + </span> </dt> <dd>Indicates that the specified style information is meant to apply only to the <a href="style.html#style" class="element">style</a> @@ -79,32 +81,32 @@ <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> - or <a class="ref" href="style.html#style-pattern">style</a> - or <a class="ref" href="meta.name.html#meta.name">meta.name</a> - or <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> - or <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> - or <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> - or <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> - or <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> - or <a class="ref" href="script.html#script">script</a> - or <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - or <a class="ref" href="command.html#command">command</a></li> - <li class="context-mdl"><a href="div.html#div-mdl">div</a> = <a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a> <span class="postfix zeroormore">[zero or more]</span> followed by + <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> + <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> + <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a> + <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> + <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a></li> + <li class="context-mdl"><a href="div.html#div-mdl">div</a> = <a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> <span class="postfix followedby">followed by</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> )</li> + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li> <li class="context-mdl"><a href="noscript.html#noscript.elem.head">noscript.elem.head</a> = (<a class="ref" href="link.html#link">link</a> - or <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> - or <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> - or <a class="ref" href="style.html#style-pattern">style</a>) <span class="postfix zeroormore">[zero or more]</span> </li> - <li class="context-mdl"><a href="section.html#section-mdl">section</a> = <a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a> <span class="postfix zeroormore">[zero or more]</span> followed by + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> + <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a>)<span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li> + <li class="context-mdl"><a href="section.html#section-mdl">section</a> = <a class="ref" href="style.html#style.elem.scoped">style.elem.scoped</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> <span class="postfix followedby">followed by</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> )</li> - <li class="context-mdl"><a href="article.html#article-mdl">article</a> = <a class="ref" href="style.html#style-pattern">style</a> <span class="postfix zeroormore">[zero or more]</span> followed by + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li> + <li class="context-mdl"><a href="article.html#article-mdl">article</a> = <a class="ref" href="style.html#style-pattern">style</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> <span class="postfix followedby">followed by</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> )</li> - <li class="context-mdl"><a href="aside.html#aside-mdl">aside</a> = <a class="ref" href="style.html#style-pattern">style</a> <span class="postfix zeroormore">[zero or more]</span> followed by + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li> + <li class="context-mdl"><a href="aside.html#aside-mdl">aside</a> = <a class="ref" href="style.html#style-pattern">style</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> <span class="postfix followedby">followed by</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> )</li></ul> + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li></ul> </div> <div class="no-number no-toc" id="style-display"> Index: del.html =================================================================== RCS file: /sources/public/html5/markup/del.html,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- del.html 29 Jan 2010 10:17:05 -0000 1.31 +++ del.html 30 Jan 2010 04:44:22 -0000 1.32 @@ -25,22 +25,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> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <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> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="del.html#del.attrs">del.attrs</a> </span></dd> </dl> </div></div><div class="no-number no-toc" id="del-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#del-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="del.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="del.html#del.attrs.cite" title="del.attrs.cite">cite</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="del.html#del.attrs.datetime" title="del.attrs.datetime">datetime</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="del.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="del.html#del.attrs.cite" title="del.attrs.cite">cite</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="del.html#del.attrs.datetime" title="del.attrs.datetime">datetime</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="del-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#del-attributes">#</a></h2> <dl class="attr-defs"> Index: menu.html =================================================================== RCS file: /sources/public/html5/markup/menu.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- menu.html 29 Jan 2010 10:17:07 -0000 1.32 +++ menu.html 30 Jan 2010 04:44:24 -0000 1.33 @@ -22,23 +22,24 @@ <div id="menu-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="menu-mdl" href="menu.html#menu-mdl" class="element">menu</a> = </span><span> - (<a class="ref" href="li.html#mli">li</a> <span class="postfix zeroormore">[zero or more]</span> - or (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> )) + (<a class="ref" href="li.html#mli">li</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> + <span class="postfix or">or</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )) & <a class="ref" href="menu.html#menu.attrs">menu.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="menu-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#menu-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="menu.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="menu.html#menu.attrs.type" title="menu.attrs.type">type</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="menu.html#menu.attrs.label" title="menu.attrs.label">label</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="menu.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="menu.html#menu.attrs.type" title="menu.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="menu.html#menu.attrs.label" title="menu.attrs.label">label</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="menu-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#menu-attributes">#</a></h2> <dl class="attr-defs"> <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" or "context" + "toolbar" + or "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.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- input.image.html 29 Jan 2010 10:17:06 -0000 1.28 +++ input.image.html 30 Jan 2010 04:44:23 -0000 1.29 @@ -33,21 +33,21 @@ </div></div><div class="no-number no-toc" id="input.image-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.image-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="input.image.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.image.html#input.image.attrs.type" title="input.image.attrs.type">type</a> <span class="postfix required">[required]</span> - & <a class="ref" href="input.image.html#input.image.attrs.alt" title="input.image.attrs.alt">alt</a> <span class="postfix required">[required]</span> - & <a class="ref" href="input.image.html#input.image.attrs.src" title="input.image.attrs.src">src</a> <span class="postfix optional">[optional]</span> ) - & (<a class="ref" href="forms-attributes.html#shared-form.attrs.formaction" title="shared-form.attrs.formaction">formaction</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.formenctype" title="shared-form.attrs.formenctype">formenctype</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.formmethod" title="shared-form.attrs.formmethod">formmethod</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.formtarget" title="shared-form.attrs.formtarget">formtarget</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.formnovalidate" title="shared-form.attrs.formnovalidate">formnovalidate</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.image.html#input.image.attrs.height" title="input.image.attrs.height">height</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.image.html#input.image.attrs.width" title="input.image.attrs.width">width</a> <span class="postfix optional">[optional]</span> )</span></p></div></div> + <p><span class="pattern" id="input.image.attrs">(<a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.image.html#input.image.attrs.type" title="input.image.attrs.type">type</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="input.image.html#input.image.attrs.alt" title="input.image.attrs.alt">alt</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="input.image.html#input.image.attrs.src" title="input.image.attrs.src">src</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ) + <span class="postfix &">&</span> (<a class="ref" href="forms-attributes.html#shared-form.attrs.formaction" title="shared-form.attrs.formaction">formaction</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formenctype" title="shared-form.attrs.formenctype">formenctype</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formmethod" title="shared-form.attrs.formmethod">formmethod</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formtarget" title="shared-form.attrs.formtarget">formtarget</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formnovalidate" title="shared-form.attrs.formnovalidate">formnovalidate</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.image.html#input.image.attrs.height" title="input.image.attrs.height">height</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.image.html#input.image.attrs.width" title="input.image.attrs.width">width</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )</span></p></div></div> <div class="no-number no-toc" id="input.image-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.image-attributes">#</a></h2> <dl class="attr-defs"> Index: code.html =================================================================== RCS file: /sources/public/html5/markup/code.html,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- code.html 29 Jan 2010 10:17:04 -0000 1.26 +++ code.html 30 Jan 2010 04:44:21 -0000 1.27 @@ -25,14 +25,14 @@ <div id="code-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="code-mdl" href="code.html#code-mdl" class="element">code</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="code.html#code.attrs">code.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="code-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#code-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="code.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="code.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="code-tags"> Index: h2.html =================================================================== RCS file: /sources/public/html5/markup/h2.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- h2.html 29 Jan 2010 10:17:05 -0000 1.32 +++ h2.html 30 Jan 2010 04:44:22 -0000 1.33 @@ -25,14 +25,14 @@ <div id="h2-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="h2-mdl" href="h2.html#h2-mdl" class="element">h2</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="h2.html#h2.attrs">h2.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="h2-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#h2-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="h2.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="h2.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="h2-constraints"> @@ -61,11 +61,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> - or <a class="ref" href="h2.html#h2">h2</a> - or <a class="ref" href="h3.html#h3">h3</a> - or <a class="ref" href="h4.html#h4">h4</a> - or <a class="ref" href="h5.html#h5">h5</a> - or <a class="ref" href="h6.html#h6">h6</a>) <span class="postfix oneormore">[one or more]</span> </li></ul> + <span class="postfix or">or</span> <a class="ref" href="h2.html#h2">h2</a> + <span class="postfix or">or</span> <a class="ref" href="h3.html#h3">h3</a> + <span class="postfix or">or</span> <a class="ref" href="h4.html#h4">h4</a> + <span class="postfix or">or</span> <a class="ref" href="h5.html#h5">h5</a> + <span class="postfix or">or</span> <a class="ref" href="h6.html#h6">h6</a>)<span class="postfix oneormore" title="ONE OR MORE">+</span> </li></ul> </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.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- head.html 29 Jan 2010 10:17:05 -0000 1.25 +++ head.html 30 Jan 2010 04:44:22 -0000 1.26 @@ -32,15 +32,15 @@ <div id="head-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="head-mdl" href="head.html#head-mdl" class="element">head</a> = </span><span> <a class="ref" href="title.html#title">title</a> - & <a class="ref" href="base.html#base">base</a> <span class="postfix optional">[optional]</span> - & (<a class="ref" href="common-models.html#common.elem.metadata">common.elem.metadata</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="base.html#base">base</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> (<a class="ref" href="common-models.html#common.elem.metadata">common.elem.metadata</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="head.html#head.attrs">head.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="head-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#head-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="head.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="head.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="head-constraints"> @@ -71,7 +71,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> followed by + <li class="context-mdl"><a href="html.html#html-mdl">html</a> = <a class="ref" href="head.html#head">head</a> <span class="postfix followedby">followed by</span> <a class="ref" href="body.html#body">body</a></li></ul> </div> Index: p.html =================================================================== RCS file: /sources/public/html5/markup/p.html,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- p.html 29 Jan 2010 10:17:07 -0000 1.30 +++ p.html 30 Jan 2010 04:44:24 -0000 1.31 @@ -23,14 +23,14 @@ <div id="p-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="p-mdl" href="p.html#p-mdl" class="element">p</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="p.html#p.attrs">p.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="p-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#p-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="p.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="p.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="p-constraints"> Index: map.html =================================================================== RCS file: /sources/public/html5/markup/map.html,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- map.html 29 Jan 2010 10:17:07 -0000 1.30 +++ map.html 30 Jan 2010 04:44:24 -0000 1.31 @@ -25,21 +25,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> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <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> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="map.html#map.attrs">map.attrs</a> </span></dd> </dl> </div></div><div class="no-number no-toc" id="map-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#map-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="map.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="map.html#map.attrs.name" title="map.attrs.name">name</a> <span class="postfix required">[required]</span></span></p></div></div> + <p><span class="pattern" id="map.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="map.html#map.attrs.name" title="map.attrs.name">name</a><span class="postfix required" title="REQUIRED">★</span></span></p></div></div> <div class="no-number no-toc" id="map-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#map-attributes">#</a></h2> <dl class="attr-defs"> Index: input.file.html =================================================================== RCS file: /sources/public/html5/markup/input.file.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- input.file.html 29 Jan 2010 10:17:06 -0000 1.27 +++ input.file.html 30 Jan 2010 04:44:23 -0000 1.28 @@ -32,15 +32,15 @@ </div></div><div class="no-number no-toc" id="input.file-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.file-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="input.file.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.file.html#input.file.attrs.type" title="input.file.attrs.type">type</a> <span class="postfix required">[required]</span> - & <a class="ref" href="input.file.html#input.file.attrs.accept" title="input.file.attrs.accept">accept</a> <span class="postfix optional">[optional]</span> ) - & (<a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.multiple" title="input.attrs.multiple">multiple</a> <span class="postfix optional">[optional]</span> )</span></p></div></div> + <p><span class="pattern" id="input.file.attrs">(<a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.file.html#input.file.attrs.type" title="input.file.attrs.type">type</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="input.file.html#input.file.attrs.accept" title="input.file.attrs.accept">accept</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ) + <span class="postfix &">&</span> (<a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.multiple" title="input.attrs.multiple">multiple</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )</span></p></div></div> <div class="no-number no-toc" id="input.file-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.file-attributes">#</a></h2> <dl class="attr-defs"> Index: input.radio.html =================================================================== RCS file: /sources/public/html5/markup/input.radio.html,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- input.radio.html 29 Jan 2010 10:17:06 -0000 1.28 +++ input.radio.html 30 Jan 2010 04:44:23 -0000 1.29 @@ -31,15 +31,15 @@ </div></div><div class="no-number no-toc" id="input.radio-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.radio-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="input.radio.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.radio.html#input.radio.attrs.type" title="input.radio.attrs.type">type</a> <span class="postfix required">[required]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.checked" title="input.attrs.checked">checked</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.radio.html#input.radio.attrs.value" title="input.radio.attrs.value">value</a> <span class="postfix optional">[optional]</span> ) - & (<a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> <span class="postfix optional">[optional]</span> )</span></p></div></div> + <p><span class="pattern" id="input.radio.attrs">(<a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.radio.html#input.radio.attrs.type" title="input.radio.attrs.type">type</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.checked" title="input.attrs.checked">checked</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.radio.html#input.radio.attrs.value" title="input.radio.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ) + <span class="postfix &">&</span> (<a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )</span></p></div></div> <div class="no-number no-toc" id="input.radio-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.radio-attributes">#</a></h2> <dl class="attr-defs"> Index: command.checkbox.html =================================================================== RCS file: /sources/public/html5/markup/command.checkbox.html,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- command.checkbox.html 29 Jan 2010 10:17:04 -0000 1.28 +++ command.checkbox.html 30 Jan 2010 04:44:21 -0000 1.29 @@ -31,12 +31,12 @@ </div></div><div class="no-number no-toc" id="command.checkbox-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#command.checkbox-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="command.checkbox.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & (<a class="ref" href="command.checkbox.html#command.checkbox.attrs.type" title="command.checkbox.attrs.type">type</a> <span class="postfix required">[required]</span> - & <a class="ref" href="command.checkbox.html#command.checkbox.attrs.checked" title="command.checkbox.attrs.checked">checked</a> <span class="postfix optional">[optional]</span> ) - & <a class="ref" href="command.checkbox.html#command.checkbox.attrs.label" title="command.checkbox.attrs.label">label</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="command.checkbox.html#command.checkbox.attrs.icon" title="command.checkbox.attrs.icon">icon</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="command.checkbox.html#command.checkbox.attrs.disabled" title="command.checkbox.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="command.checkbox.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> (<a class="ref" href="command.checkbox.html#command.checkbox.attrs.type" title="command.checkbox.attrs.type">type</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="command.checkbox.html#command.checkbox.attrs.checked" title="command.checkbox.attrs.checked">checked</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ) + <span class="postfix &">&</span> <a class="ref" href="command.checkbox.html#command.checkbox.attrs.label" title="command.checkbox.attrs.label">label</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="command.checkbox.html#command.checkbox.attrs.icon" title="command.checkbox.attrs.icon">icon</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="command.checkbox.html#command.checkbox.attrs.disabled" title="command.checkbox.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="command.checkbox-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#command.checkbox-attributes">#</a></h2> <dl class="attr-defs"> @@ -44,7 +44,9 @@ <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" or "" </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" or "" + </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> @@ -55,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" or "" </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" + or "" + </span> </dt> <dd>Specifies that the command is not currently available.</dd> @@ -73,16 +78,16 @@ <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> - or <a class="ref" href="style.html#style-pattern">style</a> - or <a class="ref" href="meta.name.html#meta.name">meta.name</a> - or <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> - or <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> - or <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> - or <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> - or <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> - or <a class="ref" href="script.html#script">script</a> - or <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - or <a class="ref" href="command.html#command">command</a></li> + <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> + <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> + <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a> + <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> + <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a></li> <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li></ul> </div> </div> Index: param.html =================================================================== RCS file: /sources/public/html5/markup/param.html,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- param.html 29 Jan 2010 10:17:07 -0000 1.30 +++ param.html 30 Jan 2010 04:44:24 -0000 1.31 @@ -22,15 +22,16 @@ <div id="param-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="param-mdl" href="param.html#param-mdl" class="element">param</a> = </span><span> - empty & <a class="ref" href="param.html#param.attrs">param.attrs</a> + empty + & <a class="ref" href="param.html#param.attrs">param.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="param-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#param-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="param.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="param.html#param.attrs.name" title="param.attrs.name">name</a> <span class="postfix required">[required]</span> - & <a class="ref" href="param.html#param.attrs.value" title="param.attrs.value">value</a> <span class="postfix required">[required]</span></span></p></div></div> + <p><span class="pattern" id="param.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="param.html#param.attrs.name" title="param.attrs.name">name</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="param.html#param.attrs.value" title="param.attrs.value">value</a><span class="postfix required" title="REQUIRED">★</span></span></p></div></div> <div class="no-number no-toc" id="param-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#param-attributes">#</a></h2> <dl class="attr-defs"> @@ -70,12 +71,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> <span class="postfix zeroormore">[zero or more]</span> followed by + <li class="context-mdl"><a href="object.html#object.elem.flow">object.elem.flow</a> = <a class="ref" href="param.html#param">param</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> <span class="postfix followedby">followed by</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> )</li> - <li class="context-mdl"><a href="object.html#object.elem.phrasing">object.elem.phrasing</a> = <a class="ref" href="param.html#param">param</a> <span class="postfix zeroormore">[zero or more]</span> followed by + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li> + <li class="context-mdl"><a href="object.html#object.elem.phrasing">object.elem.phrasing</a> = <a class="ref" href="param.html#param">param</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> <span class="postfix followedby">followed by</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> )</li></ul> + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li></ul> </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.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- span.html 29 Jan 2010 10:17:08 -0000 1.26 +++ span.html 30 Jan 2010 04:44:25 -0000 1.27 @@ -24,14 +24,14 @@ <div id="span-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="span-mdl" href="span.html#span-mdl" class="element">span</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="span.html#span.attrs">span.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="span-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#span-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="span.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="span.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="span-tags"> Index: input.reset.html =================================================================== RCS file: /sources/public/html5/markup/input.reset.html,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- input.reset.html 29 Jan 2010 10:17:06 -0000 1.28 +++ input.reset.html 30 Jan 2010 04:44:23 -0000 1.29 @@ -30,13 +30,13 @@ </div></div><div class="no-number no-toc" id="input.reset-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.reset-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="input.reset.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.reset.html#input.reset.attrs.type" title="input.reset.attrs.type">type</a> <span class="postfix required">[required]</span> - & <a class="ref" href="input.reset.html#input.reset.attrs.value" title="input.reset.attrs.value">value</a> <span class="postfix optional">[optional]</span> ) - & <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="input.reset.attrs">(<a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.reset.html#input.reset.attrs.type" title="input.reset.attrs.type">type</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="input.reset.html#input.reset.attrs.value" title="input.reset.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ) + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="input.reset-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.reset-attributes">#</a></h2> <dl class="attr-defs"> Index: input.datetime-local.html =================================================================== RCS file: /sources/public/html5/markup/input.datetime-local.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- input.datetime-local.html 29 Jan 2010 10:17:06 -0000 1.27 +++ input.datetime-local.html 30 Jan 2010 04:44:23 -0000 1.28 @@ -32,20 +32,20 @@ </div></div><div class="no-number no-toc" id="input.datetime-local-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.datetime-local-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="input.datetime-local.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.datetime-local.html#input.datetime-local.attrs.type" title="input.datetime-local.attrs.type">type</a> <span class="postfix required">[required]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.datetime-local.html#input.datetime-local.attrs.min" title="input.datetime-local.attrs.min">min</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.datetime-local.html#input.datetime-local.attrs.max" title="input.datetime-local.attrs.max">max</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.datetime-local.html#input.datetime-local.attrs.value" title="input.datetime-local.attrs.value">value</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="input.datetime-local.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.datetime-local.html#input.datetime-local.attrs.type" title="input.datetime-local.attrs.type">type</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.datetime-local.html#input.datetime-local.attrs.min" title="input.datetime-local.attrs.min">min</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.datetime-local.html#input.datetime-local.attrs.max" title="input.datetime-local.attrs.max">max</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.step.float" title="input.attrs.step.float">step.float</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.datetime-local.html#input.datetime-local.attrs.value" title="input.datetime-local.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="input.datetime-local-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.datetime-local-attributes">#</a></h2> <dl class="attr-defs"> Index: input.color.html =================================================================== RCS file: /sources/public/html5/markup/input.color.html,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- input.color.html 29 Jan 2010 10:17:06 -0000 1.28 +++ input.color.html 30 Jan 2010 04:44:23 -0000 1.29 @@ -31,15 +31,15 @@ </div></div><div class="no-number no-toc" id="input.color-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.color-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="input.color.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.color.html#input.color.attrs.type" title="input.color.attrs.type">type</a> <span class="postfix required">[required]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.color.html#input.color.attrs.value" title="input.color.attrs.value">value</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="input.color.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.color.html#input.color.attrs.type" title="input.color.attrs.type">type</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.color.html#input.color.attrs.value" title="input.color.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="input.color-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.color-attributes">#</a></h2> <dl class="attr-defs"> Index: common-attributes.html =================================================================== RCS file: /sources/public/html5/markup/common-attributes.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- common-attributes.html 29 Jan 2010 10:17:05 -0000 1.27 +++ common-attributes.html 30 Jan 2010 04:44:21 -0000 1.28 @@ -18,9 +18,9 @@ <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> - & <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a> - & <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> + <dt class="content-model"><span class="common-pattern-name"><a href="common-attributes.html" id="common.attrs">common attributes</a></span> = </dt><dd><a class="ref" href="common-attributes.html#common.attrs.core" title="common.attrs.core">common.attrs.core</a> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> </dd> </dl> </div> @@ -28,19 +28,19 @@ <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> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#common.attrs.class" title="common.attrs.class">class</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#common.attrs.contenteditable" title="common.attrs.contenteditable">contenteditable</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#common.attrs.contextmenu" title="common.attrs.contextmenu">contextmenu</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#common.attrs.dir" title="common.attrs.dir">dir</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#common.attrs.draggable" title="common.attrs.draggable">draggable</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#common.attrs.hidden" title="common.attrs.hidden">hidden</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#common.attrs.id" title="common.attrs.id">id</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#common.attrs.lang" title="common.attrs.lang">lang</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#common.attrs.spellcheck" title="common.attrs.spellcheck">spellcheck</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#common.attrs.style" title="common.attrs.style">style</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#common.attrs.tabindex" title="common.attrs.tabindex">tabindex</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#common.attrs.title" title="common.attrs.title">title</a> <span class="postfix optional">[optional]</span> </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><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.class" title="common.attrs.class">class</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.contenteditable" title="common.attrs.contenteditable">contenteditable</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.contextmenu" title="common.attrs.contextmenu">contextmenu</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.dir" title="common.attrs.dir">dir</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.draggable" title="common.attrs.draggable">draggable</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.hidden" title="common.attrs.hidden">hidden</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.id" title="common.attrs.id">id</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.lang" title="common.attrs.lang">lang</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.spellcheck" title="common.attrs.spellcheck">spellcheck</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.style" title="common.attrs.style">style</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.tabindex" title="common.attrs.tabindex">tabindex</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.title" title="common.attrs.title">title</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </p> </div> </div> <div class="no-number no-toc"> @@ -60,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" or "false" or "" + "true" + or "false" + or "" </span> </dt> <dd>Specifies whether the <a href="syntax.html#contents">contents</a> @@ -74,13 +76,20 @@ 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" or "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" or "rtl" + </span> </dt> <dd>Specifies the element’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" or "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" + or "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" or "" </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" or "" + </span> </dt> <dd>Specifies that the element represents an element that is not yet, or is no longer, relevant.</dd> @@ -101,7 +110,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" or "false" or "" + "true" + or "false" + or "" </span> </dt> <dd>Specifies whether the element represents an element whose @@ -131,60 +142,60 @@ <h2 class="common-subhead">7.02. Event-handler attributes <a class="hash" href="#event-handler-attrs">#</a> <a class="toc-bak" href="Overview.html#event-handler-attrs-toc">T</a></h2><div id="common.attrs.event-handler-mdl"> <div class="content-models"> - <p><span class="common-pattern-name"><a href="common-attributes.html#common.attrs.event-handler" id="common.attrs.event-handler">common.attrs.event-handler</a></span> = <a class="ref" href="common-attributes.html#scripting.attr.onabort" title="scripting.attr.onabort">onabort</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onblur" title="scripting.attr.onblur">onblur</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.oncanplay" title="scripting.attr.oncanplay">oncanplay</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.oncanplaythrough" title="scripting.attr.oncanplaythrough">oncanplaythrough</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onchange" title="scripting.attr.onchange">onchange</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onclick" title="scripting.attr.onclick">onclick</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.oncontextmenu" title="scripting.attr.oncontextmenu">oncontextmenu</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.ondblclick" title="scripting.attr.ondblclick">ondblclick</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.ondrag" title="scripting.attr.ondrag">ondrag</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.ondragend" title="scripting.attr.ondragend">ondragend</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.ondragenter" title="scripting.attr.ondragenter">ondragenter</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.ondragleave" title="scripting.attr.ondragleave">ondragleave</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.ondragover" title="scripting.attr.ondragover">ondragover</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.ondragstart" title="scripting.attr.ondragstart">ondragstart</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.ondrop" title="scripting.attr.ondrop">ondrop</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.ondurationchange" title="scripting.attr.ondurationchange">ondurationchange</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onemptied" title="scripting.attr.onemptied">onemptied</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onended" title="scripting.attr.onended">onended</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onerror" title="scripting.attr.onerror">onerror</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onfocus" title="scripting.attr.onfocus">onfocus</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onformchange" title="scripting.attr.onformchange">onformchange</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onforminput" title="scripting.attr.onforminput">onforminput</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.oninput" title="scripting.attr.oninput">oninput</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.oninvalid" title="scripting.attr.oninvalid">oninvalid</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onkeydown" title="scripting.attr.onkeydown">onkeydown</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onkeypress" title="scripting.attr.onkeypress">onkeypress</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onkeyup" title="scripting.attr.onkeyup">onkeyup</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onload" title="scripting.attr.onload">onload</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onloadeddata" title="scripting.attr.onloadeddata">onloadeddata</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onloadedmetadata" title="scripting.attr.onloadedmetadata">onloadedmetadata</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onloadstart" title="scripting.attr.onloadstart">onloadstart</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onmousedown" title="scripting.attr.onmousedown">onmousedown</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onmousemove" title="scripting.attr.onmousemove">onmousemove</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onmouseout" title="scripting.attr.onmouseout">onmouseout</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onmouseover" title="scripting.attr.onmouseover">onmouseover</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onmouseup" title="scripting.attr.onmouseup">onmouseup</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onmousewheel" title="scripting.attr.onmousewheel">onmousewheel</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onpause" title="scripting.attr.onpause">onpause</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onplay" title="scripting.attr.onplay">onplay</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onplaying" title="scripting.attr.onplaying">onplaying</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onprogress" title="scripting.attr.onprogress">onprogress</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onratechange" title="scripting.attr.onratechange">onratechange</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onreadystatechange" title="scripting.attr.onreadystatechange">onreadystatechange</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onscroll" title="scripting.attr.onscroll">onscroll</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onseeked" title="scripting.attr.onseeked">onseeked</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onseeking" title="scripting.attr.onseeking">onseeking</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onselect" title="scripting.attr.onselect">onselect</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onshow" title="scripting.attr.onshow">onshow</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onstalled" title="scripting.attr.onstalled">onstalled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onsubmit" title="scripting.attr.onsubmit">onsubmit</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onsuspend" title="scripting.attr.onsuspend">onsuspend</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.ontimeupdate" title="scripting.attr.ontimeupdate">ontimeupdate</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onvolumechange" title="scripting.attr.onvolumechange">onvolumechange</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#scripting.attr.onwaiting" title="scripting.attr.onwaiting">onwaiting</a> <span class="postfix optional">[optional]</span> </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><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onblur" title="scripting.attr.onblur">onblur</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.oncanplay" title="scripting.attr.oncanplay">oncanplay</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.oncanplaythrough" title="scripting.attr.oncanplaythrough">oncanplaythrough</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onchange" title="scripting.attr.onchange">onchange</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onclick" title="scripting.attr.onclick">onclick</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.oncontextmenu" title="scripting.attr.oncontextmenu">oncontextmenu</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.ondblclick" title="scripting.attr.ondblclick">ondblclick</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.ondrag" title="scripting.attr.ondrag">ondrag</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.ondragend" title="scripting.attr.ondragend">ondragend</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.ondragenter" title="scripting.attr.ondragenter">ondragenter</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.ondragleave" title="scripting.attr.ondragleave">ondragleave</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.ondragover" title="scripting.attr.ondragover">ondragover</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.ondragstart" title="scripting.attr.ondragstart">ondragstart</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.ondrop" title="scripting.attr.ondrop">ondrop</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.ondurationchange" title="scripting.attr.ondurationchange">ondurationchange</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onemptied" title="scripting.attr.onemptied">onemptied</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onended" title="scripting.attr.onended">onended</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onerror" title="scripting.attr.onerror">onerror</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onfocus" title="scripting.attr.onfocus">onfocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onformchange" title="scripting.attr.onformchange">onformchange</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onforminput" title="scripting.attr.onforminput">onforminput</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.oninput" title="scripting.attr.oninput">oninput</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.oninvalid" title="scripting.attr.oninvalid">oninvalid</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onkeydown" title="scripting.attr.onkeydown">onkeydown</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onkeypress" title="scripting.attr.onkeypress">onkeypress</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onkeyup" title="scripting.attr.onkeyup">onkeyup</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onload" title="scripting.attr.onload">onload</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onloadeddata" title="scripting.attr.onloadeddata">onloadeddata</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onloadedmetadata" title="scripting.attr.onloadedmetadata">onloadedmetadata</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onloadstart" title="scripting.attr.onloadstart">onloadstart</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onmousedown" title="scripting.attr.onmousedown">onmousedown</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onmousemove" title="scripting.attr.onmousemove">onmousemove</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onmouseout" title="scripting.attr.onmouseout">onmouseout</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onmouseover" title="scripting.attr.onmouseover">onmouseover</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onmouseup" title="scripting.attr.onmouseup">onmouseup</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onmousewheel" title="scripting.attr.onmousewheel">onmousewheel</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onpause" title="scripting.attr.onpause">onpause</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onplay" title="scripting.attr.onplay">onplay</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onplaying" title="scripting.attr.onplaying">onplaying</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onprogress" title="scripting.attr.onprogress">onprogress</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onratechange" title="scripting.attr.onratechange">onratechange</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onreadystatechange" title="scripting.attr.onreadystatechange">onreadystatechange</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onscroll" title="scripting.attr.onscroll">onscroll</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onseeked" title="scripting.attr.onseeked">onseeked</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onseeking" title="scripting.attr.onseeking">onseeking</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onselect" title="scripting.attr.onselect">onselect</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onshow" title="scripting.attr.onshow">onshow</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onstalled" title="scripting.attr.onstalled">onstalled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onsubmit" title="scripting.attr.onsubmit">onsubmit</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onsuspend" title="scripting.attr.onsuspend">onsuspend</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.ontimeupdate" title="scripting.attr.ontimeupdate">ontimeupdate</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onvolumechange" title="scripting.attr.onvolumechange">onvolumechange</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#scripting.attr.onwaiting" title="scripting.attr.onwaiting">onwaiting</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </p> </div> </div> <div class="no-number no-toc"> @@ -355,9 +366,9 @@ <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> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#common.attrs.xmlspace" title="common.attrs.xmlspace">xml:space</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="common-attributes.html#common.attrs.xmlbase" title="common.attrs.xmlbase">xml:base</a> <span class="postfix optional">[optional]</span> </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><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.xmlspace" title="common.attrs.xmlspace">xml:space</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.xmlbase" title="common.attrs.xmlbase">xml:base</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </p> </div> </div> <div class="no-number no-toc"> Index: option.html =================================================================== RCS file: /sources/public/html5/markup/option.html,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- option.html 29 Jan 2010 10:17:07 -0000 1.31 +++ option.html 30 Jan 2010 04:44:24 -0000 1.32 @@ -31,15 +31,18 @@ </div></div><div class="no-number no-toc" id="option-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#option-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="option.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="option.html#option.attrs.selected" title="option.attrs.selected">selected</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="option.html#option.attrs.label" title="option.attrs.label">label</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="option.html#option.attrs.value" title="option.attrs.value">value</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="option.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="option.html#option.attrs.selected" title="option.attrs.selected">selected</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="option.html#option.attrs.label" title="option.attrs.label">label</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="option.html#option.attrs.value" title="option.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="option-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#option-attributes">#</a></h2> <dl class="attr-defs"> - <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" or "" </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" + or "" + </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> <span class="postfix zeroormore">[zero or more]</span> </li> - <li class="context-mdl"><a href="select.html#select-mdl">select</a> = <a class="ref" href="optgroup.html#optgroup">optgroup</a> <span class="postfix zeroormore">[zero or more]</span> - & <a class="ref" href="option.html#option">option</a> <span class="postfix zeroormore">[zero or more]</span> </li> - <li class="context-mdl"><a href="datalist.html#datalist-mdl">datalist</a> = <a class="ref" href="option.html#option">option</a> <span class="postfix zeroormore">[zero or more]</span> - & (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> )</li></ul> + <li class="context-mdl"><a href="optgroup.html#optgroup-mdl">optgroup</a> = <a class="ref" href="option.html#option">option</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li> + <li class="context-mdl"><a href="select.html#select-mdl">select</a> = <a class="ref" href="optgroup.html#optgroup">optgroup</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> + <span class="postfix &">&</span> <a class="ref" href="option.html#option">option</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li> + <li class="context-mdl"><a href="datalist.html#datalist-mdl">datalist</a> = <a class="ref" href="option.html#option">option</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> + <span class="postfix &">&</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li></ul> </div> </div> <hr class="footerbreak"></hr> Index: label.html =================================================================== RCS file: /sources/public/html5/markup/label.html,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- label.html 29 Jan 2010 10:17:06 -0000 1.31 +++ label.html 30 Jan 2010 04:44:23 -0000 1.32 @@ -23,16 +23,16 @@ <div id="label-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="label-mdl" href="label.html#label-mdl" class="element">label</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="label.html#label.attrs">label.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="label-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#label-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="label.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="label.html#label.attrs.for" title="label.attrs.for">for</a> <span class="postfix optional">[optional]</span> ) - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="label.attrs">(<a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="label.html#label.attrs.for" title="label.attrs.for">for</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ) + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="label-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#label-attributes">#</a></h2> <dl class="attr-defs"> Index: select.html =================================================================== RCS file: /sources/public/html5/markup/select.html,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- select.html 29 Jan 2010 10:17:08 -0000 1.28 +++ select.html 30 Jan 2010 04:44:25 -0000 1.29 @@ -23,20 +23,20 @@ <div id="select-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="select-mdl" href="select.html#select-mdl" class="element">select</a> = </span><span> - <a class="ref" href="optgroup.html#optgroup">optgroup</a> <span class="postfix zeroormore">[zero or more]</span> - & <a class="ref" href="option.html#option">option</a> <span class="postfix zeroormore">[zero or more]</span> + <a class="ref" href="optgroup.html#optgroup">optgroup</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> + <span class="postfix &">&</span> <a class="ref" href="option.html#option">option</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> & <a class="ref" href="select.html#select.attrs">select.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="select-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#select-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="select.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="select.html#select.attrs.size" title="select.attrs.size">size</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="select.html#select.attrs.multiple" title="select.attrs.multiple">multiple</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="select.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="select.html#select.attrs.size" title="select.attrs.size">size</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="select.html#select.attrs.multiple" title="select.attrs.multiple">multiple</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="select-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#select-attributes">#</a></h2> <dl class="attr-defs"> @@ -45,7 +45,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" or "" </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" + or "" + </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.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- noscript.html 29 Jan 2010 10:17:07 -0000 1.30 +++ noscript.html 30 Jan 2010 04:44:24 -0000 1.31 @@ -26,28 +26,28 @@ <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> - or <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> - or <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> - or <a class="ref" href="style.html#style-pattern">style</a>) <span class="postfix zeroormore">[zero or more]</span> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> + <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a>)<span class="postfix zeroormore" title="ZERO OR MORE">*</span> & <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> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <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> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="noscript.html#noscript.attrs">noscript.attrs</a> </span></dd> </dl> </div></div><div class="no-number no-toc" id="noscript-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#noscript-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="noscript.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="noscript.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="noscript-constraints"> @@ -74,16 +74,16 @@ <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> - or <a class="ref" href="style.html#style-pattern">style</a> - or <a class="ref" href="meta.name.html#meta.name">meta.name</a> - or <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> - or <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> - or <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> - or <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> - or <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> - or <a class="ref" href="script.html#script">script</a> - or <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - or <a class="ref" href="command.html#command">command</a></li> + <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> + <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> + <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a> + <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> + <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a></li> <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li> <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul> </div> Index: blockquote.html =================================================================== RCS file: /sources/public/html5/markup/blockquote.html,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- blockquote.html 29 Jan 2010 10:17:04 -0000 1.29 +++ blockquote.html 30 Jan 2010 04:44:21 -0000 1.30 @@ -26,15 +26,15 @@ <div id="blockquote-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="blockquote-mdl" href="blockquote.html#blockquote-mdl" class="element">blockquote</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="blockquote.html#blockquote.attrs">blockquote.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="blockquote-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#blockquote-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="blockquote.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="blockquote.html#blockquote.attrs.cite" title="blockquote.attrs.cite">cite</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="blockquote.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="blockquote.html#blockquote.attrs.cite" title="blockquote.attrs.cite">cite</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="blockquote-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#blockquote-attributes">#</a></h2> <dl class="attr-defs"> Index: hr.html =================================================================== RCS file: /sources/public/html5/markup/hr.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- hr.html 29 Jan 2010 10:17:05 -0000 1.27 +++ hr.html 30 Jan 2010 04:44:22 -0000 1.28 @@ -22,13 +22,14 @@ <div id="hr-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="hr-mdl" href="hr.html#hr-mdl" class="element">hr</a> = </span><span> - empty & <a class="ref" href="hr.html#hr.attrs">hr.attrs</a> + empty + & <a class="ref" href="hr.html#hr.attrs">hr.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="hr-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#hr-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="hr.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="hr.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="hr-constraints"> Index: td.html =================================================================== RCS file: /sources/public/html5/markup/td.html,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- td.html 29 Jan 2010 10:17:08 -0000 1.31 +++ td.html 30 Jan 2010 04:44:25 -0000 1.32 @@ -23,17 +23,17 @@ <div id="td-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="td-mdl" href="td.html#td-mdl" class="element">td</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="td.html#td.attrs">td.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="td-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#td-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="td.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="td.html#td.attrs.colspan" title="td.attrs.colspan">colspan</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="td.html#td.attrs.rowspan" title="td.attrs.rowspan">rowspan</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="td.html#td.attrs.headers" title="td.attrs.headers">headers</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="td.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="td.html#td.attrs.colspan" title="td.attrs.colspan">colspan</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="td.html#td.attrs.rowspan" title="td.attrs.rowspan">rowspan</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="td.html#td.attrs.headers" title="td.attrs.headers">headers</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="td-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#td-attributes">#</a></h2> <dl class="attr-defs"> @@ -121,7 +121,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> - or <a class="ref" href="th.html#th">th</a>) <span class="postfix zeroormore">[zero or more]</span> </li></ul> + <span class="postfix or">or</span> <a class="ref" href="th.html#th">th</a>)<span class="postfix zeroormore" title="ZERO OR MORE">*</span> </li></ul> </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.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- em.html 29 Jan 2010 10:17:05 -0000 1.27 +++ em.html 30 Jan 2010 04:44:22 -0000 1.28 @@ -25,14 +25,14 @@ <div id="em-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="em-mdl" href="em.html#em-mdl" class="element">em</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="em.html#em.attrs">em.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="em-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#em-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="em.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="em.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="em-tags"> Index: input.hidden.html =================================================================== RCS file: /sources/public/html5/markup/input.hidden.html,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- input.hidden.html 29 Jan 2010 10:17:06 -0000 1.28 +++ input.hidden.html 30 Jan 2010 04:44:23 -0000 1.29 @@ -31,12 +31,12 @@ </div></div><div class="no-number no-toc" id="input.hidden-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.hidden-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="input.hidden.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.hidden.html#input.hidden.attrs.type" title="input.hidden.attrs.type">type</a> <span class="postfix required">[required]</span> - & <a class="ref" href="input.hidden.html#input.hidden.attrs.value" title="input.hidden.attrs.value">value</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="input.hidden.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.hidden.html#input.hidden.attrs.type" title="input.hidden.attrs.type">type</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="input.hidden.html#input.hidden.attrs.value" title="input.hidden.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="input.hidden-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.hidden-attributes">#</a></h2> <dl class="attr-defs"> Index: caption.html =================================================================== RCS file: /sources/public/html5/markup/caption.html,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- caption.html 29 Jan 2010 10:17:04 -0000 1.28 +++ caption.html 30 Jan 2010 04:44:21 -0000 1.29 @@ -25,14 +25,14 @@ <div id="caption-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="caption-mdl" href="caption.html#caption-mdl" class="element">caption</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="caption.html#caption.attrs">caption.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="caption-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#caption-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="caption.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="caption.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="caption-constraints"> @@ -55,15 +55,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> <span class="postfix optional">[optional]</span> followed by - <a class="ref" href="colgroup.html#colgroup">colgroup</a> <span class="postfix zeroormore">[zero or more]</span> followed by - <a class="ref" href="thead.html#thead">thead</a> <span class="postfix optional">[optional]</span> followed by - ((<a class="ref" href="tfoot.html#tfoot">tfoot</a> followed by - (<a class="ref" href="tbody.html#tbody">tbody</a> <span class="postfix zeroormore">[zero or more]</span> - or <a class="ref" href="tr.html#tr">tr</a> <span class="postfix oneormore">[one or more]</span> )) - or ((<a class="ref" href="tbody.html#tbody">tbody</a> <span class="postfix zeroormore">[zero or more]</span> - or <a class="ref" href="tr.html#tr">tr</a> <span class="postfix oneormore">[one or more]</span> ) followed by - <a class="ref" href="tfoot.html#tfoot">tfoot</a> <span class="postfix optional">[optional]</span> ))</li></ul> + <li class="context-mdl"><a href="table.html#table-mdl">table</a> = <a class="ref" href="caption.html#caption">caption</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> <span class="postfix followedby">followed by</span> + <a class="ref" href="colgroup.html#colgroup">colgroup</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> <span class="postfix followedby">followed by</span> + <a class="ref" href="thead.html#thead">thead</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> <span class="postfix followedby">followed by</span> + ((<a class="ref" href="tfoot.html#tfoot">tfoot</a> <span class="postfix followedby">followed by</span> + (<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> + <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> )) + <span class="postfix or">or</span> ((<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> + <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> ) <span class="postfix followedby">followed by</span> + <a class="ref" href="tfoot.html#tfoot">tfoot</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ))</li></ul> </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.83 retrieving revision 1.84 diff -u -d -r1.83 -r1.84 --- style.css 29 Jan 2010 10:17:08 -0000 1.83 +++ style.css 30 Jan 2010 04:44:25 -0000 1.84 @@ -504,11 +504,14 @@ .status-missing dt { margin-top: 8px; } -a.rnc-symbol { +.postfix { text-decoration: none; - color: #777; + color: #999; font-weight: bold; } +.postfix.required { + color: goldenrod !important; +} #rnc-symbol-list dt { font-weight: normal; color: orangered; Index: kbd.html =================================================================== RCS file: /sources/public/html5/markup/kbd.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- kbd.html 29 Jan 2010 10:17:06 -0000 1.27 +++ kbd.html 30 Jan 2010 04:44:23 -0000 1.28 @@ -23,14 +23,14 @@ <div id="kbd-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="kbd-mdl" href="kbd.html#kbd-mdl" class="element">kbd</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="kbd.html#kbd.attrs">kbd.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="kbd-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#kbd-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="kbd.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="kbd.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="kbd-tags"> Index: base.html =================================================================== RCS file: /sources/public/html5/markup/base.html,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- base.html 29 Jan 2010 10:17:04 -0000 1.28 +++ base.html 30 Jan 2010 04:44:21 -0000 1.29 @@ -25,15 +25,16 @@ <div id="base-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="base-mdl" href="base.html#base-mdl" class="element">base</a> = </span><span> - empty & <a class="ref" href="base.html#base.attrs">base.attrs</a> + empty + & <a class="ref" href="base.html#base.attrs">base.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="base-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#base-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="base.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="base.html#base.attrs.href" title="base.attrs.href">href</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="base.html#base.attrs.target" title="base.attrs.target">target</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="base.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="base.html#base.attrs.href" title="base.attrs.href">href</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="base.html#base.attrs.target" title="base.attrs.target">target</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="base-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#base-attributes">#</a></h2> <dl class="attr-defs"> @@ -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> - & <a class="ref" href="base.html#base">base</a> <span class="postfix optional">[optional]</span> - & (<a class="ref" href="common-models.html#common.elem.metadata">common.elem.metadata</a> <span class="postfix zeroormore">[zero or more]</span> )</li></ul> + <span class="postfix &">&</span> <a class="ref" href="base.html#base">base</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> (<a class="ref" href="common-models.html#common.elem.metadata">common.elem.metadata</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li></ul> </div> </div> <hr class="footerbreak"></hr> Index: canvas.html =================================================================== RCS file: /sources/public/html5/markup/canvas.html,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- canvas.html 29 Jan 2010 10:17:04 -0000 1.26 +++ canvas.html 30 Jan 2010 04:44:21 -0000 1.27 @@ -26,22 +26,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> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <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> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="canvas.html#canvas.attrs">canvas.attrs</a> </span></dd> </dl> </div></div><div class="no-number no-toc" id="canvas-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#canvas-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="canvas.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="canvas.html#canvas.attrs.height" title="canvas.attrs.height">height</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="canvas.html#canvas.attrs.width" title="canvas.attrs.width">width</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="canvas.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="canvas.html#canvas.attrs.height" title="canvas.attrs.height">height</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="canvas.html#canvas.attrs.width" title="canvas.attrs.width">width</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="canvas-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#canvas-attributes">#</a></h2> <dl class="attr-defs"> Index: input.search.html =================================================================== RCS file: /sources/public/html5/markup/input.search.html,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- input.search.html 29 Jan 2010 10:17:06 -0000 1.29 +++ input.search.html 30 Jan 2010 04:44:23 -0000 1.30 @@ -31,21 +31,21 @@ </div></div><div class="no-number no-toc" id="input.search-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.search-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="input.search.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.search.html#input.search.attrs.type" title="input.search.attrs.type">type</a> <span class="postfix required">[required]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.search.html#input.search.attrs.value" title="input.search.attrs.value">value</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="input.search.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.search.html#input.search.attrs.type" title="input.search.attrs.type">type</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.search.html#input.search.attrs.value" title="input.search.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="input.search-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.search-attributes">#</a></h2> <dl class="attr-defs"> Index: tfoot.html =================================================================== RCS file: /sources/public/html5/markup/tfoot.html,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- tfoot.html 29 Jan 2010 10:17:08 -0000 1.24 +++ tfoot.html 30 Jan 2010 04:44:25 -0000 1.25 @@ -23,14 +23,14 @@ <div id="tfoot-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="tfoot-mdl" href="tfoot.html#tfoot-mdl" class="element">tfoot</a> = </span><span> - <a class="ref" href="tr.html#tr">tr</a> <span class="postfix zeroormore">[zero or more]</span> + <a class="ref" href="tr.html#tr">tr</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> & <a class="ref" href="tfoot.html#tfoot.attrs">tfoot.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="tfoot-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#tfoot-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="tfoot.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="tfoot.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="tfoot-constraints"> @@ -66,15 +66,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> <span class="postfix optional">[optional]</span> followed by - <a class="ref" href="colgroup.html#colgroup">colgroup</a> <span class="postfix zeroormore">[zero or more]</span> followed by - <a class="ref" href="thead.html#thead">thead</a> <span class="postfix optional">[optional]</span> followed by - ((<a class="ref" href="tfoot.html#tfoot">tfoot</a> followed by - (<a class="ref" href="tbody.html#tbody">tbody</a> <span class="postfix zeroormore">[zero or more]</span> - or <a class="ref" href="tr.html#tr">tr</a> <span class="postfix oneormore">[one or more]</span> )) - or ((<a class="ref" href="tbody.html#tbody">tbody</a> <span class="postfix zeroormore">[zero or more]</span> - or <a class="ref" href="tr.html#tr">tr</a> <span class="postfix oneormore">[one or more]</span> ) followed by - <a class="ref" href="tfoot.html#tfoot">tfoot</a> <span class="postfix optional">[optional]</span> ))</li></ul> + <li class="context-mdl"><a href="table.html#table-mdl">table</a> = <a class="ref" href="caption.html#caption">caption</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> <span class="postfix followedby">followed by</span> + <a class="ref" href="colgroup.html#colgroup">colgroup</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> <span class="postfix followedby">followed by</span> + <a class="ref" href="thead.html#thead">thead</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> <span class="postfix followedby">followed by</span> + ((<a class="ref" href="tfoot.html#tfoot">tfoot</a> <span class="postfix followedby">followed by</span> + (<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> + <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> )) + <span class="postfix or">or</span> ((<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> + <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> ) <span class="postfix followedby">followed by</span> + <a class="ref" href="tfoot.html#tfoot">tfoot</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ))</li></ul> </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.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- rt.html 29 Jan 2010 10:17:07 -0000 1.26 +++ rt.html 30 Jan 2010 04:44:24 -0000 1.27 @@ -23,14 +23,14 @@ <div id="rt-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="rt-mdl" href="rt.html#rt-mdl" class="element">rt</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="rt.html#rt.attrs">rt.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="rt-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#rt-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="rt.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="rt.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="rt-tags"> @@ -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> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) followed by + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) <span class="postfix followedby">followed by</span> (<a class="ref" href="rt.html#rt">rt</a> - or (<a class="ref" href="rp.html#rp">rp</a> followed by - <a class="ref" href="rt.html#rt">rt</a> followed by - <a class="ref" href="rp.html#rp">rp</a>))) <span class="postfix oneormore">[one or more]</span> </li></ul> + <span class="postfix or">or</span> (<a class="ref" href="rp.html#rp">rp</a> <span class="postfix followedby">followed by</span> + <a class="ref" href="rt.html#rt">rt</a> <span class="postfix followedby">followed by</span> + <a class="ref" href="rp.html#rp">rp</a>)))<span class="postfix oneormore" title="ONE OR MORE">+</span> </li></ul> </div> <div class="no-number no-toc" id="rt-display"> Index: fieldset.html =================================================================== RCS file: /sources/public/html5/markup/fieldset.html,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- fieldset.html 29 Jan 2010 10:17:05 -0000 1.30 +++ fieldset.html 30 Jan 2010 04:44:22 -0000 1.31 @@ -30,19 +30,19 @@ <div id="fieldset-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="fieldset-mdl" href="fieldset.html#fieldset-mdl" class="element">fieldset</a> = </span><span> - <a class="ref" href="legend.html#legend">legend</a> <span class="postfix optional">[optional]</span> followed by + <a class="ref" href="legend.html#legend">legend</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> <span class="postfix followedby">followed by</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="fieldset.html#fieldset.attrs">fieldset.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="fieldset-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#fieldset-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="fieldset.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>) - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="fieldset.attrs">(<a class="ref" href="common-attributes.html">common attributes</a>) + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="fieldset-tags"> Index: spec.html =================================================================== RCS file: /sources/public/html5/markup/spec.html,v retrieving revision 1.139 retrieving revision 1.140 diff -u -d -r1.139 -r1.140 --- spec.html 29 Jan 2010 10:17:08 -0000 1.139 +++ spec.html 30 Jan 2010 04:44:25 -0000 1.140 @@ -12,7 +12,7 @@ <h1>HTML: The Markup Language</h1> <h2> W3C - Editor’s Draft <em>29 January 2010</em> + Editor’s Draft <em>30 January 2010</em> </h2> <dl> <dt>Latest Editor’s Draft:</dt> @@ -51,7 +51,7 @@ reports index</a> at http://www.w3.org/TR/. </em></p> [...4942 lines suppressed...] <dd>Specifies that the element is a required part of form submission.</dd> @@ -16403,7 +16485,7 @@ <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" - or <a class="ref" href="#common.data.float.positive" title="common.data.float.positive">float.positive</a> + <span class="postfix or">or</span> <a class="ref" href="#common.data.float.positive" title="common.data.float.positive">float.positive</a> </span><a class="hash" href="#input.attrs.step.float">#</a> </dt> <dd>Specifies the value granularity of the element’s @@ -16411,7 +16493,7 @@ <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" - or <a class="ref" href="#common.data.integer.positive" title="common.data.integer.positive">integer.positive</a> + <span class="postfix or">or</span> <a class="ref" href="#common.data.integer.positive" title="common.data.integer.positive">integer.positive</a> </span><a class="hash" href="#input.attrs.step.integer">#</a> </dt> <dd>Specifies the value granularity of the element’s Index: datalist.html =================================================================== RCS file: /sources/public/html5/markup/datalist.html,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- datalist.html 29 Jan 2010 10:17:05 -0000 1.31 +++ datalist.html 30 Jan 2010 04:44:21 -0000 1.32 @@ -32,16 +32,16 @@ <div id="datalist-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="datalist-mdl" href="datalist.html#datalist-mdl" class="element">datalist</a> = </span><span> - <a class="ref" href="option.html#option">option</a> <span class="postfix zeroormore">[zero or more]</span> - & (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <a class="ref" href="option.html#option">option</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> + <span class="postfix &">&</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="datalist.html#datalist.attrs">datalist.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="datalist-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#datalist-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="datalist.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="datalist.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="datalist-tags"> Index: h1.html =================================================================== RCS file: /sources/public/html5/markup/h1.html,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- h1.html 29 Jan 2010 10:17:05 -0000 1.31 +++ h1.html 30 Jan 2010 04:44:22 -0000 1.32 @@ -25,14 +25,14 @@ <div id="h1-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="h1-mdl" href="h1.html#h1-mdl" class="element">h1</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="h1.html#h1.attrs">h1.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="h1-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#h1-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="h1.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="h1.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="h1-constraints"> @@ -61,11 +61,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> - or <a class="ref" href="h2.html#h2">h2</a> - or <a class="ref" href="h3.html#h3">h3</a> - or <a class="ref" href="h4.html#h4">h4</a> - or <a class="ref" href="h5.html#h5">h5</a> - or <a class="ref" href="h6.html#h6">h6</a>) <span class="postfix oneormore">[one or more]</span> </li></ul> + <span class="postfix or">or</span> <a class="ref" href="h2.html#h2">h2</a> + <span class="postfix or">or</span> <a class="ref" href="h3.html#h3">h3</a> + <span class="postfix or">or</span> <a class="ref" href="h4.html#h4">h4</a> + <span class="postfix or">or</span> <a class="ref" href="h5.html#h5">h5</a> + <span class="postfix or">or</span> <a class="ref" href="h6.html#h6">h6</a>)<span class="postfix oneormore" title="ONE OR MORE">+</span> </li></ul> </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.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- h3.html 29 Jan 2010 10:17:05 -0000 1.32 +++ h3.html 30 Jan 2010 04:44:22 -0000 1.33 @@ -25,14 +25,14 @@ <div id="h3-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="h3-mdl" href="h3.html#h3-mdl" class="element">h3</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="h3.html#h3.attrs">h3.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="h3-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#h3-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="h3.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="h3.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="h3-constraints"> @@ -61,11 +61,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> - or <a class="ref" href="h2.html#h2">h2</a> - or <a class="ref" href="h3.html#h3">h3</a> - or <a class="ref" href="h4.html#h4">h4</a> - or <a class="ref" href="h5.html#h5">h5</a> - or <a class="ref" href="h6.html#h6">h6</a>) <span class="postfix oneormore">[one or more]</span> </li></ul> + <span class="postfix or">or</span> <a class="ref" href="h2.html#h2">h2</a> + <span class="postfix or">or</span> <a class="ref" href="h3.html#h3">h3</a> + <span class="postfix or">or</span> <a class="ref" href="h4.html#h4">h4</a> + <span class="postfix or">or</span> <a class="ref" href="h5.html#h5">h5</a> + <span class="postfix or">or</span> <a class="ref" href="h6.html#h6">h6</a>)<span class="postfix oneormore" title="ONE OR MORE">+</span> </li></ul> </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.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- optgroup.html 29 Jan 2010 10:17:07 -0000 1.25 +++ optgroup.html 30 Jan 2010 04:44:24 -0000 1.26 @@ -22,16 +22,16 @@ <div id="optgroup-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="optgroup-mdl" href="optgroup.html#optgroup-mdl" class="element">optgroup</a> = </span><span> - <a class="ref" href="option.html#option">option</a> <span class="postfix zeroormore">[zero or more]</span> + <a class="ref" href="option.html#option">option</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> & <a class="ref" href="optgroup.html#optgroup.attrs">optgroup.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="optgroup-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#optgroup-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="optgroup.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="optgroup.html#optgroup.attrs.label" title="optgroup.attrs.label">label</a> <span class="postfix required">[required]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="optgroup.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="optgroup.html#optgroup.attrs.label" title="optgroup.attrs.label">label</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="optgroup-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#optgroup-attributes">#</a></h2> <dl class="attr-defs"> @@ -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> <span class="postfix zeroormore">[zero or more]</span> - & <a class="ref" href="option.html#option">option</a> <span class="postfix zeroormore">[zero or more]</span> </li></ul> + <li class="context-mdl"><a href="select.html#select-mdl">select</a> = <a class="ref" href="optgroup.html#optgroup">optgroup</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> + <span class="postfix &">&</span> <a class="ref" href="option.html#option">option</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> </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.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- input.week.html 29 Jan 2010 10:17:06 -0000 1.27 +++ input.week.html 30 Jan 2010 04:44:23 -0000 1.28 @@ -31,20 +31,20 @@ </div></div><div class="no-number no-toc" id="input.week-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.week-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="input.week.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.week.html#input.week.attrs.type" title="input.week.attrs.type">type</a> <span class="postfix required">[required]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.week.html#input.week.attrs.min" title="input.week.attrs.min">min</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.week.html#input.week.attrs.max" title="input.week.attrs.max">max</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.step.integer" title="input.attrs.step.integer">step.integer</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.week.html#input.week.attrs.value" title="input.week.attrs.value">value</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="input.week.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.week.html#input.week.attrs.type" title="input.week.attrs.type">type</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.week.html#input.week.attrs.min" title="input.week.attrs.min">min</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.week.html#input.week.attrs.max" title="input.week.attrs.max">max</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.step.integer" title="input.attrs.step.integer">step.integer</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.week.html#input.week.attrs.value" title="input.week.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="input.week-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.week-attributes">#</a></h2> <dl class="attr-defs"> Index: button.button.html =================================================================== RCS file: /sources/public/html5/markup/button.button.html,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- button.button.html 29 Jan 2010 10:17:04 -0000 1.34 +++ button.button.html 30 Jan 2010 04:44:21 -0000 1.35 @@ -27,20 +27,20 @@ <div id="button.button-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="button.button-mdl" href="button.button.html#button.button-mdl"><span class="element">button</span>.button</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="button.button.html#button.button.attrs">button.button.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="button.button-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#button.button-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="button.button.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="button.button.html#button.button.attrs.type" title="button.button.attrs.type">type</a> <span class="postfix required">[required]</span> - & <a class="ref" href="button.button.html#button.button.attrs.value" title="button.button.attrs.value">value</a> <span class="postfix optional">[optional]</span> ) - & <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="button.button.attrs">(<a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="button.button.html#button.button.attrs.type" title="button.button.attrs.type">type</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="button.button.html#button.button.attrs.value" title="button.button.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ) + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="button.button-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#button.button-attributes">#</a></h2> <dl class="attr-defs"> Index: form.html =================================================================== RCS file: /sources/public/html5/markup/form.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- form.html 29 Jan 2010 10:17:05 -0000 1.33 +++ form.html 30 Jan 2010 04:44:22 -0000 1.34 @@ -25,22 +25,22 @@ <div id="form-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="form-mdl" href="form.html#form-mdl" class="element">form</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="form.html#form.attrs">form.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="form-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#form-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="form.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="form.html#form.attrs.action" title="form.attrs.action">action</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="form.html#form.attrs.method" title="form.attrs.method">method</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="form.html#form.attrs.enctype" title="form.attrs.enctype">enctype</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="form.html#form.attrs.accept-charset" title="form.attrs.accept-charset">accept-charset</a> <span class="postfix optional">[optional]</span> ) - & (<a class="ref" href="form.html#form.attrs.novalidate" title="form.attrs.novalidate">novalidate</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="form.html#form.attrs.target" title="form.attrs.target">target</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="form.html#form.attrs.autocomplete" title="form.attrs.autocomplete">autocomplete</a> <span class="postfix optional">[optional]</span> )</span></p></div></div> + <p><span class="pattern" id="form.attrs">(<a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="form.html#form.attrs.action" title="form.attrs.action">action</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="form.html#form.attrs.method" title="form.attrs.method">method</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="form.html#form.attrs.enctype" title="form.attrs.enctype">enctype</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="form.html#form.attrs.accept-charset" title="form.attrs.accept-charset">accept-charset</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ) + <span class="postfix &">&</span> (<a class="ref" href="form.html#form.attrs.novalidate" title="form.attrs.novalidate">novalidate</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="form.html#form.attrs.target" title="form.attrs.target">target</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="form.html#form.attrs.autocomplete" title="form.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )</span></p></div></div> <div class="no-number no-toc" id="form-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#form-attributes">#</a></h2> <dl class="attr-defs"> @@ -50,14 +50,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" - or "post") - or ( "put" or "delete")</span> </dt> + <span class="postfix or">or</span> "post") + <span class="postfix or">or</span> ( "put" + <span class="postfix or">or</span> "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" - or "multipart/form-data") - or "text/plain"</span> </dt> + <span class="postfix or">or</span> "multipart/form-data") + <span class="postfix or">or</span> "text/plain"</span> </dt> <dd>A MIME type with which a UA is meant to associate the form contents for form submission.</dd> @@ -67,7 +68,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" or "" </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" + or "" + </span> </dt> <dd>Specifies that the element represents a form that is not meant to be validated during form submission.</dd> @@ -77,7 +81,9 @@ <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" or "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" or "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.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- small.html 29 Jan 2010 10:17:08 -0000 1.26 +++ small.html 30 Jan 2010 04:44:25 -0000 1.27 @@ -24,14 +24,14 @@ <div id="small-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="small-mdl" href="small.html#small-mdl" class="element">small</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="small.html#small.attrs">small.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="small-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#small-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="small.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="small.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="small-tags"> Index: ruby.html =================================================================== RCS file: /sources/public/html5/markup/ruby.html,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- ruby.html 29 Jan 2010 10:17:07 -0000 1.26 +++ ruby.html 30 Jan 2010 04:44:24 -0000 1.27 @@ -23,18 +23,18 @@ <div id="ruby-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="ruby-mdl" href="ruby.html#ruby-mdl" class="element">ruby</a> = </span><span> ((<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) followed by + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) <span class="postfix followedby">followed by</span> (<a class="ref" href="rt.html#rt">rt</a> - or (<a class="ref" href="rp.html#rp">rp</a> followed by - <a class="ref" href="rt.html#rt">rt</a> followed by - <a class="ref" href="rp.html#rp">rp</a>))) <span class="postfix oneormore">[one or more]</span> + <span class="postfix or">or</span> (<a class="ref" href="rp.html#rp">rp</a> <span class="postfix followedby">followed by</span> + <a class="ref" href="rt.html#rt">rt</a> <span class="postfix followedby">followed by</span> + <a class="ref" href="rp.html#rp">rp</a>)))<span class="postfix oneormore" title="ONE OR MORE">+</span> & <a class="ref" href="ruby.html#ruby.attrs">ruby.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="ruby-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#ruby-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="ruby.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="ruby.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="ruby-tags"> Index: ol.html =================================================================== RCS file: /sources/public/html5/markup/ol.html,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- ol.html 29 Jan 2010 10:17:07 -0000 1.26 +++ ol.html 30 Jan 2010 04:44:24 -0000 1.27 @@ -24,16 +24,16 @@ <div id="ol-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="ol-mdl" href="ol.html#ol-mdl" class="element">ol</a> = </span><span> - <a class="ref" href="li.html#oli">li</a> <span class="postfix zeroormore">[zero or more]</span> + <a class="ref" href="li.html#oli">li</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> & <a class="ref" href="ol.html#ol.attrs">ol.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="ol-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#ol-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="ol.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="ol.html#ol.attrs.start" title="ol.attrs.start">start</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="ol.html#ol.attrs.reversed" title="ol.attrs.reversed">reversed</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="ol.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="ol.html#ol.attrs.start" title="ol.attrs.start">start</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="ol.html#ol.attrs.reversed" title="ol.attrs.reversed">reversed</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="ol-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#ol-attributes">#</a></h2> <dl class="attr-defs"> @@ -42,7 +42,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" or "" </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" + or "" + </span> </dt> <dd>If present, indicates that the list is a descending list (…, 3, 2, 1).</dd><dd>If not present, indicates that the list is an ascending list (1, 2, 3, …).</dd> Index: article.html =================================================================== RCS file: /sources/public/html5/markup/article.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- article.html 29 Jan 2010 10:17:04 -0000 1.33 +++ article.html 30 Jan 2010 04:44:20 -0000 1.34 @@ -26,16 +26,16 @@ <div id="article-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="article-mdl" href="article.html#article-mdl" class="element">article</a> = </span><span> - <a class="ref" href="style.html#style-pattern">style</a> <span class="postfix zeroormore">[zero or more]</span> followed by + <a class="ref" href="style.html#style-pattern">style</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> <span class="postfix followedby">followed by</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="article.html#article.attrs">article.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="article-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#article-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="article.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="article.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="article-constraints"> Index: colgroup.html =================================================================== RCS file: /sources/public/html5/markup/colgroup.html,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- colgroup.html 29 Jan 2010 10:17:04 -0000 1.28 +++ colgroup.html 30 Jan 2010 04:44:21 -0000 1.29 @@ -32,14 +32,14 @@ <div id="colgroup-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="colgroup-mdl" href="colgroup.html#colgroup-mdl" class="element">colgroup</a> = </span><span> - (<a class="ref" href="col.html#col">col</a> <span class="postfix zeroormore">[zero or more]</span> - or <a href=".html#colgroup.attrs.span-mdl"><span class="attr-qualifier">colgroup.attrs.</span>span</a> <span class="postfix optional">[optional]</span> ) + (<a class="ref" href="col.html#col">col</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> + <span class="postfix or">or</span> <a href=".html#colgroup.attrs.span-mdl"><span class="attr-qualifier">colgroup.attrs.</span>span</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ) & <a class="ref" href=".html#colgroup.attrs">colgroup.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="colgroup-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#colgroup-attr-mdl">#</a></h2> - <div class="attr-content-models"><div class="attr-content-model"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></div><div class="attr-content-model"><a href="colgroup.html#colgroup.attrs.span">span</a> <span class="postfix required">[required]</span></div></div></div> + <div class="attr-content-models"><div class="attr-content-model"><a class="ref" href="common-attributes.html">common attributes</a></div><div class="attr-content-model"><a href="colgroup.html#colgroup.attrs.span">span</a><span class="postfix required" title="REQUIRED">★</span></div></div></div> <div class="no-number no-toc" id="colgroup-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#colgroup-attributes">#</a></h2> <dl class="attr-defs"> @@ -85,15 +85,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> <span class="postfix optional">[optional]</span> followed by - <a class="ref" href="colgroup.html#colgroup">colgroup</a> <span class="postfix zeroormore">[zero or more]</span> followed by - <a class="ref" href="thead.html#thead">thead</a> <span class="postfix optional">[optional]</span> followed by - ((<a class="ref" href="tfoot.html#tfoot">tfoot</a> followed by - (<a class="ref" href="tbody.html#tbody">tbody</a> <span class="postfix zeroormore">[zero or more]</span> - or <a class="ref" href="tr.html#tr">tr</a> <span class="postfix oneormore">[one or more]</span> )) - or ((<a class="ref" href="tbody.html#tbody">tbody</a> <span class="postfix zeroormore">[zero or more]</span> - or <a class="ref" href="tr.html#tr">tr</a> <span class="postfix oneormore">[one or more]</span> ) followed by - <a class="ref" href="tfoot.html#tfoot">tfoot</a> <span class="postfix optional">[optional]</span> ))</li></ul> + <li class="context-mdl"><a href="table.html#table-mdl">table</a> = <a class="ref" href="caption.html#caption">caption</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> <span class="postfix followedby">followed by</span> + <a class="ref" href="colgroup.html#colgroup">colgroup</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> <span class="postfix followedby">followed by</span> + <a class="ref" href="thead.html#thead">thead</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> <span class="postfix followedby">followed by</span> + ((<a class="ref" href="tfoot.html#tfoot">tfoot</a> <span class="postfix followedby">followed by</span> + (<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> + <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> )) + <span class="postfix or">or</span> ((<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> + <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> ) <span class="postfix followedby">followed by</span> + <a class="ref" href="tfoot.html#tfoot">tfoot</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ))</li></ul> </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.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- dl.html 29 Jan 2010 10:17:05 -0000 1.29 +++ dl.html 30 Jan 2010 04:44:22 -0000 1.30 @@ -28,15 +28,15 @@ <div id="dl-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="dl-mdl" href="dl.html#dl-mdl" class="element">dl</a> = </span><span> - (<a class="ref" href="dt.html#dt">dt</a> <span class="postfix oneormore">[one or more]</span> followed by - <a class="ref" href="dd.html#dd">dd</a> <span class="postfix oneormore">[one or more]</span> ) <span class="postfix zeroormore">[zero or more]</span> + (<a class="ref" href="dt.html#dt">dt</a><span class="postfix oneormore" title="ONE OR MORE">+</span> <span class="postfix followedby">followed by</span> + <a class="ref" href="dd.html#dd">dd</a><span class="postfix oneormore" title="ONE OR MORE">+</span> )<span class="postfix zeroormore" title="ZERO OR MORE">*</span> & <a class="ref" href="dl.html#dl.attrs">dl.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="dl-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#dl-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="dl.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="dl.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="dl-constraints"> Index: thead.html =================================================================== RCS file: /sources/public/html5/markup/thead.html,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- thead.html 29 Jan 2010 10:17:08 -0000 1.24 +++ thead.html 30 Jan 2010 04:44:25 -0000 1.25 @@ -25,14 +25,14 @@ <div id="thead-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="thead-mdl" href="thead.html#thead-mdl" class="element">thead</a> = </span><span> - <a class="ref" href="tr.html#tr">tr</a> <span class="postfix zeroormore">[zero or more]</span> + <a class="ref" href="tr.html#tr">tr</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> & <a class="ref" href="thead.html#thead.attrs">thead.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="thead-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#thead-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="thead.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="thead.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="thead-constraints"> @@ -68,15 +68,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> <span class="postfix optional">[optional]</span> followed by - <a class="ref" href="colgroup.html#colgroup">colgroup</a> <span class="postfix zeroormore">[zero or more]</span> followed by - <a class="ref" href="thead.html#thead">thead</a> <span class="postfix optional">[optional]</span> followed by - ((<a class="ref" href="tfoot.html#tfoot">tfoot</a> followed by - (<a class="ref" href="tbody.html#tbody">tbody</a> <span class="postfix zeroormore">[zero or more]</span> - or <a class="ref" href="tr.html#tr">tr</a> <span class="postfix oneormore">[one or more]</span> )) - or ((<a class="ref" href="tbody.html#tbody">tbody</a> <span class="postfix zeroormore">[zero or more]</span> - or <a class="ref" href="tr.html#tr">tr</a> <span class="postfix oneormore">[one or more]</span> ) followed by - <a class="ref" href="tfoot.html#tfoot">tfoot</a> <span class="postfix optional">[optional]</span> ))</li></ul> + <li class="context-mdl"><a href="table.html#table-mdl">table</a> = <a class="ref" href="caption.html#caption">caption</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> <span class="postfix followedby">followed by</span> + <a class="ref" href="colgroup.html#colgroup">colgroup</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> <span class="postfix followedby">followed by</span> + <a class="ref" href="thead.html#thead">thead</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> <span class="postfix followedby">followed by</span> + ((<a class="ref" href="tfoot.html#tfoot">tfoot</a> <span class="postfix followedby">followed by</span> + (<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> + <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> )) + <span class="postfix or">or</span> ((<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> + <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> ) <span class="postfix followedby">followed by</span> + <a class="ref" href="tfoot.html#tfoot">tfoot</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ))</li></ul> </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.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- tbody.html 29 Jan 2010 10:17:08 -0000 1.24 +++ tbody.html 30 Jan 2010 04:44:25 -0000 1.25 @@ -24,14 +24,14 @@ <div id="tbody-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="tbody-mdl" href="tbody.html#tbody-mdl" class="element">tbody</a> = </span><span> - <a class="ref" href="tr.html#tr">tr</a> <span class="postfix zeroormore">[zero or more]</span> + <a class="ref" href="tr.html#tr">tr</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> & <a class="ref" href="tbody.html#tbody.attrs">tbody.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="tbody-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#tbody-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="tbody.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="tbody.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="tbody-constraints"> @@ -70,15 +70,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> <span class="postfix optional">[optional]</span> followed by - <a class="ref" href="colgroup.html#colgroup">colgroup</a> <span class="postfix zeroormore">[zero or more]</span> followed by - <a class="ref" href="thead.html#thead">thead</a> <span class="postfix optional">[optional]</span> followed by - ((<a class="ref" href="tfoot.html#tfoot">tfoot</a> followed by - (<a class="ref" href="tbody.html#tbody">tbody</a> <span class="postfix zeroormore">[zero or more]</span> - or <a class="ref" href="tr.html#tr">tr</a> <span class="postfix oneormore">[one or more]</span> )) - or ((<a class="ref" href="tbody.html#tbody">tbody</a> <span class="postfix zeroormore">[zero or more]</span> - or <a class="ref" href="tr.html#tr">tr</a> <span class="postfix oneormore">[one or more]</span> ) followed by - <a class="ref" href="tfoot.html#tfoot">tfoot</a> <span class="postfix optional">[optional]</span> ))</li></ul> + <li class="context-mdl"><a href="table.html#table-mdl">table</a> = <a class="ref" href="caption.html#caption">caption</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> <span class="postfix followedby">followed by</span> + <a class="ref" href="colgroup.html#colgroup">colgroup</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> <span class="postfix followedby">followed by</span> + <a class="ref" href="thead.html#thead">thead</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> <span class="postfix followedby">followed by</span> + ((<a class="ref" href="tfoot.html#tfoot">tfoot</a> <span class="postfix followedby">followed by</span> + (<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> + <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> )) + <span class="postfix or">or</span> ((<a class="ref" href="tbody.html#tbody">tbody</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> + <span class="postfix or">or</span> <a class="ref" href="tr.html#tr">tr</a><span class="postfix oneormore" title="ONE OR MORE">+</span> ) <span class="postfix followedby">followed by</span> + <a class="ref" href="tfoot.html#tfoot">tfoot</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ))</li></ul> </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.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- video.html 29 Jan 2010 10:17:08 -0000 1.31 +++ video.html 30 Jan 2010 04:44:26 -0000 1.32 @@ -24,31 +24,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> - or <a class="ref" href="source.html#source">source</a> <span class="postfix zeroormore">[zero or more]</span> ) followed by + <span class="postfix or">or</span> <a class="ref" href="source.html#source">source</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) <span class="postfix followedby">followed by</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <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> - or <a class="ref" href="source.html#source">source</a> <span class="postfix zeroormore">[zero or more]</span> ) followed by + <span class="postfix or">or</span> <a class="ref" href="source.html#source">source</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) <span class="postfix followedby">followed by</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="video.html#video.attrs">video.attrs</a> </span></dd> </dl> </div></div><div class="no-number no-toc" id="video-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#video-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="video.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="video.html#video.attrs.autoplay" title="video.attrs.autoplay">autoplay</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="video.html#video.attrs.autobuffer" title="video.attrs.autobuffer">autobuffer</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="video.html#video.attrs.controls" title="video.attrs.controls">controls</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="video.html#video.attrs.loop" title="video.attrs.loop">loop</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="video.html#video.attrs.poster" title="video.attrs.poster">poster</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="video.html#video.attrs.height" title="video.attrs.height">height</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="video.html#video.attrs.width" title="video.attrs.width">width</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="video.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="video.html#video.attrs.autoplay" title="video.attrs.autoplay">autoplay</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="video.html#video.attrs.autobuffer" title="video.attrs.autobuffer">autobuffer</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="video.html#video.attrs.controls" title="video.attrs.controls">controls</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="video.html#video.attrs.loop" title="video.attrs.loop">loop</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="video.html#video.attrs.poster" title="video.attrs.poster">poster</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="video.html#video.attrs.height" title="video.attrs.height">height</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="video.html#video.attrs.width" title="video.attrs.width">width</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="video-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#video-attributes">#</a></h2> <dl class="attr-defs"> Index: source.html =================================================================== RCS file: /sources/public/html5/markup/source.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- source.html 29 Jan 2010 10:17:08 -0000 1.33 +++ source.html 30 Jan 2010 04:44:25 -0000 1.34 @@ -29,16 +29,17 @@ <div id="source-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="source-mdl" href="source.html#source-mdl" class="element">source</a> = </span><span> - empty & <a class="ref" href="source.html#source.attrs">source.attrs</a> + empty + & <a class="ref" href="source.html#source.attrs">source.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="source-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#source-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="source.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="source.html#source.attrs.src" title="source.attrs.src">src</a> <span class="postfix required">[required]</span> - & <a class="ref" href="source.html#source.attrs.type" title="source.attrs.type">type</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="source.html#source.attrs.media" title="source.attrs.media">media</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="source.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="source.html#source.attrs.src" title="source.attrs.src">src</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="source.html#source.attrs.type" title="source.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="source.html#source.attrs.media" title="source.attrs.media">media</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="source-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#source-attributes">#</a></h2> <dl class="attr-defs"> @@ -86,21 +87,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> - or <a class="ref" href="source.html#source">source</a> <span class="postfix zeroormore">[zero or more]</span> ) followed by + <span class="postfix or">or</span> <a class="ref" href="source.html#source">source</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) <span class="postfix followedby">followed by</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> )</li> + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li> <li class="context-mdl"><a href="video.html#video.elem.phrasing">video.elem.phrasing</a> = (<a class="ref" href="video.html#video.attrs.src">video.attrs.src</a> - or <a class="ref" href="source.html#source">source</a> <span class="postfix zeroormore">[zero or more]</span> ) followed by + <span class="postfix or">or</span> <a class="ref" href="source.html#source">source</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) <span class="postfix followedby">followed by</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> )</li> + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li> <li class="context-mdl"><a href="audio.html#audio.elem.flow">audio.elem.flow</a> = (<a class="ref" href="audio.html#audio.attrs.src">audio.attrs.src</a> - or <a class="ref" href="source.html#source">source</a> <span class="postfix zeroormore">[zero or more]</span> ) followed by + <span class="postfix or">or</span> <a class="ref" href="source.html#source">source</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) <span class="postfix followedby">followed by</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> )</li> + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li> <li class="context-mdl"><a href="audio.html#audio.elem.phrasing">audio.elem.phrasing</a> = (<a class="ref" href="audio.html#audio.attrs.src">audio.attrs.src</a> - or <a class="ref" href="source.html#source">source</a> <span class="postfix zeroormore">[zero or more]</span> ) followed by + <span class="postfix or">or</span> <a class="ref" href="source.html#source">source</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) <span class="postfix followedby">followed by</span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> )</li></ul> + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li></ul> </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.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- button.reset.html 29 Jan 2010 10:17:04 -0000 1.34 +++ button.reset.html 30 Jan 2010 04:44:21 -0000 1.35 @@ -27,20 +27,20 @@ <div id="button.reset-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="button.reset-mdl" href="button.reset.html#button.reset-mdl"><span class="element">button</span>.reset</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="button.reset.html#button.reset.attrs">button.reset.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="button.reset-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#button.reset-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="button.reset.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="button.reset.html#button.reset.attrs.type" title="button.reset.attrs.type">type</a> <span class="postfix required">[required]</span> - & <a class="ref" href="button.reset.html#button.reset.attrs.value" title="button.reset.attrs.value">value</a> <span class="postfix optional">[optional]</span> ) - & <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="button.reset.attrs">(<a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="button.reset.html#button.reset.attrs.type" title="button.reset.attrs.type">type</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="button.reset.html#button.reset.attrs.value" title="button.reset.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ) + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="button.reset-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#button.reset-attributes">#</a></h2> <dl class="attr-defs"> Index: meta.charset.html =================================================================== RCS file: /sources/public/html5/markup/meta.charset.html,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- meta.charset.html 29 Jan 2010 10:17:07 -0000 1.31 +++ meta.charset.html 30 Jan 2010 04:44:24 -0000 1.32 @@ -31,10 +31,10 @@ </div></div><div class="no-number no-toc" id="meta.charset-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#meta.charset-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="meta.charset.attrs"><a class="ref" href="common-attributes.html#common.attrs.core" title="common.attrs.core">common.attrs.core</a> <span class="postfix required">[required]</span> - & <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a> <span class="postfix required">[required]</span> - & <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> <span class="postfix required">[required]</span> - & <a class="ref" href="meta.charset.html#meta.charset.attrs.charset" title="meta.charset.attrs.charset">charset</a> <span class="postfix required">[required]</span></span></p></div></div> + <p><span class="pattern" id="meta.charset.attrs"><a class="ref" href="common-attributes.html#common.attrs.core" title="common.attrs.core">common.attrs.core</a> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a> + <span class="postfix &">&</span> <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> + <span class="postfix &">&</span> <a class="ref" href="meta.charset.html#meta.charset.attrs.charset" title="meta.charset.attrs.charset">charset</a><span class="postfix required" title="REQUIRED">★</span></span></p></div></div> <div class="no-number no-toc" id="meta.charset-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#meta.charset-attributes">#</a></h2> <dl class="attr-defs"> @@ -74,16 +74,16 @@ <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> - or <a class="ref" href="style.html#style-pattern">style</a> - or <a class="ref" href="meta.name.html#meta.name">meta.name</a> - or <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> - or <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> - or <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> - or <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> - or <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> - or <a class="ref" href="script.html#script">script</a> - or <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> - or <a class="ref" href="command.html#command">command</a></li></ul> + <span class="postfix or">or</span> <a class="ref" href="style.html#style-pattern">style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta.name</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta.http-equiv.refresh</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta.http-equiv.default-style</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta.http-equiv.content-language</a> + <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta.charset</a> + <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta.http-equiv.content-type</a> + <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a> + <span class="postfix or">or</span> <a class="ref" href="noscript.html#noscript.elem.head">noscript.elem.head</a> + <span class="postfix or">or</span> <a class="ref" href="command.html#command">command</a></li></ul> </div> </div> <hr class="footerbreak"></hr> Index: output.html =================================================================== RCS file: /sources/public/html5/markup/output.html,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- output.html 29 Jan 2010 10:17:07 -0000 1.29 +++ output.html 30 Jan 2010 04:44:24 -0000 1.30 @@ -23,17 +23,17 @@ <div id="output-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="output-mdl" href="output.html#output-mdl" class="element">output</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="output.html#output.attrs">output.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="output-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#output-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="output.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="output.html#output.attrs.for" title="output.attrs.for">for</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="output.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="output.html#output.attrs.for" title="output.attrs.for">for</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="output-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#output-attributes">#</a></h2> <dl class="attr-defs"> Index: i.html =================================================================== RCS file: /sources/public/html5/markup/i.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- i.html 29 Jan 2010 10:17:05 -0000 1.27 +++ i.html 30 Jan 2010 04:44:22 -0000 1.28 @@ -27,14 +27,14 @@ <div id="i-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="i-mdl" href="i.html#i-mdl" class="element">i</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="i.html#i.attrs">i.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="i-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#i-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="i.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="i.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="i-tags"> Index: input.submit.html =================================================================== RCS file: /sources/public/html5/markup/input.submit.html,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- input.submit.html 29 Jan 2010 10:17:06 -0000 1.28 +++ input.submit.html 30 Jan 2010 04:44:23 -0000 1.29 @@ -30,18 +30,18 @@ </div></div><div class="no-number no-toc" id="input.submit-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.submit-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="input.submit.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.submit.html#input.submit.attrs.type" title="input.submit.attrs.type">type</a> <span class="postfix required">[required]</span> - & <a class="ref" href="input.submit.html#input.submit.attrs.value" title="input.submit.attrs.value">value</a> <span class="postfix optional">[optional]</span> ) - & (<a class="ref" href="forms-attributes.html#shared-form.attrs.formaction" title="shared-form.attrs.formaction">formaction</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.formenctype" title="shared-form.attrs.formenctype">formenctype</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.formmethod" title="shared-form.attrs.formmethod">formmethod</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.formtarget" title="shared-form.attrs.formtarget">formtarget</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.formnovalidate" title="shared-form.attrs.formnovalidate">formnovalidate</a> <span class="postfix optional">[optional]</span> )</span></p></div></div> + <p><span class="pattern" id="input.submit.attrs">(<a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.submit.html#input.submit.attrs.type" title="input.submit.attrs.type">type</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="input.submit.html#input.submit.attrs.value" title="input.submit.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ) + <span class="postfix &">&</span> (<a class="ref" href="forms-attributes.html#shared-form.attrs.formaction" title="shared-form.attrs.formaction">formaction</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formenctype" title="shared-form.attrs.formenctype">formenctype</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formmethod" title="shared-form.attrs.formmethod">formmethod</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formtarget" title="shared-form.attrs.formtarget">formtarget</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formnovalidate" title="shared-form.attrs.formnovalidate">formnovalidate</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )</span></p></div></div> <div class="no-number no-toc" id="input.submit-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.submit-attributes">#</a></h2> <dl class="attr-defs"> Index: input.date.html =================================================================== RCS file: /sources/public/html5/markup/input.date.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- input.date.html 29 Jan 2010 10:17:06 -0000 1.27 +++ input.date.html 30 Jan 2010 04:44:23 -0000 1.28 @@ -31,20 +31,20 @@ </div></div><div class="no-number no-toc" id="input.date-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.date-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="input.date.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.date.html#input.date.attrs.type" title="input.date.attrs.type">type</a> <span class="postfix required">[required]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.date.html#input.date.attrs.min" title="input.date.attrs.min">min</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.date.html#input.date.attrs.max" title="input.date.attrs.max">max</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.step.integer" title="input.attrs.step.integer">step.integer</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.date.html#input.date.attrs.value" title="input.date.attrs.value">value</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="input.date.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.date.html#input.date.attrs.type" title="input.date.attrs.type">type</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.date.html#input.date.attrs.min" title="input.date.attrs.min">min</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.date.html#input.date.attrs.max" title="input.date.attrs.max">max</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.step.integer" title="input.attrs.step.integer">step.integer</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.date.html#input.date.attrs.value" title="input.date.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="input.date-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.date-attributes">#</a></h2> <dl class="attr-defs"> Index: var.html =================================================================== RCS file: /sources/public/html5/markup/var.html,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- var.html 29 Jan 2010 10:17:08 -0000 1.26 +++ var.html 30 Jan 2010 04:44:26 -0000 1.27 @@ -25,14 +25,14 @@ <div id="var-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="var-mdl" href="var.html#var-mdl" class="element">var</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="var.html#var.attrs">var.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="var-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#var-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="var.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="var.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="var-tags"> Index: sub.html =================================================================== RCS file: /sources/public/html5/markup/sub.html,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- sub.html 29 Jan 2010 10:17:08 -0000 1.26 +++ sub.html 30 Jan 2010 04:44:25 -0000 1.27 @@ -23,14 +23,14 @@ <div id="sub-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="sub-mdl" href="sub.html#sub-mdl" class="element">sub</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="sub.html#sub.attrs">sub.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="sub-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#sub-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="sub.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="sub.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="sub-tags"> Index: title.html =================================================================== RCS file: /sources/public/html5/markup/title.html,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- title.html 29 Jan 2010 10:17:08 -0000 1.25 +++ title.html 30 Jan 2010 04:44:25 -0000 1.26 @@ -29,7 +29,7 @@ </div></div><div class="no-number no-toc" id="title-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#title-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="title.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="title.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="title-tags"> @@ -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> - & <a class="ref" href="base.html#base">base</a> <span class="postfix optional">[optional]</span> - & (<a class="ref" href="common-models.html#common.elem.metadata">common.elem.metadata</a> <span class="postfix zeroormore">[zero or more]</span> )</li></ul> + <span class="postfix &">&</span> <a class="ref" href="base.html#base">base</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> (<a class="ref" href="common-models.html#common.elem.metadata">common.elem.metadata</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> )</li></ul> </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.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- pre.html 29 Jan 2010 10:17:07 -0000 1.28 +++ pre.html 30 Jan 2010 04:44:24 -0000 1.29 @@ -25,14 +25,14 @@ <div id="pre-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="pre-mdl" href="pre.html#pre-mdl" class="element">pre</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="pre.html#pre.attrs">pre.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="pre-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#pre-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="pre.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="pre.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="pre-constraints"> Index: button.submit.html =================================================================== RCS file: /sources/public/html5/markup/button.submit.html,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- button.submit.html 29 Jan 2010 10:17:04 -0000 1.34 +++ button.submit.html 30 Jan 2010 04:44:21 -0000 1.35 @@ -27,25 +27,25 @@ <div id="button.submit-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="button.submit-mdl" href="button.submit.html#button.submit-mdl"><span class="element">button</span>.submit</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="button.submit.html#button.submit.attrs">button.submit.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="button.submit-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#button.submit-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="button.submit.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="button.submit.html#button.submit.attrs.type" title="button.submit.attrs.type">type</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="button.submit.html#button.submit.attrs.value" title="button.submit.attrs.value">value</a> <span class="postfix optional">[optional]</span> ) - & (<a class="ref" href="forms-attributes.html#shared-form.attrs.formaction" title="shared-form.attrs.formaction">formaction</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.formenctype" title="shared-form.attrs.formenctype">formenctype</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.formmethod" title="shared-form.attrs.formmethod">formmethod</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.formtarget" title="shared-form.attrs.formtarget">formtarget</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.formnovalidate" title="shared-form.attrs.formnovalidate">formnovalidate</a> <span class="postfix optional">[optional]</span> )</span></p></div></div> + <p><span class="pattern" id="button.submit.attrs">(<a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="button.submit.html#button.submit.attrs.type" title="button.submit.attrs.type">type</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="button.submit.html#button.submit.attrs.value" title="button.submit.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> ) + <span class="postfix &">&</span> (<a class="ref" href="forms-attributes.html#shared-form.attrs.formaction" title="shared-form.attrs.formaction">formaction</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formenctype" title="shared-form.attrs.formenctype">formenctype</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formmethod" title="shared-form.attrs.formmethod">formmethod</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formtarget" title="shared-form.attrs.formtarget">formtarget</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.formnovalidate" title="shared-form.attrs.formnovalidate">formnovalidate</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> )</span></p></div></div> <div class="no-number no-toc" id="button.submit-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#button.submit-attributes">#</a></h2> <dl class="attr-defs"> Index: rp.html =================================================================== RCS file: /sources/public/html5/markup/rp.html,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- rp.html 29 Jan 2010 10:17:07 -0000 1.26 +++ rp.html 30 Jan 2010 04:44:24 -0000 1.27 @@ -25,14 +25,14 @@ <div id="rp-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="rp-mdl" href="rp.html#rp-mdl" class="element">rp</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="rp.html#rp.attrs">rp.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="rp-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#rp-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="rp.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="rp.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="rp-tags"> @@ -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> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) followed by + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) <span class="postfix followedby">followed by</span> (<a class="ref" href="rt.html#rt">rt</a> - or (<a class="ref" href="rp.html#rp">rp</a> followed by - <a class="ref" href="rt.html#rt">rt</a> followed by - <a class="ref" href="rp.html#rp">rp</a>))) <span class="postfix oneormore">[one or more]</span> </li></ul> + <span class="postfix or">or</span> (<a class="ref" href="rp.html#rp">rp</a> <span class="postfix followedby">followed by</span> + <a class="ref" href="rt.html#rt">rt</a> <span class="postfix followedby">followed by</span> + <a class="ref" href="rp.html#rp">rp</a>)))<span class="postfix oneormore" title="ONE OR MORE">+</span> </li></ul> </div> </div> <hr class="footerbreak"></hr> Index: sup.html =================================================================== RCS file: /sources/public/html5/markup/sup.html,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- sup.html 29 Jan 2010 10:17:08 -0000 1.26 +++ sup.html 30 Jan 2010 04:44:25 -0000 1.27 @@ -23,14 +23,14 @@ <div id="sup-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="sup-mdl" href="sup.html#sup-mdl" class="element">sup</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="sup.html#sup.attrs">sup.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="sup-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#sup-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="sup.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="sup.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="sup-tags"> Index: forms-attributes.html =================================================================== RCS file: /sources/public/html5/markup/forms-attributes.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- forms-attributes.html 29 Jan 2010 10:17:05 -0000 1.6 +++ forms-attributes.html 30 Jan 2010 04:44:22 -0000 1.7 @@ -16,13 +16,23 @@ <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" or "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" <span class="postfix or">or</span> "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" or "" </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" + <span class="postfix or">or</span> "" + </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" or "" </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" or "" </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" <span class="postfix or">or</span> "" + </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 class="postfix or">or</span> "" + </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>Identifies a @@ -31,17 +41,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" - or "multipart/form-data" - or "text/plain" + <span class="postfix or">or</span> "multipart/form-data" + <span class="postfix or">or</span> "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" - or "post" - or "put" - or "delete" + <span class="postfix or">or</span> "post" + <span class="postfix or">or</span> "put" + <span class="postfix or">or</span> "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" or "" + "formnovalidate" + <span class="postfix or">or</span> "" </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"> @@ -53,25 +64,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" or "" </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" + <span class="postfix or">or</span> "" + </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" or "" </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" or "" </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" + <span class="postfix or">or</span> "" + </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 class="postfix or">or</span> "" + </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" - or <a class="ref" href="datatypes.html#common.data.float.positive" title="common.data.float.positive">float.positive</a> + <span class="postfix or">or</span> <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’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" - or <a class="ref" href="datatypes.html#common.data.integer.positive" title="common.data.integer.positive">integer.positive</a> + <span class="postfix or">or</span> <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’s value.</dd> </dl> Index: input.url.html =================================================================== RCS file: /sources/public/html5/markup/input.url.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- input.url.html 29 Jan 2010 10:17:06 -0000 1.27 +++ input.url.html 30 Jan 2010 04:44:23 -0000 1.28 @@ -31,21 +31,21 @@ </div></div><div class="no-number no-toc" id="input.url-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#input.url-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="input.url.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a> - & <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.url.html#input.url.attrs.type" title="input.url.attrs.type">type</a> <span class="postfix required">[required]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a> <span class="postfix optional">[optional]</span> - & <a class="ref" href="input.url.html#input.url.attrs.value" title="input.url.attrs.value">value</a> <span class="postfix optional">[optional]</span> </span></p></div></div> + <p><span class="pattern" id="input.url.attrs"><a class="ref" href="common-attributes.html">common attributes</a> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.url.html#input.url.attrs.type" title="input.url.attrs.type">type</a><span class="postfix required" title="REQUIRED">★</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.autocomplete" title="input.attrs.autocomplete">autocomplete</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#input.attrs.list" title="input.attrs.list">list</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.maxlength" title="shared-form.attrs.maxlength">maxlength</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.pattern" title="shared-form.attrs.pattern">pattern</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.readonly" title="shared-form.attrs.readonly">readonly</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.required" title="shared-form.attrs.required">required</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.size" title="shared-form.attrs.size">size</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="forms-attributes.html#shared-form.attrs.placeholder" title="shared-form.attrs.placeholder">placeholder</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> + <span class="postfix &">&</span> <a class="ref" href="input.url.html#input.url.attrs.value" title="input.url.attrs.value">value</a><span class="postfix optional" title="OPTIONAL (ZERO OR ONE)">?</span> </span></p></div></div> <div class="no-number no-toc" id="input.url-attributes"> <h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#input.url-attributes">#</a></h2> <dl class="attr-defs"> @@ -56,7 +56,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"> "" - or <a class="ref" href="datatypes.html#common.data.uri.absolute" title="common.data.uri.absolute">uri.absolute</a> + <span class="postfix or">or</span> <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.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- hgroup.html 29 Jan 2010 10:17:05 -0000 1.25 +++ hgroup.html 30 Jan 2010 04:44:22 -0000 1.26 @@ -33,18 +33,18 @@ <div id="hgroup-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="hgroup-mdl" href="hgroup.html#hgroup-mdl" class="element">hgroup</a> = </span><span> (<a class="ref" href="h1.html#h1">h1</a> - or <a class="ref" href="h2.html#h2">h2</a> - or <a class="ref" href="h3.html#h3">h3</a> - or <a class="ref" href="h4.html#h4">h4</a> - or <a class="ref" href="h5.html#h5">h5</a> - or <a class="ref" href="h6.html#h6">h6</a>) <span class="postfix oneormore">[one or more]</span> + <span class="postfix or">or</span> <a class="ref" href="h2.html#h2">h2</a> + <span class="postfix or">or</span> <a class="ref" href="h3.html#h3">h3</a> + <span class="postfix or">or</span> <a class="ref" href="h4.html#h4">h4</a> + <span class="postfix or">or</span> <a class="ref" href="h5.html#h5">h5</a> + <span class="postfix or">or</span> <a class="ref" href="h6.html#h6">h6</a>)<span class="postfix oneormore" title="ONE OR MORE">+</span> & <a class="ref" href="hgroup.html#hgroup.attrs">hgroup.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="hgroup-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#hgroup-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="hgroup.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="hgroup.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="hgroup-tags"> Index: h5.html =================================================================== RCS file: /sources/public/html5/markup/h5.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- h5.html 29 Jan 2010 10:17:05 -0000 1.32 +++ h5.html 30 Jan 2010 04:44:22 -0000 1.33 @@ -25,14 +25,14 @@ <div id="h5-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="h5-mdl" href="h5.html#h5-mdl" class="element">h5</a> = </span><span> (<a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - & <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a> <span class="postfix zeroormore">[zero or more]</span> ) + <span class="postfix &">&</span> <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a><span class="postfix zeroormore" title="ZERO OR MORE">*</span> ) & <a class="ref" href="h5.html#h5.attrs">h5.attrs</a> </span></p> </div> </div></div><div class="no-number no-toc" id="h5-attr-mdl"> <h2 class="element-subhead">Permitted attributes <a class="hash" href="#h5-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><span class="pattern" id="h5.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div> + <p><span class="pattern" id="h5.attrs"><a class="ref" href="common-attributes.html">common attributes</a></span></p></div></div> <div class="no-number no-toc" id="h5-constraints"> @@ -61,11 +61,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> - or <a class="ref" href="h2.html#h2">h2</a> - or <a class="ref" href="h3.html#h3">h3</a> - or <a class="ref" href="h4.html#h4">h4</a> - or <a class="ref" href="h5.html#h5">h5</a> - or <a class="ref" href="h6.html#h6">h6</a>) <span class="postfix oneormore">[one or more]</span> </li></ul> + <span class="postfix or">or</span> <a class="ref" href="h2.html#h2">h2</a> + <span class="postfix or">or</span> <a class="ref" href="h3.html#h3">h3</a> + <span class="postfix or">or</span> <a class="ref" href="h4.html#h4">h4</a> + <span class="postfix or">or</span> <a class="ref" href="h5.html#h5">h5</a> + <span class="postfix or">or</span> <a class="ref" href="h6.html#h6">h6</a>)<span class="postfix oneormore" title="ONE OR MORE">+</span> </li></ul> </div> <div class="no-number no-toc" id="h5-display">
Received on Saturday, 30 January 2010 04:44:30 UTC