- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 29 Jan 2010 02:30:53 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv13937
Modified Files:
a.html abbr.html address.html area.html article.html
aside.html audio.html b.html base.html bdo.html
blockquote.html body.html br.html button.button.html
button.reset.html button.submit.html canvas.html caption.html
cite.html code.html col.html colgroup.html
command.checkbox.html command.command.html command.radio.html
datalist.html dd.html del.html dfn.html div.html dl.html
dt.html em.html embed.html fieldset.html footer.html form.html
h1.html h2.html h3.html h4.html h5.html h6.html head.html
header.html hgroup.html hr.html html.html i.html iframe.html
img.html input.button.html input.checkbox.html
input.color.html input.date.html input.datetime-local.html
input.datetime.html input.email.html input.file.html
input.hidden.html input.image.html input.month.html
input.number.html input.password.html input.radio.html
input.range.html input.reset.html input.search.html
input.submit.html input.tel.html input.text.html
input.time.html input.url.html input.week.html ins.html
kbd.html keygen.html label.html legend.html li.html link.html
map.html mark.html menu.html meta.charset.html
meta.http-equiv.content-language.html
meta.http-equiv.content-type.html
meta.http-equiv.default-style.html
meta.http-equiv.refresh.html meta.name.html meter.html
nav.html noscript.html object.html ol.html optgroup.html
option.html output.html p.html param.html pre.html
progress.html q.html rp.html rt.html ruby.html samp.html
script.html section.html select.html small.html source.html
span.html spec.html strong.html style.html sub.html sup.html
table.html tbody.html td.html textarea.html tfoot.html th.html
thead.html time.html title.html tr.html ul.html var.html
video.html
Log Message:
prose model
Index: body.html
===================================================================
RCS file: /sources/public/html5/markup/body.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- body.html 29 Jan 2010 01:34:08 -0000 1.27
+++ body.html 29 Jan 2010 02:30:44 -0000 1.28
@@ -18,13 +18,9 @@
represents the body of a document (as opposed to the
document’s metadata).</p>
</div>
- <div class="no-number no-toc" id="body-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#body-contents">#</a></h2><div class="prose-model">
- <p>
- <a href="syntax.html#normal-character-data">Normal character data</a>
- and
- <a href="common-models.html#common.elem.flow">flow elements</a>
- </p>
- </div></div><div class="no-number no-toc" id="body-content-model">
+ <div class="no-number no-toc" id="body-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#body-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">flow elements</a></p></div></div><div class="no-number no-toc" id="body-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#body-content-model">#</a></h2><div class="content-models">
<div id="body-mdls">
@@ -95,8 +91,8 @@
</dl></div>
- <div class="no-number no-toc" id="body-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#body-assertions">#</a></h2>
+ <div class="no-number no-toc" id="body-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#body-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “alink” attribute on the “body” element is obsolete.
@@ -133,7 +129,6 @@
has not been omitted.</p>
</div>
-
<div class="no-number no-toc" id="body-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#body-context">#</a></h2>
<ul>
Index: legend.html
===================================================================
RCS file: /sources/public/html5/markup/legend.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- legend.html 29 Jan 2010 00:40:40 -0000 1.22
+++ legend.html 29 Jan 2010 02:30:46 -0000 1.23
@@ -43,7 +43,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="legend-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#legend-context">#</a></h2>
<ul>
Index: address.html
===================================================================
RCS file: /sources/public/html5/markup/address.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- address.html 29 Jan 2010 01:18:37 -0000 1.25
+++ address.html 29 Jan 2010 02:30:43 -0000 1.26
@@ -17,13 +17,9 @@
<p>The <a href="address.html#address" class="element">address</a>
element represents contact information.</p>
</div>
- <div class="no-number no-toc" id="address-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#address-contents">#</a></h2><div class="prose-model">
- <p>
- <a href="syntax.html#normal-character-data">Normal character data</a>
- and
- <a href="common-models.html#common.elem.flow">flow elements</a>
- </p>
- </div></div><div class="no-number no-toc" id="address-content-model">
+ <div class="no-number no-toc" id="address-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#address-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">flow elements</a></p></div></div><div class="no-number no-toc" id="address-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#address-content-model">#</a></h2><div class="content-models">
<div id="address-mdls">
@@ -39,8 +35,8 @@
<p><a href="address.html#address.attrs">address.attrs</a> = <span class="pattern" id="address.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="address-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#address-assertions">#</a></h2>
+ <div class="no-number no-toc" id="address-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#address-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “address” element must not contain any nested
@@ -56,7 +52,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="address-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#address-context">#</a></h2>
<ul>
Index: th.html
===================================================================
RCS file: /sources/public/html5/markup/th.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- th.html 29 Jan 2010 00:40:41 -0000 1.27
+++ th.html 29 Jan 2010 02:30:50 -0000 1.28
@@ -74,8 +74,8 @@
</dl></div>
- <div class="no-number no-toc" id="th-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#th-assertions">#</a></h2>
+ <div class="no-number no-toc" id="th-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#th-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “scope” attribute on the “th” element is obsolete.
@@ -130,7 +130,6 @@
element.</p>
</div>
-
<div class="no-number no-toc" id="th-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#th-context">#</a></h2>
<ul>
Index: mark.html
===================================================================
RCS file: /sources/public/html5/markup/mark.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- mark.html 29 Jan 2010 00:40:40 -0000 1.21
+++ mark.html 29 Jan 2010 02:30:46 -0000 1.22
@@ -43,7 +43,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="mark-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#mark-context">#</a></h2>
<ul>
Index: br.html
===================================================================
RCS file: /sources/public/html5/markup/br.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- br.html 29 Jan 2010 01:34:08 -0000 1.20
+++ br.html 29 Jan 2010 02:30:44 -0000 1.21
@@ -17,9 +17,7 @@
<p>The <a href="br.html#br" class="element">br</a> element represents
a line break.</p>
</div>
- <div class="no-number no-toc" id="br-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#br-contents">#</a></h2><div class="prose-model">
- <p>Empty</p>
- </div></div><div class="no-number no-toc" id="br-content-model">
+ <div class="no-number no-toc" id="br-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#br-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="br-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#br-content-model">#</a></h2><div class="content-models">
<div id="br-mdls">
@@ -34,8 +32,8 @@
<p><a href="br.html#br.attrs">br.attrs</a> = <span class="pattern" id="br.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="br-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#br-assertions">#</a></h2>
+ <div class="no-number no-toc" id="br-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#br-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “clear” attribute on the “br” element is obsolete.
@@ -51,7 +49,6 @@
A <a href="br.html#br">br</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="br-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#br-context">#</a></h2>
<ul>
Index: input.email.html
===================================================================
RCS file: /sources/public/html5/markup/input.email.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- input.email.html 29 Jan 2010 00:40:39 -0000 1.23
+++ input.email.html 29 Jan 2010 02:30:45 -0000 1.24
@@ -68,8 +68,8 @@
</dl></div>
- <div class="no-number no-toc" id="input.email-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.email-assertions">#</a></h2>
+ <div class="no-number no-toc" id="input.email-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.email-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “input” must not
@@ -104,7 +104,6 @@
An <a href="input.html#input">input</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="input.email-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.email-context">#</a></h2>
<ul>
Index: tr.html
===================================================================
RCS file: /sources/public/html5/markup/tr.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- tr.html 29 Jan 2010 00:40:41 -0000 1.20
+++ tr.html 29 Jan 2010 02:30:51 -0000 1.21
@@ -33,8 +33,8 @@
<p><a href="tr.html#tr.attrs">tr.attrs</a> = <span class="pattern" id="tr.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="tr-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#tr-assertions">#</a></h2>
+ <div class="no-number no-toc" id="tr-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#tr-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “align” attribute on the “tr” element is obsolete.
@@ -67,7 +67,6 @@
or if there is no more content in the parent element.</p>
</div>
-
<div class="no-number no-toc" id="tr-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#tr-context">#</a></h2>
<ul>
Index: input.month.html
===================================================================
RCS file: /sources/public/html5/markup/input.month.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- input.month.html 29 Jan 2010 00:40:39 -0000 1.23
+++ input.month.html 29 Jan 2010 02:30:45 -0000 1.24
@@ -72,8 +72,8 @@
</dl></div>
- <div class="no-number no-toc" id="input.month-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.month-assertions">#</a></h2>
+ <div class="no-number no-toc" id="input.month-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.month-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “input” must not
@@ -108,7 +108,6 @@
An <a href="input.html#input">input</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="input.month-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.month-context">#</a></h2>
<ul>
Index: iframe.html
===================================================================
RCS file: /sources/public/html5/markup/iframe.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- iframe.html 29 Jan 2010 00:40:38 -0000 1.32
+++ iframe.html 29 Jan 2010 02:30:45 -0000 1.33
@@ -79,8 +79,8 @@
</dl></div>
- <div class="no-number no-toc" id="iframe-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#iframe-assertions">#</a></h2>
+ <div class="no-number no-toc" id="iframe-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#iframe-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “iframe” must not
@@ -120,7 +120,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="iframe-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#iframe-context">#</a></h2>
<ul>
Index: ins.html
===================================================================
RCS file: /sources/public/html5/markup/ins.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- ins.html 29 Jan 2010 00:40:39 -0000 1.26
+++ ins.html 29 Jan 2010 02:30:46 -0000 1.27
@@ -65,7 +65,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="ins-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#ins-context">#</a></h2>
<ul>
Index: abbr.html
===================================================================
RCS file: /sources/public/html5/markup/abbr.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- abbr.html 29 Jan 2010 01:18:37 -0000 1.23
+++ abbr.html 29 Jan 2010 02:30:43 -0000 1.24
@@ -18,13 +18,9 @@
<a href="abbr.html#abbr" class="element">abbr</a>
element represents an abbreviation or acronym.</p>
</div>
- <div class="no-number no-toc" id="abbr-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#abbr-contents">#</a></h2><div class="prose-model">
- <p>
- <a href="syntax.html#normal-character-data">Normal character data</a>
- and
- <a href="common-models.html#common.elem.phrasing">phrasing elements</a>
- </p>
- </div></div><div class="no-number no-toc" id="abbr-content-model">
+ <div class="no-number no-toc" id="abbr-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#abbr-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="abbr-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#abbr-content-model">#</a></h2><div class="content-models">
<div id="abbr-mdls">
@@ -48,7 +44,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="abbr-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#abbr-context">#</a></h2>
<ul>
Index: div.html
===================================================================
RCS file: /sources/public/html5/markup/div.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- div.html 29 Jan 2010 00:40:38 -0000 1.25
+++ div.html 29 Jan 2010 02:30:44 -0000 1.26
@@ -35,8 +35,8 @@
<p><a href="div.html#div.attrs">div.attrs</a> = <span class="pattern" id="div.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="div-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#div-assertions">#</a></h2>
+ <div class="no-number no-toc" id="div-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#div-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “align” attribute on the “div” element is obsolete.
@@ -52,7 +52,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="div-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#div-context">#</a></h2>
<ul>
Index: meta.name.html
===================================================================
RCS file: /sources/public/html5/markup/meta.name.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- meta.name.html 29 Jan 2010 00:40:40 -0000 1.24
+++ meta.name.html 29 Jan 2010 02:30:46 -0000 1.25
@@ -54,40 +54,6 @@
A <a href="meta.html#meta">meta</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
- <div class="no-number no-toc" id="meta.name-constraints">
- <h2 class="element-subhead">Additional constraints <a class="hash" href="#meta.name-constraints">#</a></h2>
- <p>The <a href="meta.name.html#meta.name.attrs.name">name</a> attribute
- on the <a href="meta.html#meta" class="element">meta</a> element
- must be either a <a href="meta.name.html#defined-metadata-name">defined metadata name</a> or a <a href="meta.name.html#registered-metadata-name">registered metadata name</a>.</p>
- <p>A <dfn id="defined-metadata-name">defined metadata name</dfn> is any of the following:</p>
- <dl>
- <dt>description</dt>
- <dd>When the <a href="meta.name.html#meta.name.attrs.name">name</a>
- attribute is set to "<code>description</code>",
- the value of the <a href="meta.name.html#meta.name.attrs.content">content</a> attribute
- must be a string that describes the page.</dd>
- </dl>
- <dl>
- <dt>generator</dt>
- <dd>When the <a href="meta.name.html#meta.name.attrs.name">name</a>
- attribute is set to "<code>generator</code>",
- the value of the <a href="meta.name.html#meta.name.attrs.content">content</a> attribute
- must be a string
- that identifies the software used to generate the
- document.</dd>
- </dl>
- <dl>
- <dt>application-name</dt>
- <dd>When the <a href="meta.name.html#meta.name.attrs.name">name</a>
- attribute is set to "<code>application-name</code>",
- the value of the <a href="meta.name.html#meta.name.attrs.content">content</a> attribute
- must be a string representing the name of the Web
- application that the page represents.</dd>
- </dl>
- <p>A <dfn id="registered-metadata-name">registered metadata
- name</dfn> is any metadata name registered in the central <a href="http://wiki.whatwg.org/wiki/MetaExtensions">MetaExtensions registration page</a>.</p>
- </div>
<div class="no-number no-toc" id="meta.name-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#meta.name-context">#</a></h2>
<ul>
Index: table.html
===================================================================
RCS file: /sources/public/html5/markup/table.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- table.html 29 Jan 2010 00:40:41 -0000 1.24
+++ table.html 29 Jan 2010 02:30:50 -0000 1.25
@@ -48,8 +48,8 @@
</dl></div>
- <div class="no-number no-toc" id="table-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#table-assertions">#</a></h2>
+ <div class="no-number no-toc" id="table-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#table-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The element “table” must not appear as a
@@ -92,7 +92,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="table-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#table-context">#</a></h2>
<ul>
Index: nav.html
===================================================================
RCS file: /sources/public/html5/markup/nav.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- nav.html 29 Jan 2010 00:40:40 -0000 1.26
+++ nav.html 29 Jan 2010 02:30:46 -0000 1.27
@@ -35,8 +35,8 @@
<p><a href="nav.html#nav.attrs">nav.attrs</a> = <span class="pattern" id="nav.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="nav-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#nav-assertions">#</a></h2>
+ <div class="no-number no-toc" id="nav-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#nav-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The sectioning element “nav” must not
@@ -52,7 +52,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="nav-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#nav-context">#</a></h2>
<ul>
Index: html.html
===================================================================
RCS file: /sources/public/html5/markup/html.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- html.html 29 Jan 2010 00:44:38 -0000 1.25
+++ html.html 29 Jan 2010 02:30:45 -0000 1.26
@@ -49,8 +49,8 @@
</dl></div>
- <div class="no-number no-toc" id="html-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#html-assertions">#</a></h2>
+ <div class="no-number no-toc" id="html-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#html-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “version” attribute on the “html” element is obsolete.
@@ -73,7 +73,6 @@
</div>
-
<div class="no-number no-toc" id="html-display">
<h2 class="element-subhead">Typical default display properties <a class="hash" href="#html-display">#</a></h2>
<div class="css-props" id="html-css"><div class="selectors"><span class="selector">html</span> {
Index: meta.http-equiv.content-type.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.content-type.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- meta.http-equiv.content-type.html 29 Jan 2010 00:40:40 -0000 1.27
+++ meta.http-equiv.content-type.html 29 Jan 2010 02:30:46 -0000 1.28
@@ -52,9 +52,22 @@
</dl></div>
- <div class="no-number no-toc" id="meta.http-equiv.content-type-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#meta.http-equiv.content-type-assertions">#</a></h2>
+ <div class="no-number no-toc" id="meta.http-equiv.content-type-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#meta.http-equiv.content-type-constraints">#</a></h2>
<ul class="assertions">
+ <p>A <a href="meta.html#meta" class="element">meta</a> element in the
+ <a href="meta.http-equiv.content-type.html#encoding-declaration-state">encoding declaration
+ state</a> may be used in a <a href="documents.html#syntax-document-html">document in the HTML syntax</a>,
+ but it must not be used in a <a href="documents.html#syntax-document-xml">document in the XML syntax</a>.</p>
+ <p>There must not be more than one <a href="meta.html#meta" class="element">meta</a> element in the <a href="meta.http-equiv.content-type.html#encoding-declaration-state">encoding declaration
+ state</a> per document.</p>
+ <p>If a document contains a
+ <a href="meta.html#meta" class="element">meta</a>
+ element in the <a href="meta.http-equiv.content-type.html#encoding-declaration-state">encoding
+ declaration state</a>,
+ then the document must not contain a <a href="meta.html#meta" class="element">meta</a> element with a <a href="meta.charset.html#meta.charset.attrs.charset">charset</a>
+ attribute.</p>
+
<li><span>
The “scheme” attribute on the “meta” element is obsolete.
Use only one scheme per field, or make the scheme declaration part of the value.
@@ -69,22 +82,6 @@
A <a href="meta.html#meta">meta</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
- <div class="no-number no-toc" id="meta.http-equiv.content-type-constraints">
- <h2 class="element-subhead">Additional constraints <a class="hash" href="#meta.http-equiv.content-type-constraints">#</a></h2>
- <p>A <a href="meta.html#meta" class="element">meta</a> element in the
- <a href="meta.http-equiv.content-type.html#encoding-declaration-state">encoding declaration
- state</a> may be used in a <a href="documents.html#syntax-document-html">document in the HTML syntax</a>,
- but it must not be used in a <a href="documents.html#syntax-document-xml">document in the XML syntax</a>.</p>
- <p>There must not be more than one <a href="meta.html#meta" class="element">meta</a> element in the <a href="meta.http-equiv.content-type.html#encoding-declaration-state">encoding declaration
- state</a> per document.</p>
- <p>If a document contains a
- <a href="meta.html#meta" class="element">meta</a>
- element in the <a href="meta.http-equiv.content-type.html#encoding-declaration-state">encoding
- declaration state</a>,
- then the document must not contain a <a href="meta.html#meta" class="element">meta</a> element with a <a href="meta.charset.html#meta.charset.attrs.charset">charset</a>
- attribute.</p>
- </div>
<div class="no-number no-toc" id="meta.http-equiv.content-type-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#meta.http-equiv.content-type-context">#</a></h2>
<ul>
Index: footer.html
===================================================================
RCS file: /sources/public/html5/markup/footer.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- footer.html 29 Jan 2010 00:40:38 -0000 1.25
+++ footer.html 29 Jan 2010 02:30:44 -0000 1.26
@@ -33,8 +33,8 @@
<p><a href="footer.html#footer.attrs">footer.attrs</a> = <span class="pattern" id="footer.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="footer-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#footer-assertions">#</a></h2>
+ <div class="no-number no-toc" id="footer-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#footer-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The element “footer” must not
@@ -56,7 +56,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="footer-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#footer-context">#</a></h2>
<ul>
Index: meta.http-equiv.content-language.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.content-language.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- meta.http-equiv.content-language.html 29 Jan 2010 00:40:40 -0000 1.20
+++ meta.http-equiv.content-language.html 29 Jan 2010 02:30:46 -0000 1.21
@@ -53,8 +53,8 @@
</dl></div>
- <div class="no-number no-toc" id="meta.http-equiv.content-language-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#meta.http-equiv.content-language-assertions">#</a></h2>
+ <div class="no-number no-toc" id="meta.http-equiv.content-language-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#meta.http-equiv.content-language-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “scheme” attribute on the “meta” element is obsolete.
@@ -70,7 +70,6 @@
A <a href="meta.html#meta">meta</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="meta.http-equiv.content-language-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#meta.http-equiv.content-language-context">#</a></h2>
<ul>
Index: script.html
===================================================================
RCS file: /sources/public/html5/markup/script.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- script.html 29 Jan 2010 00:40:40 -0000 1.31
+++ script.html 29 Jan 2010 02:30:50 -0000 1.32
@@ -85,8 +85,8 @@
</dl></div>
- <div class="no-number no-toc" id="script-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#script-assertions">#</a></h2>
+ <div class="no-number no-toc" id="script-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#script-constraints">#</a></h2>
<ul class="assertions">
<li><span>
A “script” element with the
@@ -108,7 +108,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="script-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#script-context">#</a></h2>
<ul>
Index: input.range.html
===================================================================
RCS file: /sources/public/html5/markup/input.range.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- input.range.html 29 Jan 2010 00:40:39 -0000 1.23
+++ input.range.html 29 Jan 2010 02:30:46 -0000 1.24
@@ -70,8 +70,8 @@
</dl></div>
- <div class="no-number no-toc" id="input.range-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.range-assertions">#</a></h2>
+ <div class="no-number no-toc" id="input.range-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.range-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “input” must not
@@ -106,7 +106,6 @@
An <a href="input.html#input">input</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="input.range-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.range-context">#</a></h2>
<ul>
Index: audio.html
===================================================================
RCS file: /sources/public/html5/markup/audio.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- audio.html 29 Jan 2010 01:39:00 -0000 1.30
+++ audio.html 29 Jan 2010 02:30:44 -0000 1.31
@@ -84,8 +84,8 @@
</dl></div>
- <div class="no-number no-toc" id="audio-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#audio-assertions">#</a></h2>
+ <div class="no-number no-toc" id="audio-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#audio-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “audio”
@@ -106,7 +106,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="audio-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#audio-context">#</a></h2>
<ul>
Index: time.html
===================================================================
RCS file: /sources/public/html5/markup/time.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- time.html 29 Jan 2010 00:40:41 -0000 1.24
+++ time.html 29 Jan 2010 02:30:51 -0000 1.25
@@ -55,8 +55,8 @@
</dl></div>
- <div class="no-number no-toc" id="time-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#time-assertions">#</a></h2>
+ <div class="no-number no-toc" id="time-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#time-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The element “meter” must not
@@ -72,7 +72,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="time-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#time-context">#</a></h2>
<ul>
Index: meta.http-equiv.default-style.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.default-style.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- meta.http-equiv.default-style.html 29 Jan 2010 00:40:40 -0000 1.24
+++ meta.http-equiv.default-style.html 29 Jan 2010 02:30:46 -0000 1.25
@@ -70,7 +70,6 @@
A <a href="meta.html#meta">meta</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="meta.http-equiv.default-style-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#meta.http-equiv.default-style-context">#</a></h2>
<ul>
Index: keygen.html
===================================================================
RCS file: /sources/public/html5/markup/keygen.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- keygen.html 29 Jan 2010 00:40:39 -0000 1.24
+++ keygen.html 29 Jan 2010 02:30:46 -0000 1.25
@@ -49,8 +49,8 @@
</dl></div>
- <div class="no-number no-toc" id="keygen-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#keygen-assertions">#</a></h2>
+ <div class="no-number no-toc" id="keygen-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#keygen-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “keygen” must not
@@ -73,7 +73,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="keygen-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#keygen-context">#</a></h2>
<ul>
Index: command.command.html
===================================================================
RCS file: /sources/public/html5/markup/command.command.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- command.command.html 29 Jan 2010 00:40:38 -0000 1.23
+++ command.command.html 29 Jan 2010 02:30:44 -0000 1.24
@@ -68,7 +68,6 @@
A <a href="command.html#command">command</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="command.command-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#command.command-context">#</a></h2>
<ul>
Index: progress.html
===================================================================
RCS file: /sources/public/html5/markup/progress.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- progress.html 29 Jan 2010 00:40:40 -0000 1.24
+++ progress.html 29 Jan 2010 02:30:50 -0000 1.25
@@ -50,8 +50,8 @@
</dl></div>
- <div class="no-number no-toc" id="progress-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#progress-assertions">#</a></h2>
+ <div class="no-number no-toc" id="progress-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#progress-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The element “progress” must not
@@ -73,7 +73,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="progress-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#progress-context">#</a></h2>
<ul>
Index: dfn.html
===================================================================
RCS file: /sources/public/html5/markup/dfn.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- dfn.html 29 Jan 2010 00:40:38 -0000 1.22
+++ dfn.html 29 Jan 2010 02:30:44 -0000 1.23
@@ -33,8 +33,8 @@
<p><a href="dfn.html#dfn.attrs">dfn.attrs</a> = <span class="pattern" id="dfn.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="dfn-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#dfn-assertions">#</a></h2>
+ <div class="no-number no-toc" id="dfn-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#dfn-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “dfn” element must not contain any nested
@@ -50,7 +50,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="dfn-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#dfn-context">#</a></h2>
<ul>
Index: textarea.html
===================================================================
RCS file: /sources/public/html5/markup/textarea.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- textarea.html 29 Jan 2010 00:40:41 -0000 1.26
+++ textarea.html 29 Jan 2010 02:30:50 -0000 1.27
@@ -69,8 +69,8 @@
</dl></div>
- <div class="no-number no-toc" id="textarea-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#textarea-assertions">#</a></h2>
+ <div class="no-number no-toc" id="textarea-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#textarea-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “textarea” must not
@@ -93,7 +93,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="textarea-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#textarea-context">#</a></h2>
<ul>
Index: cite.html
===================================================================
RCS file: /sources/public/html5/markup/cite.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- cite.html 29 Jan 2010 00:40:37 -0000 1.22
+++ cite.html 29 Jan 2010 02:30:44 -0000 1.23
@@ -19,7 +19,9 @@
of a book mentioned within the main text flow of a
document.</p>
</div>
- <div class="no-number no-toc" id="cite-content-model">
+ <div class="no-number no-toc" id="cite-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#cite-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="cite-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#cite-content-model">#</a></h2><div class="content-models">
<div id="cite-mdls">
@@ -43,7 +45,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="cite-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#cite-context">#</a></h2>
<ul>
Index: meter.html
===================================================================
RCS file: /sources/public/html5/markup/meter.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- meter.html 29 Jan 2010 00:40:40 -0000 1.25
+++ meter.html 29 Jan 2010 02:30:46 -0000 1.26
@@ -76,8 +76,8 @@
</dl></div>
- <div class="no-number no-toc" id="meter-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#meter-assertions">#</a></h2>
+ <div class="no-number no-toc" id="meter-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#meter-constraints">#</a></h2>
<ul class="assertions">
<li><span>
An “meter” element must have a
@@ -157,7 +157,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="meter-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#meter-context">#</a></h2>
<ul>
Index: input.button.html
===================================================================
RCS file: /sources/public/html5/markup/input.button.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- input.button.html 29 Jan 2010 00:40:39 -0000 1.24
+++ input.button.html 29 Jan 2010 02:30:45 -0000 1.25
@@ -49,8 +49,8 @@
</dl></div>
- <div class="no-number no-toc" id="input.button-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.button-assertions">#</a></h2>
+ <div class="no-number no-toc" id="input.button-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.button-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “input” must not
@@ -85,7 +85,6 @@
An <a href="input.html#input">input</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="input.button-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.button-context">#</a></h2>
<ul>
Index: aside.html
===================================================================
RCS file: /sources/public/html5/markup/aside.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- aside.html 29 Jan 2010 01:18:37 -0000 1.26
+++ aside.html 29 Jan 2010 02:30:43 -0000 1.27
@@ -18,13 +18,9 @@
represents content that is tangentially related to the content
that forms the main textual flow of a document.</p>
</div>
- <div class="no-number no-toc" id="aside-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#aside-contents">#</a></h2><div class="prose-model">
- <p>
- <a href="syntax.html#normal-character-data">Normal character data</a>
- and
- <a href="common-models.html#common.elem.flow">flow elements</a>
- </p>
- </div></div><div class="no-number no-toc" id="aside-content-model">
+ <div class="no-number no-toc" id="aside-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#aside-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">flow elements</a></p></div></div><div class="no-number no-toc" id="aside-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#aside-content-model">#</a></h2><div class="content-models">
<div id="aside-mdls">
@@ -41,8 +37,8 @@
<p><a href="aside.html#aside.attrs">aside.attrs</a> = <span class="pattern" id="aside.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="aside-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#aside-assertions">#</a></h2>
+ <div class="no-number no-toc" id="aside-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#aside-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The sectioning element “aside” must not
@@ -58,7 +54,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="aside-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#aside-context">#</a></h2>
<ul>
Index: section.html
===================================================================
RCS file: /sources/public/html5/markup/section.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- section.html 29 Jan 2010 00:40:40 -0000 1.28
+++ section.html 29 Jan 2010 02:30:50 -0000 1.29
@@ -35,8 +35,8 @@
<p><a href="section.html#section.attrs">section.attrs</a> = <span class="pattern" id="section.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="section-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#section-assertions">#</a></h2>
+ <div class="no-number no-toc" id="section-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#section-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The sectioning element “section” must not
@@ -52,7 +52,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="section-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#section-context">#</a></h2>
<ul>
Index: link.html
===================================================================
RCS file: /sources/public/html5/markup/link.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- link.html 29 Jan 2010 00:40:40 -0000 1.25
+++ link.html 29 Jan 2010 02:30:46 -0000 1.26
@@ -83,8 +83,8 @@
</dl></div>
- <div class="no-number no-toc" id="link-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#link-assertions">#</a></h2>
+ <div class="no-number no-toc" id="link-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#link-constraints">#</a></h2>
<ul class="assertions">
<li><span>
A “link” element must have an “href” attribute.
@@ -123,7 +123,6 @@
A <a href="link.html#link">link</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="link-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#link-context">#</a></h2>
<ul>
Index: meta.http-equiv.refresh.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.refresh.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- meta.http-equiv.refresh.html 29 Jan 2010 00:40:40 -0000 1.22
+++ meta.http-equiv.refresh.html 29 Jan 2010 02:30:46 -0000 1.23
@@ -74,7 +74,6 @@
A <a href="meta.html#meta">meta</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="meta.http-equiv.refresh-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#meta.http-equiv.refresh-context">#</a></h2>
<ul>
Index: area.html
===================================================================
RCS file: /sources/public/html5/markup/area.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- area.html 29 Jan 2010 01:18:37 -0000 1.28
+++ area.html 29 Jan 2010 02:30:43 -0000 1.29
@@ -20,9 +20,7 @@
corresponding area on an image map, or a dead area on an
image map.</p>
</div>
- <div class="no-number no-toc" id="area-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#area-contents">#</a></h2><div class="prose-model">
- <p>Empty</p>
- </div></div><div class="no-number no-toc" id="area-content-model">
+ <div class="no-number no-toc" id="area-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#area-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="area-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#area-content-model">#</a></h2><div class="content-models">
<div id="area-mdls">
@@ -127,8 +125,8 @@
</dl></div>
- <div class="no-number no-toc" id="area-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#area-assertions">#</a></h2>
+ <div class="no-number no-toc" id="area-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#area-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “area” element must have a
@@ -148,7 +146,6 @@
An <a href="area.html#area">area</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="area-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#area-context">#</a></h2>
<ul>
Index: input.text.html
===================================================================
RCS file: /sources/public/html5/markup/input.text.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- input.text.html 29 Jan 2010 00:40:39 -0000 1.24
+++ input.text.html 29 Jan 2010 02:30:46 -0000 1.25
@@ -57,8 +57,8 @@
</dl></div>
- <div class="no-number no-toc" id="input.text-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.text-assertions">#</a></h2>
+ <div class="no-number no-toc" id="input.text-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.text-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “input” must not
@@ -93,7 +93,6 @@
An <a href="input.html#input">input</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="input.text-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.text-context">#</a></h2>
<ul>
Index: samp.html
===================================================================
RCS file: /sources/public/html5/markup/samp.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- samp.html 29 Jan 2010 00:40:40 -0000 1.22
+++ samp.html 29 Jan 2010 02:30:50 -0000 1.23
@@ -42,7 +42,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="samp-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#samp-context">#</a></h2>
<ul>
Index: h6.html
===================================================================
RCS file: /sources/public/html5/markup/h6.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- h6.html 29 Jan 2010 00:40:38 -0000 1.26
+++ h6.html 29 Jan 2010 02:30:45 -0000 1.27
@@ -33,8 +33,8 @@
<p><a href="h6.html#h6.attrs">h6.attrs</a> = <span class="pattern" id="h6.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="h6-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#h6-assertions">#</a></h2>
+ <div class="no-number no-toc" id="h6-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#h6-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “h6” element must not appear as a
@@ -54,7 +54,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="h6-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#h6-context">#</a></h2>
<ul>
Index: input.checkbox.html
===================================================================
RCS file: /sources/public/html5/markup/input.checkbox.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- input.checkbox.html 29 Jan 2010 00:40:39 -0000 1.24
+++ input.checkbox.html 29 Jan 2010 02:30:45 -0000 1.25
@@ -51,8 +51,8 @@
</dl></div>
- <div class="no-number no-toc" id="input.checkbox-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.checkbox-assertions">#</a></h2>
+ <div class="no-number no-toc" id="input.checkbox-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.checkbox-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “input” must not
@@ -87,7 +87,6 @@
An <a href="input.html#input">input</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="input.checkbox-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.checkbox-context">#</a></h2>
<ul>
Index: a.html
===================================================================
RCS file: /sources/public/html5/markup/a.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- a.html 29 Jan 2010 00:44:38 -0000 1.36
+++ a.html 29 Jan 2010 02:30:43 -0000 1.37
@@ -18,9 +18,7 @@
<a class="element" href="a.html#a">a</a>
element represents a hyperlink.</p>
</div>
- <div class="no-number no-toc" id="a-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#a-contents">#</a></h2><div class="prose-model">
- <p><a href="terminology.html#transparent">Transparent</a></p>
- </div></div><div class="no-number no-toc" id="a-content-model">
+ <div class="no-number no-toc" id="a-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#a-contents">#</a></h2><div class="prose-model"><div id="prose-model"><p><a href="terminology.html#transparent">Transparent</a></p></div></div></div><div class="no-number no-toc" id="a-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#a-content-model">#</a></h2><div class="content-models">
<dl id="a-mdls">
@@ -106,8 +104,8 @@
</dl></div>
- <div class="no-number no-toc" id="a-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#a-assertions">#</a></h2>
+ <div class="no-number no-toc" id="a-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#a-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “a” must not
@@ -148,7 +146,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="a-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#a-context">#</a></h2>
<ul>
Index: object.html
===================================================================
RCS file: /sources/public/html5/markup/object.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- object.html 29 Jan 2010 00:40:40 -0000 1.30
+++ object.html 29 Jan 2010 02:30:47 -0000 1.31
@@ -84,8 +84,8 @@
</dl></div>
- <div class="no-number no-toc" id="object-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#object-assertions">#</a></h2>
+ <div class="no-number no-toc" id="object-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#object-constraints">#</a></h2>
<ul class="assertions">
<li><span>
An “object” element must have a
@@ -152,7 +152,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="object-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#object-context">#</a></h2>
<ul>
Index: input.tel.html
===================================================================
RCS file: /sources/public/html5/markup/input.tel.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- input.tel.html 29 Jan 2010 00:40:39 -0000 1.22
+++ input.tel.html 29 Jan 2010 02:30:46 -0000 1.23
@@ -58,8 +58,8 @@
</dl></div>
- <div class="no-number no-toc" id="input.tel-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.tel-assertions">#</a></h2>
+ <div class="no-number no-toc" id="input.tel-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.tel-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “input” must not
@@ -94,7 +94,6 @@
An <a href="input.html#input">input</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="input.tel-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.tel-context">#</a></h2>
<ul>
Index: h4.html
===================================================================
RCS file: /sources/public/html5/markup/h4.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- h4.html 29 Jan 2010 00:40:38 -0000 1.26
+++ h4.html 29 Jan 2010 02:30:45 -0000 1.27
@@ -33,8 +33,8 @@
<p><a href="h4.html#h4.attrs">h4.attrs</a> = <span class="pattern" id="h4.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="h4-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#h4-assertions">#</a></h2>
+ <div class="no-number no-toc" id="h4-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#h4-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “h4” element must not appear as a
@@ -54,7 +54,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="h4-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#h4-context">#</a></h2>
<ul>
Index: header.html
===================================================================
RCS file: /sources/public/html5/markup/header.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- header.html 29 Jan 2010 00:40:38 -0000 1.25
+++ header.html 29 Jan 2010 02:30:45 -0000 1.26
@@ -33,8 +33,8 @@
<p><a href="header.html#header.attrs">header.attrs</a> = <span class="pattern" id="header.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="header-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#header-assertions">#</a></h2>
+ <div class="no-number no-toc" id="header-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#header-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “header” element must not appear as a
@@ -56,7 +56,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="header-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#header-context">#</a></h2>
<ul>
Index: b.html
===================================================================
RCS file: /sources/public/html5/markup/b.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- b.html 29 Jan 2010 01:34:08 -0000 1.23
+++ b.html 29 Jan 2010 02:30:44 -0000 1.24
@@ -20,13 +20,9 @@
document abstract, product names in a review, or other spans
of text whose typical typographic presentation is bold text.</p>
</div>
- <div class="no-number no-toc" id="b-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#b-contents">#</a></h2><div class="prose-model">
- <p>
- <a href="syntax.html#normal-character-data">Normal character data</a>
- and
- <a href="common-models.html#common.elem.phrasing">phrasing elements</a>
- </p>
- </div></div><div class="no-number no-toc" id="b-content-model">
+ <div class="no-number no-toc" id="b-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#b-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="b-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#b-content-model">#</a></h2><div class="content-models">
<div id="b-mdls">
@@ -50,7 +46,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="b-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#b-context">#</a></h2>
<ul>
Index: img.html
===================================================================
RCS file: /sources/public/html5/markup/img.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- img.html 29 Jan 2010 00:40:39 -0000 1.28
+++ img.html 29 Jan 2010 02:30:45 -0000 1.29
@@ -86,8 +86,8 @@
</dl></div>
- <div class="no-number no-toc" id="img-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#img-assertions">#</a></h2>
+ <div class="no-number no-toc" id="img-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#img-constraints">#</a></h2>
<ul class="assertions">
<li><span>
An “img” element must have a
@@ -139,7 +139,6 @@
An <a href="img.html#img">img</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="img-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#img-context">#</a></h2>
<ul>
Index: bdo.html
===================================================================
RCS file: /sources/public/html5/markup/bdo.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- bdo.html 29 Jan 2010 01:34:08 -0000 1.25
+++ bdo.html 29 Jan 2010 02:30:44 -0000 1.26
@@ -18,13 +18,9 @@
a means to specify a direction override of the Unicode BiDi
algorithm.</p>
</div>
- <div class="no-number no-toc" id="bdo-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#bdo-contents">#</a></h2><div class="prose-model">
- <p>
- <a href="syntax.html#normal-character-data">Normal character data</a>
- and
- <a href="common-models.html#common.elem.phrasing">phrasing elements</a>
- </p>
- </div></div><div class="no-number no-toc" id="bdo-content-model">
+ <div class="no-number no-toc" id="bdo-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#bdo-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="bdo-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#bdo-content-model">#</a></h2><div class="content-models">
<div id="bdo-mdls">
@@ -40,8 +36,8 @@
<p><a href="bdo.html#bdo.attrs">bdo.attrs</a> = <span class="pattern" id="bdo.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="bdo-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#bdo-assertions">#</a></h2>
+ <div class="no-number no-toc" id="bdo-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#bdo-constraints">#</a></h2>
<ul class="assertions">
<li><span>
A “bdo” element must have an
@@ -57,7 +53,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="bdo-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#bdo-context">#</a></h2>
<ul>
Index: input.number.html
===================================================================
RCS file: /sources/public/html5/markup/input.number.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- input.number.html 29 Jan 2010 00:40:39 -0000 1.23
+++ input.number.html 29 Jan 2010 02:30:45 -0000 1.24
@@ -72,8 +72,8 @@
</dl></div>
- <div class="no-number no-toc" id="input.number-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.number-assertions">#</a></h2>
+ <div class="no-number no-toc" id="input.number-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.number-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “input” must not
@@ -108,7 +108,6 @@
An <a href="input.html#input">input</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="input.number-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.number-context">#</a></h2>
<ul>
Index: col.html
===================================================================
RCS file: /sources/public/html5/markup/col.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- col.html 29 Jan 2010 00:40:38 -0000 1.22
+++ col.html 29 Jan 2010 02:30:44 -0000 1.23
@@ -45,8 +45,8 @@
</dl></div>
- <div class="no-number no-toc" id="col-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#col-assertions">#</a></h2>
+ <div class="no-number no-toc" id="col-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#col-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “align” attribute on the “col” element is obsolete.
@@ -76,7 +76,6 @@
A <a href="col.html#col">col</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="col-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#col-context">#</a></h2>
<ul>
Index: command.radio.html
===================================================================
RCS file: /sources/public/html5/markup/command.radio.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- command.radio.html 29 Jan 2010 00:40:38 -0000 1.23
+++ command.radio.html 29 Jan 2010 02:30:44 -0000 1.24
@@ -80,7 +80,6 @@
A <a href="command.html#command">command</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="command.radio-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#command.radio-context">#</a></h2>
<ul>
Index: input.datetime.html
===================================================================
RCS file: /sources/public/html5/markup/input.datetime.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- input.datetime.html 29 Jan 2010 00:40:39 -0000 1.23
+++ input.datetime.html 29 Jan 2010 02:30:45 -0000 1.24
@@ -73,8 +73,8 @@
</dl></div>
- <div class="no-number no-toc" id="input.datetime-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.datetime-assertions">#</a></h2>
+ <div class="no-number no-toc" id="input.datetime-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.datetime-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “input” must not
@@ -109,7 +109,6 @@
An <a href="input.html#input">input</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="input.datetime-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.datetime-context">#</a></h2>
<ul>
Index: input.password.html
===================================================================
RCS file: /sources/public/html5/markup/input.password.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- input.password.html 29 Jan 2010 00:40:39 -0000 1.24
+++ input.password.html 29 Jan 2010 02:30:45 -0000 1.25
@@ -57,8 +57,8 @@
</dl></div>
- <div class="no-number no-toc" id="input.password-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.password-assertions">#</a></h2>
+ <div class="no-number no-toc" id="input.password-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.password-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “input” must not
@@ -93,7 +93,6 @@
An <a href="input.html#input">input</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="input.password-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.password-context">#</a></h2>
<ul>
Index: embed.html
===================================================================
RCS file: /sources/public/html5/markup/embed.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- embed.html 29 Jan 2010 00:40:38 -0000 1.25
+++ embed.html 29 Jan 2010 02:30:44 -0000 1.26
@@ -59,8 +59,8 @@
</dl></div>
- <div class="no-number no-toc" id="embed-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#embed-assertions">#</a></h2>
+ <div class="no-number no-toc" id="embed-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#embed-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “embed” must not
@@ -87,7 +87,6 @@
An <a href="embed.html#embed">embed</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="embed-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#embed-context">#</a></h2>
<ul>
Index: dd.html
===================================================================
RCS file: /sources/public/html5/markup/dd.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- dd.html 29 Jan 2010 00:40:38 -0000 1.24
+++ dd.html 29 Jan 2010 02:30:44 -0000 1.25
@@ -47,7 +47,6 @@
more content in the parent element.</p>
</div>
-
<div class="no-number no-toc" id="dd-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#dd-context">#</a></h2>
<ul>
Index: ul.html
===================================================================
RCS file: /sources/public/html5/markup/ul.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- ul.html 29 Jan 2010 00:40:41 -0000 1.20
+++ ul.html 29 Jan 2010 02:30:51 -0000 1.21
@@ -34,8 +34,8 @@
<p><a href="ul.html#ul.attrs">ul.attrs</a> = <span class="pattern" id="ul.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="ul-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#ul-assertions">#</a></h2>
+ <div class="no-number no-toc" id="ul-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#ul-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “type” attribute on the “ul” element is obsolete.
@@ -55,7 +55,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="ul-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#ul-context">#</a></h2>
<ul>
Index: input.time.html
===================================================================
RCS file: /sources/public/html5/markup/input.time.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- input.time.html 29 Jan 2010 00:40:39 -0000 1.23
+++ input.time.html 29 Jan 2010 02:30:46 -0000 1.24
@@ -73,8 +73,8 @@
</dl></div>
- <div class="no-number no-toc" id="input.time-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.time-assertions">#</a></h2>
+ <div class="no-number no-toc" id="input.time-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.time-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “input” must not
@@ -109,7 +109,6 @@
An <a href="input.html#input">input</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="input.time-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.time-context">#</a></h2>
<ul>
Index: dt.html
===================================================================
RCS file: /sources/public/html5/markup/dt.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- dt.html 29 Jan 2010 00:40:38 -0000 1.24
+++ dt.html 29 Jan 2010 02:30:44 -0000 1.25
@@ -46,7 +46,6 @@
a <code><a href="dd.html#dd">dd</a></code> element.</p>
</div>
-
<div class="no-number no-toc" id="dt-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#dt-context">#</a></h2>
<ul>
Index: strong.html
===================================================================
RCS file: /sources/public/html5/markup/strong.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- strong.html 29 Jan 2010 00:40:41 -0000 1.22
+++ strong.html 29 Jan 2010 02:30:50 -0000 1.23
@@ -41,7 +41,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="strong-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#strong-context">#</a></h2>
<ul>
Index: q.html
===================================================================
RCS file: /sources/public/html5/markup/q.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- q.html 29 Jan 2010 00:40:40 -0000 1.23
+++ q.html 29 Jan 2010 02:30:50 -0000 1.24
@@ -51,7 +51,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="q-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#q-context">#</a></h2>
<ul>
Index: li.html
===================================================================
RCS file: /sources/public/html5/markup/li.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- li.html 29 Jan 2010 00:40:40 -0000 1.26
+++ li.html 29 Jan 2010 02:30:46 -0000 1.27
@@ -54,8 +54,8 @@
</dl></div>
- <div class="no-number no-toc" id="li-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#li-assertions">#</a></h2>
+ <div class="no-number no-toc" id="li-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#li-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “type” attribute on the “li” element is obsolete.
@@ -74,7 +74,6 @@
or if there is no more content in the parent element.</p>
</div>
-
<div class="no-number no-toc" id="li-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#li-context">#</a></h2>
<ul>
Index: style.html
===================================================================
RCS file: /sources/public/html5/markup/style.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- style.html 29 Jan 2010 00:40:41 -0000 1.27
+++ style.html 29 Jan 2010 02:30:50 -0000 1.28
@@ -78,7 +78,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="style-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#style-context">#</a></h2>
<ul>
Index: del.html
===================================================================
RCS file: /sources/public/html5/markup/del.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- del.html 29 Jan 2010 00:40:38 -0000 1.26
+++ del.html 29 Jan 2010 02:30:44 -0000 1.27
@@ -65,7 +65,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="del-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#del-context">#</a></h2>
<ul>
Index: menu.html
===================================================================
RCS file: /sources/public/html5/markup/menu.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- menu.html 29 Jan 2010 00:40:40 -0000 1.28
+++ menu.html 29 Jan 2010 02:30:46 -0000 1.29
@@ -58,8 +58,8 @@
</dl></div>
- <div class="no-number no-toc" id="menu-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#menu-assertions">#</a></h2>
+ <div class="no-number no-toc" id="menu-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#menu-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The element “menu”
@@ -84,7 +84,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="menu-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#menu-context">#</a></h2>
<ul>
Index: input.image.html
===================================================================
RCS file: /sources/public/html5/markup/input.image.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- input.image.html 29 Jan 2010 00:40:39 -0000 1.24
+++ input.image.html 29 Jan 2010 02:30:45 -0000 1.25
@@ -81,8 +81,8 @@
</dl></div>
- <div class="no-number no-toc" id="input.image-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.image-assertions">#</a></h2>
+ <div class="no-number no-toc" id="input.image-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.image-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “input” must not
@@ -117,7 +117,6 @@
An <a href="input.html#input">input</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="input.image-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.image-context">#</a></h2>
<ul>
Index: code.html
===================================================================
RCS file: /sources/public/html5/markup/code.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- code.html 29 Jan 2010 00:40:37 -0000 1.22
+++ code.html 29 Jan 2010 02:30:44 -0000 1.23
@@ -17,7 +17,9 @@
<p>The <a href="code.html#code" class="element">code</a> element
represents a fragment of computer code.</p>
</div>
- <div class="no-number no-toc" id="code-content-model">
+ <div class="no-number no-toc" id="code-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#code-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="code-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#code-content-model">#</a></h2><div class="content-models">
<div id="code-mdls">
@@ -41,7 +43,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="code-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#code-context">#</a></h2>
<ul>
Index: h2.html
===================================================================
RCS file: /sources/public/html5/markup/h2.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- h2.html 29 Jan 2010 00:40:38 -0000 1.26
+++ h2.html 29 Jan 2010 02:30:45 -0000 1.27
@@ -33,8 +33,8 @@
<p><a href="h2.html#h2.attrs">h2.attrs</a> = <span class="pattern" id="h2.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="h2-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#h2-assertions">#</a></h2>
+ <div class="no-number no-toc" id="h2-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#h2-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “h2” element must not appear as a
@@ -54,7 +54,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="h2-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#h2-context">#</a></h2>
<ul>
Index: head.html
===================================================================
RCS file: /sources/public/html5/markup/head.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- head.html 29 Jan 2010 00:40:38 -0000 1.20
+++ head.html 29 Jan 2010 02:30:45 -0000 1.21
@@ -34,8 +34,8 @@
<p><a href="head.html#head.attrs">head.attrs</a> = <span class="pattern" id="head.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="head-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#head-assertions">#</a></h2>
+ <div class="no-number no-toc" id="head-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#head-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “profile” attribute on the “head” element is obsolete.
@@ -59,7 +59,6 @@
or a <a href="syntax.html#comments" title="syntax-comments">comment</a>.</p>
</div>
-
<div class="no-number no-toc" id="head-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#head-context">#</a></h2>
<ul>
Index: p.html
===================================================================
RCS file: /sources/public/html5/markup/p.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- p.html 29 Jan 2010 00:40:40 -0000 1.26
+++ p.html 29 Jan 2010 02:30:47 -0000 1.27
@@ -33,8 +33,8 @@
<p><a href="p.html#p.attrs">p.attrs</a> = <span class="pattern" id="p.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="p-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#p-assertions">#</a></h2>
+ <div class="no-number no-toc" id="p-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#p-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “align” attribute on the “p” element is obsolete.
@@ -80,7 +80,6 @@
<code><a href="a.html#a">a</a></code> element.</p>
</div>
-
<div class="no-number no-toc" id="p-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#p-context">#</a></h2>
<ul>
Index: map.html
===================================================================
RCS file: /sources/public/html5/markup/map.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- map.html 29 Jan 2010 00:40:40 -0000 1.26
+++ map.html 29 Jan 2010 02:30:46 -0000 1.27
@@ -50,9 +50,17 @@
</dl></div>
- <div class="no-number no-toc" id="map-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#map-assertions">#</a></h2>
+ <div class="no-number no-toc" id="map-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#map-constraints">#</a></h2>
<ul class="assertions">
+ <p>If the
+ <a href="common-attributes.html#common.attrs.id" class="attribute">id</a>
+ attribute and
+ <a id="map.attrs.name" class="attribute">name</a>
+ attribute specified on the
+ <a href="map.html#map" class="element">map</a>
+ element, both attributes must have the same value.</p>
+
<li><span>
A “map” element must have a “name” attribute.
</span></li>
@@ -70,17 +78,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
- <div class="no-number no-toc" id="map-constraints">
- <h2 class="element-subhead">Additional constraints <a class="hash" href="#map-constraints">#</a></h2>
- <p>If the
- <a href="common-attributes.html#common.attrs.id" class="attribute">id</a>
- attribute and
- <a id="map.attrs.name" class="attribute">name</a>
- attribute specified on the
- <a href="map.html#map" class="element">map</a>
- element, both attributes must have the same value.</p>
- </div>
<div class="no-number no-toc" id="map-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#map-context">#</a></h2>
<ul>
Index: input.file.html
===================================================================
RCS file: /sources/public/html5/markup/input.file.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- input.file.html 29 Jan 2010 00:40:39 -0000 1.23
+++ input.file.html 29 Jan 2010 02:30:45 -0000 1.24
@@ -56,8 +56,8 @@
</dl></div>
- <div class="no-number no-toc" id="input.file-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.file-assertions">#</a></h2>
+ <div class="no-number no-toc" id="input.file-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.file-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “input” must not
@@ -92,7 +92,6 @@
An <a href="input.html#input">input</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="input.file-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.file-context">#</a></h2>
<ul>
Index: input.radio.html
===================================================================
RCS file: /sources/public/html5/markup/input.radio.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- input.radio.html 29 Jan 2010 00:40:39 -0000 1.24
+++ input.radio.html 29 Jan 2010 02:30:46 -0000 1.25
@@ -52,8 +52,8 @@
</dl></div>
- <div class="no-number no-toc" id="input.radio-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.radio-assertions">#</a></h2>
+ <div class="no-number no-toc" id="input.radio-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.radio-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “input” must not
@@ -88,7 +88,6 @@
An <a href="input.html#input">input</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="input.radio-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.radio-context">#</a></h2>
<ul>
Index: command.checkbox.html
===================================================================
RCS file: /sources/public/html5/markup/command.checkbox.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- command.checkbox.html 29 Jan 2010 00:40:38 -0000 1.23
+++ command.checkbox.html 29 Jan 2010 02:30:44 -0000 1.24
@@ -75,7 +75,6 @@
A <a href="command.html#command">command</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="command.checkbox-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#command.checkbox-context">#</a></h2>
<ul>
Index: param.html
===================================================================
RCS file: /sources/public/html5/markup/param.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- param.html 29 Jan 2010 00:40:40 -0000 1.26
+++ param.html 29 Jan 2010 02:30:47 -0000 1.27
@@ -43,8 +43,8 @@
</dl></div>
- <div class="no-number no-toc" id="param-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#param-assertions">#</a></h2>
+ <div class="no-number no-toc" id="param-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#param-constraints">#</a></h2>
<ul class="assertions">
<li><span>
A “param” element must have an “name” attribute.
@@ -68,7 +68,6 @@
A <a href="param.html#param">param</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="param-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#param-context">#</a></h2>
<ul>
Index: span.html
===================================================================
RCS file: /sources/public/html5/markup/span.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- span.html 29 Jan 2010 00:40:41 -0000 1.22
+++ span.html 29 Jan 2010 02:30:50 -0000 1.23
@@ -42,7 +42,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="span-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#span-context">#</a></h2>
<ul>
Index: input.reset.html
===================================================================
RCS file: /sources/public/html5/markup/input.reset.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- input.reset.html 29 Jan 2010 00:40:39 -0000 1.24
+++ input.reset.html 29 Jan 2010 02:30:46 -0000 1.25
@@ -49,8 +49,8 @@
</dl></div>
- <div class="no-number no-toc" id="input.reset-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.reset-assertions">#</a></h2>
+ <div class="no-number no-toc" id="input.reset-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.reset-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “input” must not
@@ -85,7 +85,6 @@
An <a href="input.html#input">input</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="input.reset-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.reset-context">#</a></h2>
<ul>
Index: input.datetime-local.html
===================================================================
RCS file: /sources/public/html5/markup/input.datetime-local.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- input.datetime-local.html 29 Jan 2010 00:40:39 -0000 1.23
+++ input.datetime-local.html 29 Jan 2010 02:30:45 -0000 1.24
@@ -73,8 +73,8 @@
</dl></div>
- <div class="no-number no-toc" id="input.datetime-local-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.datetime-local-assertions">#</a></h2>
+ <div class="no-number no-toc" id="input.datetime-local-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.datetime-local-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “input” must not
@@ -109,7 +109,6 @@
An <a href="input.html#input">input</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="input.datetime-local-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.datetime-local-context">#</a></h2>
<ul>
Index: input.color.html
===================================================================
RCS file: /sources/public/html5/markup/input.color.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- input.color.html 29 Jan 2010 00:40:39 -0000 1.24
+++ input.color.html 29 Jan 2010 02:30:45 -0000 1.25
@@ -55,8 +55,8 @@
</dl></div>
- <div class="no-number no-toc" id="input.color-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.color-assertions">#</a></h2>
+ <div class="no-number no-toc" id="input.color-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.color-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “input” must not
@@ -91,7 +91,6 @@
An <a href="input.html#input">input</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="input.color-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.color-context">#</a></h2>
<ul>
Index: option.html
===================================================================
RCS file: /sources/public/html5/markup/option.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- option.html 29 Jan 2010 00:40:40 -0000 1.26
+++ option.html 29 Jan 2010 02:30:47 -0000 1.27
@@ -65,7 +65,6 @@
content in the parent element.</p>
</div>
-
<div class="no-number no-toc" id="option-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#option-context">#</a></h2>
<ul>
Index: label.html
===================================================================
RCS file: /sources/public/html5/markup/label.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- label.html 29 Jan 2010 00:40:39 -0000 1.27
+++ label.html 29 Jan 2010 02:30:46 -0000 1.28
@@ -45,8 +45,8 @@
</dl></div>
- <div class="no-number no-toc" id="label-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#label-assertions">#</a></h2>
+ <div class="no-number no-toc" id="label-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#label-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “label” element must not contain any nested
@@ -78,7 +78,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="label-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#label-context">#</a></h2>
<ul>
Index: select.html
===================================================================
RCS file: /sources/public/html5/markup/select.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- select.html 29 Jan 2010 00:40:41 -0000 1.24
+++ select.html 29 Jan 2010 02:30:50 -0000 1.25
@@ -56,8 +56,8 @@
</dl></div>
- <div class="no-number no-toc" id="select-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#select-assertions">#</a></h2>
+ <div class="no-number no-toc" id="select-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#select-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “select” must not
@@ -85,7 +85,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="select-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#select-context">#</a></h2>
<ul>
Index: noscript.html
===================================================================
RCS file: /sources/public/html5/markup/noscript.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- noscript.html 29 Jan 2010 00:40:40 -0000 1.26
+++ noscript.html 29 Jan 2010 02:30:46 -0000 1.27
@@ -50,9 +50,12 @@
<p><a href="noscript.html#noscript.attrs">noscript.attrs</a> = <span class="pattern" id="noscript.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="noscript-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#noscript-assertions">#</a></h2>
+ <div class="no-number no-toc" id="noscript-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#noscript-constraints">#</a></h2>
<ul class="assertions">
+ <p>The <code><a href="noscript.html#noscript">noscript</a></code> element
+ must not be used in a <a href="documents.html#syntax-document-xml">document in the XML syntax</a>.</p>
+
<li><span>
The “noscript” element must not contain any nested
“noscript” elements.
@@ -67,12 +70,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
- <div class="no-number no-toc" id="noscript-constraints">
- <h2 class="element-subhead">Additional constraints <a class="hash" href="#noscript-constraints">#</a></h2>
- <p>The <code><a href="noscript.html#noscript">noscript</a></code> element
- must not be used in a <a href="documents.html#syntax-document-xml">document in the XML syntax</a>.</p>
- </div>
<div class="no-number no-toc" id="noscript-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#noscript-context">#</a></h2>
<ul>
Index: blockquote.html
===================================================================
RCS file: /sources/public/html5/markup/blockquote.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- blockquote.html 29 Jan 2010 01:34:08 -0000 1.25
+++ blockquote.html 29 Jan 2010 02:30:44 -0000 1.26
@@ -18,13 +18,9 @@
element represents a section that is quoted from another
source.</p>
</div>
- <div class="no-number no-toc" id="blockquote-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#blockquote-contents">#</a></h2><div class="prose-model">
- <p>
- <a href="syntax.html#normal-character-data">Normal character data</a>
- and
- <a href="common-models.html#common.elem.flow">flow elements</a>
- </p>
- </div></div><div class="no-number no-toc" id="blockquote-content-model">
+ <div class="no-number no-toc" id="blockquote-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#blockquote-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">flow elements</a></p></div></div><div class="no-number no-toc" id="blockquote-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#blockquote-content-model">#</a></h2><div class="content-models">
<div id="blockquote-mdls">
@@ -57,7 +53,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="blockquote-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#blockquote-context">#</a></h2>
<ul>
Index: hr.html
===================================================================
RCS file: /sources/public/html5/markup/hr.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- hr.html 29 Jan 2010 00:40:38 -0000 1.22
+++ hr.html 29 Jan 2010 02:30:45 -0000 1.23
@@ -32,8 +32,8 @@
<p><a href="hr.html#hr.attrs">hr.attrs</a> = <span class="pattern" id="hr.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="hr-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#hr-assertions">#</a></h2>
+ <div class="no-number no-toc" id="hr-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#hr-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “align” attribute on the “hr” element is obsolete.
@@ -60,7 +60,6 @@
An <a href="hr.html#hr">hr</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="hr-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#hr-context">#</a></h2>
<ul>
Index: td.html
===================================================================
RCS file: /sources/public/html5/markup/td.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- td.html 29 Jan 2010 00:40:41 -0000 1.27
+++ td.html 29 Jan 2010 02:30:50 -0000 1.28
@@ -63,8 +63,8 @@
</dl></div>
- <div class="no-number no-toc" id="td-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#td-assertions">#</a></h2>
+ <div class="no-number no-toc" id="td-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#td-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “scope” attribute on the “td” element is obsolete.
@@ -117,7 +117,6 @@
content in the parent element.</p>
</div>
-
<div class="no-number no-toc" id="td-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#td-context">#</a></h2>
<ul>
Index: em.html
===================================================================
RCS file: /sources/public/html5/markup/em.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- em.html 29 Jan 2010 00:40:38 -0000 1.22
+++ em.html 29 Jan 2010 02:30:44 -0000 1.23
@@ -41,7 +41,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="em-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#em-context">#</a></h2>
<ul>
Index: input.hidden.html
===================================================================
RCS file: /sources/public/html5/markup/input.hidden.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- input.hidden.html 29 Jan 2010 00:40:39 -0000 1.24
+++ input.hidden.html 29 Jan 2010 02:30:45 -0000 1.25
@@ -50,8 +50,8 @@
</dl></div>
- <div class="no-number no-toc" id="input.hidden-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.hidden-assertions">#</a></h2>
+ <div class="no-number no-toc" id="input.hidden-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.hidden-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “input” must not
@@ -86,7 +86,6 @@
An <a href="input.html#input">input</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="input.hidden-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.hidden-context">#</a></h2>
<ul>
Index: caption.html
===================================================================
RCS file: /sources/public/html5/markup/caption.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- caption.html 29 Jan 2010 00:40:37 -0000 1.24
+++ caption.html 29 Jan 2010 02:30:44 -0000 1.25
@@ -17,7 +17,9 @@
<p>The <a href="caption.html#caption" class="element">caption</a> element
represents the title of the <a href="table.html#table" class="element">table</a> that is its parent.</p>
</div>
- <div class="no-number no-toc" id="caption-content-model">
+ <div class="no-number no-toc" id="caption-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#caption-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">flow elements</a></p></div></div><div class="no-number no-toc" id="caption-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#caption-content-model">#</a></h2><div class="content-models">
<div id="caption-mdls">
@@ -33,8 +35,8 @@
<p><a href="caption.html#caption.attrs">caption.attrs</a> = <span class="pattern" id="caption.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="caption-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#caption-assertions">#</a></h2>
+ <div class="no-number no-toc" id="caption-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#caption-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “align” attribute on the “caption” element is obsolete.
@@ -50,7 +52,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="caption-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#caption-context">#</a></h2>
<ul>
Index: kbd.html
===================================================================
RCS file: /sources/public/html5/markup/kbd.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- kbd.html 29 Jan 2010 00:40:39 -0000 1.23
+++ kbd.html 29 Jan 2010 02:30:46 -0000 1.24
@@ -41,7 +41,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="kbd-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#kbd-context">#</a></h2>
<ul>
Index: base.html
===================================================================
RCS file: /sources/public/html5/markup/base.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- base.html 29 Jan 2010 01:34:08 -0000 1.24
+++ base.html 29 Jan 2010 02:30:44 -0000 1.25
@@ -20,9 +20,7 @@
<a href="terminology.html#context">browsing context</a> name
for the purposes of following hyperlinks.</p>
</div>
- <div class="no-number no-toc" id="base-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#base-contents">#</a></h2><div class="prose-model">
- <p>Empty</p>
- </div></div><div class="no-number no-toc" id="base-content-model">
+ <div class="no-number no-toc" id="base-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#base-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="base-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#base-content-model">#</a></h2><div class="content-models">
<div id="base-mdls">
@@ -61,7 +59,6 @@
A <a href="base.html#base">base</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="base-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#base-context">#</a></h2>
<ul>
Index: canvas.html
===================================================================
RCS file: /sources/public/html5/markup/canvas.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- canvas.html 29 Jan 2010 00:40:37 -0000 1.22
+++ canvas.html 29 Jan 2010 02:30:44 -0000 1.23
@@ -19,7 +19,7 @@
used for dynamically rendering of images such as game
graphics, graphs, or other images.</p>
</div>
- <div class="no-number no-toc" id="canvas-content-model">
+ <div class="no-number no-toc" id="canvas-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#canvas-contents">#</a></h2><div class="prose-model"><div id="prose-model"><p><a href="terminology.html#transparent">Transparent</a></p></div></div></div><div class="no-number no-toc" id="canvas-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#canvas-content-model">#</a></h2><div class="content-models">
<dl id="canvas-mdls">
@@ -65,7 +65,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="canvas-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#canvas-context">#</a></h2>
<ul>
Index: input.search.html
===================================================================
RCS file: /sources/public/html5/markup/input.search.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- input.search.html 29 Jan 2010 00:40:39 -0000 1.25
+++ input.search.html 29 Jan 2010 02:30:46 -0000 1.26
@@ -59,8 +59,8 @@
</dl></div>
- <div class="no-number no-toc" id="input.search-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.search-assertions">#</a></h2>
+ <div class="no-number no-toc" id="input.search-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.search-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “input” must not
@@ -95,7 +95,6 @@
An <a href="input.html#input">input</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="input.search-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.search-context">#</a></h2>
<ul>
Index: tfoot.html
===================================================================
RCS file: /sources/public/html5/markup/tfoot.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- tfoot.html 29 Jan 2010 00:40:41 -0000 1.20
+++ tfoot.html 29 Jan 2010 02:30:50 -0000 1.21
@@ -33,8 +33,8 @@
<p><a href="tfoot.html#tfoot.attrs">tfoot.attrs</a> = <span class="pattern" id="tfoot.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="tfoot-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#tfoot-assertions">#</a></h2>
+ <div class="no-number no-toc" id="tfoot-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#tfoot-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “align” attribute on the “tfoot” element is obsolete.
@@ -63,7 +63,6 @@
or if there is no more content in the parent element.</p>
</div>
-
<div class="no-number no-toc" id="tfoot-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#tfoot-context">#</a></h2>
<ul>
Index: rt.html
===================================================================
RCS file: /sources/public/html5/markup/rt.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- rt.html 29 Jan 2010 00:40:40 -0000 1.22
+++ rt.html 29 Jan 2010 02:30:50 -0000 1.23
@@ -44,7 +44,6 @@
content in the parent element.</p>
</div>
-
<div class="no-number no-toc" id="rt-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#rt-context">#</a></h2>
<ul>
Index: fieldset.html
===================================================================
RCS file: /sources/public/html5/markup/fieldset.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- fieldset.html 29 Jan 2010 00:40:38 -0000 1.24
+++ fieldset.html 29 Jan 2010 02:30:44 -0000 1.25
@@ -48,7 +48,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="fieldset-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#fieldset-context">#</a></h2>
<ul>
Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- spec.html 29 Jan 2010 01:39:00 -0000 1.125
+++ spec.html 29 Jan 2010 02:30:50 -0000 1.126
@@ -2582,9 +2582,7 @@
<div class="no-number no-toc" id="a-contents">
<h2 class="element-subhead">Permitted contents <a class="hash" href="#a-contents">#</a>
</h2>
-<div class="prose-model">
- <p><a href="#transparent">Transparent</a></p>
- </div>
+<div class="prose-model"><div id="prose-model"><p><a href="#transparent">Transparent</a></p></div></div>
</div>
<div class="no-number no-toc" id="a-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#a-content-model">#</a>
@@ -2689,8 +2687,8 @@
[...2452 lines suppressed...]
</h2>
@@ -15663,8 +15454,8 @@
</dl>
</div>
- <div class="no-number no-toc" id="video-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#video-assertions">#</a>
+ <div class="no-number no-toc" id="video-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#video-constraints">#</a>
</h2>
<ul class="assertions">
<li><span>
@@ -15688,7 +15479,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="video-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#video-context">#</a>
</h2>
Index: datalist.html
===================================================================
RCS file: /sources/public/html5/markup/datalist.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- datalist.html 29 Jan 2010 00:40:38 -0000 1.25
+++ datalist.html 29 Jan 2010 02:30:44 -0000 1.26
@@ -44,7 +44,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="datalist-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#datalist-context">#</a></h2>
<ul>
Index: h1.html
===================================================================
RCS file: /sources/public/html5/markup/h1.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- h1.html 29 Jan 2010 00:40:38 -0000 1.26
+++ h1.html 29 Jan 2010 02:30:45 -0000 1.27
@@ -33,8 +33,8 @@
<p><a href="h1.html#h1.attrs">h1.attrs</a> = <span class="pattern" id="h1.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="h1-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#h1-assertions">#</a></h2>
+ <div class="no-number no-toc" id="h1-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#h1-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “h1” element must not appear as a
@@ -54,7 +54,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="h1-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#h1-context">#</a></h2>
<ul>
Index: h3.html
===================================================================
RCS file: /sources/public/html5/markup/h3.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- h3.html 29 Jan 2010 00:40:38 -0000 1.26
+++ h3.html 29 Jan 2010 02:30:45 -0000 1.27
@@ -33,8 +33,8 @@
<p><a href="h3.html#h3.attrs">h3.attrs</a> = <span class="pattern" id="h3.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="h3-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#h3-assertions">#</a></h2>
+ <div class="no-number no-toc" id="h3-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#h3-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “h3” element must not appear as a
@@ -54,7 +54,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="h3-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#h3-context">#</a></h2>
<ul>
Index: optgroup.html
===================================================================
RCS file: /sources/public/html5/markup/optgroup.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- optgroup.html 29 Jan 2010 00:40:40 -0000 1.21
+++ optgroup.html 29 Jan 2010 02:30:47 -0000 1.22
@@ -54,7 +54,6 @@
content in the parent element.</p>
</div>
-
<div class="no-number no-toc" id="optgroup-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#optgroup-context">#</a></h2>
<ul>
Index: input.week.html
===================================================================
RCS file: /sources/public/html5/markup/input.week.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- input.week.html 29 Jan 2010 00:40:39 -0000 1.23
+++ input.week.html 29 Jan 2010 02:30:46 -0000 1.24
@@ -72,8 +72,8 @@
</dl></div>
- <div class="no-number no-toc" id="input.week-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.week-assertions">#</a></h2>
+ <div class="no-number no-toc" id="input.week-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.week-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “input” must not
@@ -108,7 +108,6 @@
An <a href="input.html#input">input</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="input.week-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.week-context">#</a></h2>
<ul>
Index: button.button.html
===================================================================
RCS file: /sources/public/html5/markup/button.button.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- button.button.html 29 Jan 2010 01:34:08 -0000 1.30
+++ button.button.html 29 Jan 2010 02:30:44 -0000 1.31
@@ -19,13 +19,9 @@
value is "<code>button</code>" represents a button with no
additional semantics.</p>
</div>
- <div class="no-number no-toc" id="button.button-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#button.button-contents">#</a></h2><div class="prose-model">
- <p>
- <a href="syntax.html#normal-character-data">Normal character data</a>
- and
- <a href="common-models.html#common.elem.phrasing">phrasing elements</a>
- </p>
- </div></div><div class="no-number no-toc" id="button.button-content-model">
+ <div class="no-number no-toc" id="button.button-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#button.button-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="button.button-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#button.button-content-model">#</a></h2><div class="content-models">
<div id="button.button-mdls">
@@ -58,8 +54,8 @@
</dl></div>
- <div class="no-number no-toc" id="button.button-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#button.button-assertions">#</a></h2>
+ <div class="no-number no-toc" id="button.button-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#button.button-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “button” must not
@@ -82,7 +78,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="button.button-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#button.button-context">#</a></h2>
<ul>
Index: form.html
===================================================================
RCS file: /sources/public/html5/markup/form.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- form.html 29 Jan 2010 00:40:38 -0000 1.28
+++ form.html 29 Jan 2010 02:30:45 -0000 1.29
@@ -91,8 +91,8 @@
</dl></div>
- <div class="no-number no-toc" id="form-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#form-assertions">#</a></h2>
+ <div class="no-number no-toc" id="form-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#form-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “form” element must not contain any nested
@@ -108,7 +108,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="form-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#form-context">#</a></h2>
<ul>
Index: small.html
===================================================================
RCS file: /sources/public/html5/markup/small.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- small.html 29 Jan 2010 00:40:41 -0000 1.22
+++ small.html 29 Jan 2010 02:30:50 -0000 1.23
@@ -42,7 +42,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="small-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#small-context">#</a></h2>
<ul>
Index: ruby.html
===================================================================
RCS file: /sources/public/html5/markup/ruby.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- ruby.html 29 Jan 2010 00:40:40 -0000 1.22
+++ ruby.html 29 Jan 2010 02:30:50 -0000 1.23
@@ -45,7 +45,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="ruby-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#ruby-context">#</a></h2>
<ul>
Index: ol.html
===================================================================
RCS file: /sources/public/html5/markup/ol.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- ol.html 29 Jan 2010 00:40:40 -0000 1.22
+++ ol.html 29 Jan 2010 02:30:47 -0000 1.23
@@ -52,8 +52,8 @@
</dl></div>
- <div class="no-number no-toc" id="ol-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#ol-assertions">#</a></h2>
+ <div class="no-number no-toc" id="ol-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#ol-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “type” attribute on the “ol” element is obsolete.
@@ -73,7 +73,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="ol-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#ol-context">#</a></h2>
<ul>
Index: article.html
===================================================================
RCS file: /sources/public/html5/markup/article.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- article.html 29 Jan 2010 01:18:37 -0000 1.29
+++ article.html 29 Jan 2010 02:30:43 -0000 1.30
@@ -19,13 +19,9 @@
of a document or site; for example, a magazine or newspaper
article, or a blog entry.</p>
</div>
- <div class="no-number no-toc" id="article-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#article-contents">#</a></h2><div class="prose-model">
- <p>
- <a href="syntax.html#normal-character-data">Normal character data</a>
- and
- <a href="common-models.html#common.elem.flow">flow elements</a>
- </p>
- </div></div><div class="no-number no-toc" id="article-content-model">
+ <div class="no-number no-toc" id="article-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#article-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">flow elements</a></p></div></div><div class="no-number no-toc" id="article-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#article-content-model">#</a></h2><div class="content-models">
<div id="article-mdls">
@@ -42,8 +38,8 @@
<p><a href="article.html#article.attrs">article.attrs</a> = <span class="pattern" id="article.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="article-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#article-assertions">#</a></h2>
+ <div class="no-number no-toc" id="article-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#article-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The sectioning element “article” must not
@@ -59,7 +55,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="article-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#article-context">#</a></h2>
<ul>
Index: colgroup.html
===================================================================
RCS file: /sources/public/html5/markup/colgroup.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- colgroup.html 29 Jan 2010 00:40:38 -0000 1.21
+++ colgroup.html 29 Jan 2010 02:30:44 -0000 1.22
@@ -13,11 +13,7 @@
</div>
<div id="colgroup" class="section">
<h2 class="element-head"><span class="element">colgroup</span> – <span class="shortdesc">table column group</span> <a class="hash" href="#colgroup">#</a> <a class="toc-bak" href="Overview.html#colgroup-toc">T</a></h2>
- <div id="colgroup-longdesc" class="longdesc">
- <p>The <a href="colgroup.html#colgroup" class="element">colgroup</a>
- element represents a group of one or more columns in the <a href="table.html#table" class="element">table</a> that is its
- parent.</p>
- </div>
+ <div id="colgroup-longdesc" class="longdesc"><p><i class="TK">(element description to come)</i></p></div>
<div class="no-number no-toc" id="colgroup-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#colgroup-content-model">#</a></h2><div class="content-models">
@@ -37,12 +33,12 @@
<dt><a class="attribute-name" id="colgroup.attrs.span" title="colgroup.attrs.span" href="colgroup.html#colgroup.attrs.span">span</a> = <span class="attr-values">
<a class="ref" href="datatypes.html#common.data.integer.positive" title="common.data.integer.positive">integer.positive</a>
</span> </dt>
- <dd>The number of columns in the group.</dd>
+ <dd><i class="TK">(detailed attribute description to come)</i></dd>
</dl></div>
- <div class="no-number no-toc" id="colgroup-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#colgroup-assertions">#</a></h2>
+ <div class="no-number no-toc" id="colgroup-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#colgroup-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “width” attribute on the “colgroup” element is obsolete.
@@ -62,18 +58,12 @@
</div>
<div class="no-number no-toc" id="colgroup-tags">
<h2 class="element-subhead">Tag omission <a class="hash" href="#colgroup-tags">#</a></h2>
-
- <p>A <code><a href="colgroup.html#colgroup">colgroup</a></code> element's
- <span title="syntax-start-tag">start tag</span> may be omitted
- if the first thing inside the <code><a href="colgroup.html#colgroup">colgroup</a></code> element is a <code><a href="col.html#col">col</a></code> element, and if the element is not
- immediately preceded by another <code><a href="colgroup.html#colgroup">colgroup</a></code> element whose <span title="syntax-end-tag">end tag</span> has been omitted.</p> <p>A
- <code><a href="colgroup.html#colgroup">colgroup</a></code> element's <span title="syntax-end-tag">end tag</span> may be omitted if the
- <code><a href="colgroup.html#colgroup">colgroup</a></code> element is not
- immediately followed by a <a href="terminology.html#space">space character</a> or
- a <a href="syntax.html#comments" title="syntax-comments">comment</a>.</p>
-
+ <p>A <a href="colgroup.html#colgroup">colgroup</a>
+ element must have both a
+ <span title="syntax-start-tag">start tag</span>
+ and an
+ <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="colgroup-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#colgroup-context">#</a></h2>
<ul>
Index: dl.html
===================================================================
RCS file: /sources/public/html5/markup/dl.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- dl.html 29 Jan 2010 00:40:38 -0000 1.22
+++ dl.html 29 Jan 2010 02:30:44 -0000 1.23
@@ -33,8 +33,8 @@
<p><a href="dl.html#dl.attrs">dl.attrs</a> = <span class="pattern" id="dl.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="dl-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#dl-assertions">#</a></h2>
+ <div class="no-number no-toc" id="dl-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#dl-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “compact” attribute on the “dl” element is obsolete.
@@ -50,7 +50,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="dl-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#dl-context">#</a></h2>
<ul>
Index: thead.html
===================================================================
RCS file: /sources/public/html5/markup/thead.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- thead.html 29 Jan 2010 00:40:41 -0000 1.20
+++ thead.html 29 Jan 2010 02:30:51 -0000 1.21
@@ -35,8 +35,8 @@
<p><a href="thead.html#thead.attrs">thead.attrs</a> = <span class="pattern" id="thead.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="thead-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#thead-assertions">#</a></h2>
+ <div class="no-number no-toc" id="thead-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#thead-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “align” attribute on the “thead” element is obsolete.
@@ -65,7 +65,6 @@
<code><a href="tfoot.html#tfoot">tfoot</a></code> element.</p>
</div>
-
<div class="no-number no-toc" id="thead-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#thead-context">#</a></h2>
<ul>
Index: tbody.html
===================================================================
RCS file: /sources/public/html5/markup/tbody.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- tbody.html 29 Jan 2010 00:40:41 -0000 1.20
+++ tbody.html 29 Jan 2010 02:30:50 -0000 1.21
@@ -34,8 +34,8 @@
<p><a href="tbody.html#tbody.attrs">tbody.attrs</a> = <span class="pattern" id="tbody.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="tbody-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#tbody-assertions">#</a></h2>
+ <div class="no-number no-toc" id="tbody-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#tbody-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “align” attribute on the “tbody” element is obsolete.
@@ -67,7 +67,6 @@
is no more content in the parent element.</p>
</div>
-
<div class="no-number no-toc" id="tbody-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#tbody-context">#</a></h2>
<ul>
Index: video.html
===================================================================
RCS file: /sources/public/html5/markup/video.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- video.html 29 Jan 2010 00:40:41 -0000 1.27
+++ video.html 29 Jan 2010 02:30:51 -0000 1.28
@@ -92,8 +92,8 @@
</dl></div>
- <div class="no-number no-toc" id="video-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#video-assertions">#</a></h2>
+ <div class="no-number no-toc" id="video-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#video-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “video”
@@ -114,7 +114,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="video-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#video-context">#</a></h2>
<ul>
Index: source.html
===================================================================
RCS file: /sources/public/html5/markup/source.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- source.html 29 Jan 2010 00:40:41 -0000 1.29
+++ source.html 29 Jan 2010 02:30:50 -0000 1.30
@@ -20,8 +20,9 @@
enables multiple <a href="source.html#media-source">media sources</a> to
be specified for
<a href="audio.html#audio" class="element">audio</a>
+ and
<a href="video.html#video" class="element">video</a>
- .</p>
+ elements.</p>
</div>
<div class="no-number no-toc" id="source-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#source-content-model">#</a></h2><div class="content-models">
@@ -65,8 +66,8 @@
</dl></div>
- <div class="no-number no-toc" id="source-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#source-assertions">#</a></h2>
+ <div class="no-number no-toc" id="source-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#source-constraints">#</a></h2>
<ul class="assertions">
<li><span>
A “source” element must have a
@@ -82,7 +83,6 @@
A <a href="source.html#source">source</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="source-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#source-context">#</a></h2>
<ul>
Index: button.reset.html
===================================================================
RCS file: /sources/public/html5/markup/button.reset.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- button.reset.html 29 Jan 2010 01:34:08 -0000 1.30
+++ button.reset.html 29 Jan 2010 02:30:44 -0000 1.31
@@ -19,13 +19,9 @@
value is "<code>reset</code>" represents a button for
resetting a form.</p>
</div>
- <div class="no-number no-toc" id="button.reset-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#button.reset-contents">#</a></h2><div class="prose-model">
- <p>
- <a href="syntax.html#normal-character-data">Normal character data</a>
- and
- <a href="common-models.html#common.elem.phrasing">phrasing elements</a>
- </p>
- </div></div><div class="no-number no-toc" id="button.reset-content-model">
+ <div class="no-number no-toc" id="button.reset-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#button.reset-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="button.reset-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#button.reset-content-model">#</a></h2><div class="content-models">
<div id="button.reset-mdls">
@@ -58,8 +54,8 @@
</dl></div>
- <div class="no-number no-toc" id="button.reset-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#button.reset-assertions">#</a></h2>
+ <div class="no-number no-toc" id="button.reset-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#button.reset-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “button” must not
@@ -82,7 +78,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="button.reset-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#button.reset-context">#</a></h2>
<ul>
Index: meta.charset.html
===================================================================
RCS file: /sources/public/html5/markup/meta.charset.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- meta.charset.html 29 Jan 2010 00:40:40 -0000 1.27
+++ meta.charset.html 29 Jan 2010 02:30:46 -0000 1.28
@@ -45,9 +45,17 @@
</dl></div>
- <div class="no-number no-toc" id="meta.charset-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#meta.charset-assertions">#</a></h2>
+ <div class="no-number no-toc" id="meta.charset-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#meta.charset-constraints">#</a></h2>
<ul class="assertions">
+ <p>There must not be more than one <a href="meta.html#meta" class="element">meta</a> element per document with a <a href="meta.charset.html#meta.charset.attrs.charset">charset</a>
+ attribute.</p>
+ <p>If a document contains a
+ <a href="meta.html#meta" class="element">meta</a>
+ element with a <a href="meta.charset.html#meta.charset.attrs.charset">charset</a>
+ attribute, then the document must not contain a <a href="meta.html#meta" class="element">meta</a> element in the <a href="meta.http-equiv.content-type.html#encoding-declaration-state">encoding declaration
+ state</a>.</p>
+
<li><span>
The “scheme” attribute on the “meta” element is obsolete.
Use only one scheme per field, or make the scheme declaration part of the value.
@@ -62,17 +70,6 @@
A <a href="meta.html#meta">meta</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
- <div class="no-number no-toc" id="meta.charset-constraints">
- <h2 class="element-subhead">Additional constraints <a class="hash" href="#meta.charset-constraints">#</a></h2>
- <p>There must not be more than one <a href="meta.html#meta" class="element">meta</a> element per document with a <a href="meta.charset.html#meta.charset.attrs.charset">charset</a>
- attribute.</p>
- <p>If a document contains a
- <a href="meta.html#meta" class="element">meta</a>
- element with a <a href="meta.charset.html#meta.charset.attrs.charset">charset</a>
- attribute, then the document must not contain a <a href="meta.html#meta" class="element">meta</a> element in the <a href="meta.http-equiv.content-type.html#encoding-declaration-state">encoding declaration
- state</a>.</p>
- </div>
<div class="no-number no-toc" id="meta.charset-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#meta.charset-context">#</a></h2>
<ul>
Index: output.html
===================================================================
RCS file: /sources/public/html5/markup/output.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- output.html 29 Jan 2010 00:40:40 -0000 1.25
+++ output.html 29 Jan 2010 02:30:47 -0000 1.26
@@ -55,7 +55,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="output-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#output-context">#</a></h2>
<ul>
Index: i.html
===================================================================
RCS file: /sources/public/html5/markup/i.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- i.html 29 Jan 2010 00:40:38 -0000 1.23
+++ i.html 29 Jan 2010 02:30:45 -0000 1.24
@@ -43,7 +43,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="i-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#i-context">#</a></h2>
<ul>
Index: input.submit.html
===================================================================
RCS file: /sources/public/html5/markup/input.submit.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- input.submit.html 29 Jan 2010 00:40:39 -0000 1.24
+++ input.submit.html 29 Jan 2010 02:30:46 -0000 1.25
@@ -54,8 +54,8 @@
</dl></div>
- <div class="no-number no-toc" id="input.submit-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.submit-assertions">#</a></h2>
+ <div class="no-number no-toc" id="input.submit-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.submit-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “input” must not
@@ -90,7 +90,6 @@
An <a href="input.html#input">input</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="input.submit-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.submit-context">#</a></h2>
<ul>
Index: input.date.html
===================================================================
RCS file: /sources/public/html5/markup/input.date.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- input.date.html 29 Jan 2010 00:40:39 -0000 1.23
+++ input.date.html 29 Jan 2010 02:30:45 -0000 1.24
@@ -72,8 +72,8 @@
</dl></div>
- <div class="no-number no-toc" id="input.date-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.date-assertions">#</a></h2>
+ <div class="no-number no-toc" id="input.date-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.date-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “input” must not
@@ -108,7 +108,6 @@
An <a href="input.html#input">input</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="input.date-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.date-context">#</a></h2>
<ul>
Index: var.html
===================================================================
RCS file: /sources/public/html5/markup/var.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- var.html 29 Jan 2010 00:40:41 -0000 1.22
+++ var.html 29 Jan 2010 02:30:51 -0000 1.23
@@ -43,7 +43,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="var-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#var-context">#</a></h2>
<ul>
Index: sub.html
===================================================================
RCS file: /sources/public/html5/markup/sub.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- sub.html 29 Jan 2010 00:40:41 -0000 1.22
+++ sub.html 29 Jan 2010 02:30:50 -0000 1.23
@@ -41,7 +41,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="sub-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#sub-context">#</a></h2>
<ul>
Index: title.html
===================================================================
RCS file: /sources/public/html5/markup/title.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- title.html 29 Jan 2010 00:40:41 -0000 1.21
+++ title.html 29 Jan 2010 02:30:51 -0000 1.22
@@ -40,7 +40,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="title-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#title-context">#</a></h2>
<ul>
Index: pre.html
===================================================================
RCS file: /sources/public/html5/markup/pre.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- pre.html 29 Jan 2010 00:40:40 -0000 1.24
+++ pre.html 29 Jan 2010 02:30:50 -0000 1.25
@@ -35,8 +35,8 @@
<p><a href="pre.html#pre.attrs">pre.attrs</a> = <span class="pattern" id="pre.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="pre-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#pre-assertions">#</a></h2>
+ <div class="no-number no-toc" id="pre-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#pre-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “width” attribute on the “pre” element is obsolete.
@@ -52,7 +52,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="pre-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#pre-context">#</a></h2>
<ul>
Index: button.submit.html
===================================================================
RCS file: /sources/public/html5/markup/button.submit.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- button.submit.html 29 Jan 2010 01:34:08 -0000 1.30
+++ button.submit.html 29 Jan 2010 02:30:44 -0000 1.31
@@ -19,13 +19,9 @@
value is "<code>submit</code>" represents a button for
submitting a form.</p>
</div>
- <div class="no-number no-toc" id="button.submit-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#button.submit-contents">#</a></h2><div class="prose-model">
- <p>
- <a href="syntax.html#normal-character-data">Normal character data</a>
- and
- <a href="common-models.html#common.elem.phrasing">phrasing elements</a>
- </p>
- </div></div><div class="no-number no-toc" id="button.submit-content-model">
+ <div class="no-number no-toc" id="button.submit-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#button.submit-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="button.submit-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#button.submit-content-model">#</a></h2><div class="content-models">
<div id="button.submit-mdls">
@@ -63,8 +59,8 @@
</dl></div>
- <div class="no-number no-toc" id="button.submit-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#button.submit-assertions">#</a></h2>
+ <div class="no-number no-toc" id="button.submit-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#button.submit-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “button” must not
@@ -87,7 +83,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="button.submit-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#button.submit-context">#</a></h2>
<ul>
Index: rp.html
===================================================================
RCS file: /sources/public/html5/markup/rp.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- rp.html 29 Jan 2010 00:40:40 -0000 1.22
+++ rp.html 29 Jan 2010 02:30:50 -0000 1.23
@@ -46,7 +46,6 @@
content in the parent element.</p>
</div>
-
<div class="no-number no-toc" id="rp-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#rp-context">#</a></h2>
<ul>
Index: sup.html
===================================================================
RCS file: /sources/public/html5/markup/sup.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- sup.html 29 Jan 2010 00:40:41 -0000 1.22
+++ sup.html 29 Jan 2010 02:30:50 -0000 1.23
@@ -41,7 +41,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="sup-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#sup-context">#</a></h2>
<ul>
Index: input.url.html
===================================================================
RCS file: /sources/public/html5/markup/input.url.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- input.url.html 29 Jan 2010 00:40:39 -0000 1.23
+++ input.url.html 29 Jan 2010 02:30:46 -0000 1.24
@@ -62,8 +62,8 @@
</dl></div>
- <div class="no-number no-toc" id="input.url-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.url-assertions">#</a></h2>
+ <div class="no-number no-toc" id="input.url-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#input.url-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The interactive element “input” must not
@@ -98,7 +98,6 @@
An <a href="input.html#input">input</a>
element must have a <span title="syntax-start-tag">start tag</span> but must not have an <span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="input.url-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#input.url-context">#</a></h2>
<ul>
Index: hgroup.html
===================================================================
RCS file: /sources/public/html5/markup/hgroup.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- hgroup.html 29 Jan 2010 00:40:38 -0000 1.19
+++ hgroup.html 29 Jan 2010 02:30:45 -0000 1.20
@@ -45,7 +45,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="hgroup-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#hgroup-context">#</a></h2>
<ul>
Index: h5.html
===================================================================
RCS file: /sources/public/html5/markup/h5.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- h5.html 29 Jan 2010 00:40:38 -0000 1.26
+++ h5.html 29 Jan 2010 02:30:45 -0000 1.27
@@ -33,8 +33,8 @@
<p><a href="h5.html#h5.attrs">h5.attrs</a> = <span class="pattern" id="h5.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a></span></p></div></div>
- <div class="no-number no-toc" id="h5-assertions">
- <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#h5-assertions">#</a></h2>
+ <div class="no-number no-toc" id="h5-constraints">
+ <h2 class="element-subhead">Additional constraints and admonitions <a class="hash" href="#h5-constraints">#</a></h2>
<ul class="assertions">
<li><span>
The “h5” element must not appear as a
@@ -54,7 +54,6 @@
and an
<span title="syntax-end-tag">end tag</span>.</p>
</div>
-
<div class="no-number no-toc" id="h5-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#h5-context">#</a></h2>
<ul>
Received on Friday, 29 January 2010 02:31:32 UTC