- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Sun, 31 Jan 2010 06:11:03 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv28551
Modified Files:
Overview.html input.hidden.html input.image.html
input.month.html input.number.html input.password.html
input.radio.html input.range.html input.reset.html
input.search.html input.submit.html input.tel.html
input.text.html input.time.html input.url.html input.week.html
ins.html kbd.html keygen.html label.html legend.html li.html
link.html map.html mark.html menu.html meta.charset.html
meta.http-equiv.content-language.html
meta.http-equiv.content-type.html
meta.http-equiv.default-style.html
meta.http-equiv.refresh.html meta.name.html meter.html
nav.html noscript.html object.html ol.html optgroup.html
option.html output.html p.html param.html pre.html
progress.html q.html rp.html rt.html ruby.html samp.html
script.html section.html select.html small.html source.html
span.html spec.html strong.html style.html sub.html sup.html
table.html tbody.html td.html textarea.html tfoot.html th.html
thead.html time.html title.html tr.html ul.html var.html
video.html
Log Message:
checkpointing
Index: legend.html
===================================================================
RCS file: /sources/public/html5/markup/legend.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- legend.html 30 Jan 2010 04:44:23 -0000 1.27
+++ legend.html 31 Jan 2010 06:10:59 -0000 1.28
@@ -19,7 +19,9 @@
contents of the <a href="legend.html#legend" class="element">legend</a>
element’s parent element.</p>
</div>
- <div class="no-number no-toc" id="legend-content-model">
+ <div class="no-number no-toc" id="legend-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#legend-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="legend-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#legend-content-model">#</a></h2><div class="content-models">
<div id="legend-mdls">
Index: th.html
===================================================================
RCS file: /sources/public/html5/markup/th.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- th.html 30 Jan 2010 04:44:25 -0000 1.32
+++ th.html 31 Jan 2010 06:11:01 -0000 1.33
@@ -17,7 +17,9 @@
<p>The <a href="th.html#th" class="element">th</a> element represents
a header cell in a table.</p>
</div>
- <div class="no-number no-toc" id="th-content-model">
+ <div class="no-number no-toc" id="th-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#th-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="th-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#th-content-model">#</a></h2><div class="content-models">
<div id="th-mdls">
Index: mark.html
===================================================================
RCS file: /sources/public/html5/markup/mark.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- mark.html 30 Jan 2010 04:44:24 -0000 1.26
+++ mark.html 31 Jan 2010 06:11:00 -0000 1.27
@@ -19,7 +19,9 @@
for reference purposes, due to its relevance in another
context.</p>
</div>
- <div class="no-number no-toc" id="mark-content-model">
+ <div class="no-number no-toc" id="mark-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#mark-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="mark-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#mark-content-model">#</a></h2><div class="content-models">
<div id="mark-mdls">
Index: Overview.html
===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -d -r1.370 -r1.371
--- Overview.html 30 Jan 2010 05:49:59 -0000 1.370
+++ Overview.html 31 Jan 2010 06:10:58 -0000 1.371
@@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<title>HTML: The Markup Language</title>
<link rel="stylesheet" href="style.css" type="text/css">
-<script src="js/dfn.js"></script><link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-WD" type="text/css">
+<script src="js/dfn.js"></script><link rel="stylesheet" href="W3C-ED.css" type="text/css">
</head>
<body>
<div class="head">
@@ -12,13 +12,12 @@
<h1>HTML: The Markup Language</h1>
<h2>
W3C
- Working Draft <em>NaN @@ </em>
+ Editor’s Draft <em>31 January 2010</em>
</h2>
<dl>
-<dt>This Version:</dt>
-<dd><a href=""></a></dd>
-<dt>Latest Version:</dt>
-<dd><a href=""></a></dd>
+<dt>Latest Editor’s Draft:</dt>
+<dd>
+<a id="latestED" href="http://dev.w3.org/html5/markup/">http://dev.w3.org/html5/markup/</a> </dd>
<dt>Editor:</dt>
<dd>
<a href="http://people.w3.org/mike">Michael(tm) Smith</a>, W3C <<a href="mailto:mike@w3.org">mike@w3.org</a>></dd>
@@ -53,7 +52,7 @@
reports index</a> at http://www.w3.org/TR/.
</em></p>
<p>
- This document is the NaN @@ First Public Working Draft of
+ This document is the 31 January 2010 Editor’s Draft of
<cite>HTML: The Markup Language</cite>.
If you’d like to comment on this document, the preferred
@@ -66,7 +65,7 @@
</p>
<p>
This document
- was produced by
+ is associated with
the <a href="http://www.w3.org/html/wg">W3C HTML Working Group</a>.
part of the <a href="http://www.w3.org/MarkUp/Activity.html">HTML Activity</a>
in the W3C <a href="http://www.w3.org/Interaction/">Interaction Domain</a>.
@@ -109,26 +108,12 @@
</div>
<p>
The existence of this document as
- a Working Draft does not imply endorsement by the
+ an Editor’s Draft does not imply endorsement by the
W3C Membership. This is a draft document and may be updated, replaced
or obsoleted by other documents at any time. It is inappropriate to cite
this document as other than work in progress.
</p>
- <p>
- This document was produced by a group operating under the
- <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5 February
- 2004 W3C Patent Policy</a>. W3C maintains a
- <a href="http://www.w3.org/2004/01/pp-impl/40318/status">public list of
- any patent disclosures</a> made in connection with the deliverables of
- the group; that page also includes instructions for disclosing a patent.
- An individual who has actual knowledge of a patent which the individual
- believes contains
- <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential">Essential
- Claim(s)</a> must disclose the information in accordance with
- <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#sec-Disclosure">section
- 6 of the W3C Patent Policy</a>.
- </p>
-</div>
+ </div>
<div class="toc" id="unexpanded-toc">
<h2>Table of Contents Overview <a class="hash" href="#unexpanded-toc">#</a>
Index: tr.html
===================================================================
RCS file: /sources/public/html5/markup/tr.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- tr.html 30 Jan 2010 04:44:26 -0000 1.25
+++ tr.html 31 Jan 2010 06:11:01 -0000 1.26
@@ -17,7 +17,20 @@
<p>The <a href="tr.html#tr" class="element">tr</a> element represents
a row of cells in a table.</p>
</div>
- <div class="no-number no-toc" id="tr-content-model">
+ <div class="no-number no-toc" id="tr-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#tr-contents">#</a></h2><div class="prose-model">
+ <p>When the parent node is a
+ <a href="thead.html#thead" class="element">thead</a>
+ element, zero or more
+ <a href="th.html#th" class="element">th</a>
+ elements</p>
+ <p>When the parent node is not a
+ <a href="thead.html#thead" class="element">thead</a>
+ element, zero or more
+ <a href="th.html#th" class="element">th</a>
+ or
+ <a href="td.html#td" class="element">td</a>
+ elements</p>
+ </div></div><div class="no-number no-toc" id="tr-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#tr-content-model">#</a></h2><div class="content-models">
<div id="tr-mdls">
Index: input.month.html
===================================================================
RCS file: /sources/public/html5/markup/input.month.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- input.month.html 30 Jan 2010 04:44:23 -0000 1.28
+++ input.month.html 31 Jan 2010 06:10:59 -0000 1.29
@@ -20,7 +20,7 @@
a control for setting the element’s value to a string
representing a month.</p>
</div>
- <div class="no-number no-toc" id="input.month-content-model">
+ <div class="no-number no-toc" id="input.month-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.month-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.month-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#input.month-content-model">#</a></h2><div class="content-models">
<div id="input.month-mdls">
Index: ins.html
===================================================================
RCS file: /sources/public/html5/markup/ins.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ins.html 30 Jan 2010 04:44:23 -0000 1.31
+++ ins.html 31 Jan 2010 06:10:59 -0000 1.32
@@ -18,7 +18,7 @@
represents a range of text that has been inserted (added) to
a document.</p>
</div>
- <div class="no-number no-toc" id="ins-content-model">
+ <div class="no-number no-toc" id="ins-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#ins-contents">#</a></h2><div class="prose-model"><div id="prose-model"><p><a href="terminology.html#transparent">Transparent</a></p></div></div></div><div class="no-number no-toc" id="ins-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#ins-content-model">#</a></h2><div class="content-models">
<dl id="ins-mdls">
Index: meta.name.html
===================================================================
RCS file: /sources/public/html5/markup/meta.name.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- meta.name.html 30 Jan 2010 04:44:24 -0000 1.29
+++ meta.name.html 31 Jan 2010 06:11:00 -0000 1.30
@@ -18,7 +18,7 @@
with a <span class="attribute">name</span> attribute
sets document metadata in the form of name/value pairs.</p>
</div>
- <div class="no-number no-toc" id="meta.name-content-model">
+ <div class="no-number no-toc" id="meta.name-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#meta.name-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="meta.name-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#meta.name-content-model">#</a></h2><div class="content-models">
<div id="meta.name-mdls">
Index: table.html
===================================================================
RCS file: /sources/public/html5/markup/table.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- table.html 30 Jan 2010 04:44:25 -0000 1.29
+++ table.html 31 Jan 2010 06:11:01 -0000 1.30
@@ -18,7 +18,31 @@
represents a table; that is, data with more than one
dimension.</p>
</div>
- <div class="no-number no-toc" id="table-content-model">
+ <div class="no-number no-toc" id="table-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#table-contents">#</a></h2><div class="prose-model">
+ <p>In this order: optionally a
+ <a href="caption.html#caption" class="element">caption</a>
+ element, followed by zero or more
+ <a href="colgroup.html#colgroup" class="element">colgroup</a>
+ elements, optionally followed by a
+ <a href="thead.html#thead" class="element">colgroup</a>
+ element, followed by one of the following:</p>
+ <ul>
+ <li>a
+ <a href="tfoot.html#tfoot" class="element">tfoot</a>
+ element, followed by either zero or more
+ <a href="tbody.html#tbody" class="element">tbody</a>
+ elements or one or more
+ <a href="tr.html#tr" class="element">tr</a>
+ </li>
+ <li>or, either zero or more
+ <a href="tbody.html#tbody" class="element">tbody</a>
+ elements or one or more
+ <a href="tr.html#tr" class="element">tr</a>
+ elements, optionally followed by a
+ <a href="tfoot.html#tfoot" class="element">tfoot</a>
+ element</li>
+ </ul>
+ </div></div><div class="no-number no-toc" id="table-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#table-content-model">#</a></h2><div class="content-models">
<div id="table-mdls">
Index: nav.html
===================================================================
RCS file: /sources/public/html5/markup/nav.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- nav.html 30 Jan 2010 04:44:24 -0000 1.31
+++ nav.html 31 Jan 2010 06:11:00 -0000 1.32
@@ -19,7 +19,9 @@
documents or to parts within the document itself; that is, a
section of navigation links.</p>
</div>
- <div class="no-number no-toc" id="nav-content-model">
+ <div class="no-number no-toc" id="nav-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#nav-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">flow elements</a></p></div></div><div class="no-number no-toc" id="nav-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#nav-content-model">#</a></h2><div class="content-models">
<div id="nav-mdls">
Index: meta.http-equiv.content-type.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.content-type.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- meta.http-equiv.content-type.html 30 Jan 2010 04:44:24 -0000 1.32
+++ meta.http-equiv.content-type.html 31 Jan 2010 06:11:00 -0000 1.33
@@ -19,7 +19,7 @@
value is "<a href="meta.http-equiv.content-type.html#meta.http-equiv.attrs.http-equiv.content-type">content-type</a>" and which has an accompanying <a href="meta.http-equiv.content-type.html#meta.http-equiv.attrs.content.content-type">content</a> attribute and value represents a <a href="syntax.html#encoding-declaration">character encoding
declaration</a>.</p>
</div>
- <div class="no-number no-toc" id="meta.http-equiv.content-type-content-model">
+ <div class="no-number no-toc" id="meta.http-equiv.content-type-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#meta.http-equiv.content-type-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="meta.http-equiv.content-type-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#meta.http-equiv.content-type-content-model">#</a></h2><div class="content-models">
<div id="meta.http-equiv.content-type-mdls">
Index: meta.http-equiv.content-language.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.content-language.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- meta.http-equiv.content-language.html 30 Jan 2010 04:44:24 -0000 1.25
+++ meta.http-equiv.content-language.html 31 Jan 2010 06:11:00 -0000 1.26
@@ -19,7 +19,7 @@
whose value is "<code>content-language</code>" represents a pragma
directive that specifies a document-wide default language.</p>
</div>
- <div class="no-number no-toc" id="meta.http-equiv.content-language-content-model">
+ <div class="no-number no-toc" id="meta.http-equiv.content-language-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#meta.http-equiv.content-language-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="meta.http-equiv.content-language-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#meta.http-equiv.content-language-content-model">#</a></h2><div class="content-models">
<div id="meta.http-equiv.content-language-mdls">
Index: script.html
===================================================================
RCS file: /sources/public/html5/markup/script.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- script.html 30 Jan 2010 04:44:25 -0000 1.36
+++ script.html 31 Jan 2010 06:11:00 -0000 1.37
@@ -17,7 +17,11 @@
<p>The <a href="script.html#script" class="element">script</a> element
dynamic script and data blocks to be included in documents.</p>
</div>
- <div class="no-number no-toc" id="script-content-model">
+ <div class="no-number no-toc" id="script-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#script-contents">#</a></h2><div class="prose-model">
+ <p>
+ <a href="syntax.html#non-replaceable-character-data">Non-replaceable character data</a>
+ </p>
+ </div></div><div class="no-number no-toc" id="script-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#script-content-model">#</a></h2><div class="content-models">
<dl id="script-mdls">
Index: input.range.html
===================================================================
RCS file: /sources/public/html5/markup/input.range.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- input.range.html 30 Jan 2010 04:44:23 -0000 1.28
+++ input.range.html 31 Jan 2010 06:10:59 -0000 1.29
@@ -20,7 +20,7 @@
an imprecise control for setting the element’s value to a
string representing a number.</p>
</div>
- <div class="no-number no-toc" id="input.range-content-model">
+ <div class="no-number no-toc" id="input.range-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.range-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.range-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#input.range-content-model">#</a></h2><div class="content-models">
<div id="input.range-mdls">
Index: time.html
===================================================================
RCS file: /sources/public/html5/markup/time.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- time.html 30 Jan 2010 04:44:25 -0000 1.29
+++ time.html 31 Jan 2010 06:11:01 -0000 1.30
@@ -17,7 +17,9 @@
<p>The <a href="time.html#time" class="element">time</a> element
represents a date and/or time.</p>
</div>
- <div class="no-number no-toc" id="time-content-model">
+ <div class="no-number no-toc" id="time-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#time-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="time-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#time-content-model">#</a></h2><div class="content-models">
<div id="time-mdls">
Index: meta.http-equiv.default-style.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.default-style.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- meta.http-equiv.default-style.html 30 Jan 2010 04:44:24 -0000 1.29
+++ meta.http-equiv.default-style.html 31 Jan 2010 06:11:00 -0000 1.30
@@ -19,7 +19,7 @@
whose value is "<code>default-style</code>" represents a pragma
directive that specifies the document’s preferred stylesheet.</p>
</div>
- <div class="no-number no-toc" id="meta.http-equiv.default-style-content-model">
+ <div class="no-number no-toc" id="meta.http-equiv.default-style-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#meta.http-equiv.default-style-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="meta.http-equiv.default-style-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#meta.http-equiv.default-style-content-model">#</a></h2><div class="content-models">
<div id="meta.http-equiv.default-style-mdls">
Index: keygen.html
===================================================================
RCS file: /sources/public/html5/markup/keygen.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- keygen.html 30 Jan 2010 04:44:23 -0000 1.29
+++ keygen.html 31 Jan 2010 06:10:59 -0000 1.30
@@ -18,7 +18,7 @@
represents a control for generating a public-private key
pair and for submitting the public key from that key pair.</p>
</div>
- <div class="no-number no-toc" id="keygen-content-model">
+ <div class="no-number no-toc" id="keygen-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#keygen-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="keygen-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#keygen-content-model">#</a></h2><div class="content-models">
<div id="keygen-mdls">
Index: progress.html
===================================================================
RCS file: /sources/public/html5/markup/progress.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- progress.html 30 Jan 2010 04:44:24 -0000 1.29
+++ progress.html 31 Jan 2010 06:11:00 -0000 1.30
@@ -17,7 +17,9 @@
<p>The <a href="progress.html#progress" class="element">progress</a>
element represents the completion progress of a task.</p>
</div>
- <div class="no-number no-toc" id="progress-content-model">
+ <div class="no-number no-toc" id="progress-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#progress-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="progress-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#progress-content-model">#</a></h2><div class="content-models">
<div id="progress-mdls">
Index: textarea.html
===================================================================
RCS file: /sources/public/html5/markup/textarea.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- textarea.html 30 Jan 2010 04:44:25 -0000 1.31
+++ textarea.html 31 Jan 2010 06:11:01 -0000 1.32
@@ -18,7 +18,11 @@
element represents a multi-line plain-text edit control for
the element’s raw value.</p>
</div>
- <div class="no-number no-toc" id="textarea-content-model">
+ <div class="no-number no-toc" id="textarea-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#textarea-contents">#</a></h2><div class="prose-model">
+ <p>
+ <a href="syntax.html#replaceable-character-data">Replaceable character data</a>
+ </p>
+ </div></div><div class="no-number no-toc" id="textarea-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#textarea-content-model">#</a></h2><div class="content-models">
<div id="textarea-mdls">
Index: meter.html
===================================================================
RCS file: /sources/public/html5/markup/meter.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- meter.html 30 Jan 2010 04:44:24 -0000 1.30
+++ meter.html 31 Jan 2010 06:11:00 -0000 1.31
@@ -18,7 +18,9 @@
represents a scalar gauge providing a measurement within a
known range, or a fractional value.</p>
</div>
- <div class="no-number no-toc" id="meter-content-model">
+ <div class="no-number no-toc" id="meter-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#meter-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="meter-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#meter-content-model">#</a></h2><div class="content-models">
<div id="meter-mdls">
Index: section.html
===================================================================
RCS file: /sources/public/html5/markup/section.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- section.html 30 Jan 2010 04:44:25 -0000 1.33
+++ section.html 31 Jan 2010 06:11:00 -0000 1.34
@@ -18,7 +18,9 @@
represents a section of a document, typically with a title or
heading.</p>
</div>
- <div class="no-number no-toc" id="section-content-model">
+ <div class="no-number no-toc" id="section-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#section-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">flow elements</a></p></div></div><div class="no-number no-toc" id="section-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#section-content-model">#</a></h2><div class="content-models">
<div id="section-mdls">
Index: link.html
===================================================================
RCS file: /sources/public/html5/markup/link.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- link.html 30 Jan 2010 04:44:24 -0000 1.30
+++ link.html 31 Jan 2010 06:10:59 -0000 1.31
@@ -19,7 +19,7 @@
element represents metadata that expresses inter-document
relationships.</p>
</div>
- <div class="no-number no-toc" id="link-content-model">
+ <div class="no-number no-toc" id="link-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#link-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="link-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#link-content-model">#</a></h2><div class="content-models">
<div id="link-mdls">
Index: meta.http-equiv.refresh.html
===================================================================
RCS file: /sources/public/html5/markup/meta.http-equiv.refresh.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- meta.http-equiv.refresh.html 30 Jan 2010 04:44:24 -0000 1.27
+++ meta.http-equiv.refresh.html 31 Jan 2010 06:11:00 -0000 1.28
@@ -23,7 +23,7 @@
place of the current page, and the URL for the replacement
page.</p>
</div>
- <div class="no-number no-toc" id="meta.http-equiv.refresh-content-model">
+ <div class="no-number no-toc" id="meta.http-equiv.refresh-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#meta.http-equiv.refresh-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="meta.http-equiv.refresh-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#meta.http-equiv.refresh-content-model">#</a></h2><div class="content-models">
<div id="meta.http-equiv.refresh-mdls">
Index: input.text.html
===================================================================
RCS file: /sources/public/html5/markup/input.text.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- input.text.html 30 Jan 2010 04:44:23 -0000 1.29
+++ input.text.html 31 Jan 2010 06:10:59 -0000 1.30
@@ -19,7 +19,7 @@
value is "<code>text</code>" represents
a one-line plain text edit control for the <a href="input.html#input" class="element">input</a> element’s <a href="input.text.html#input.text.attrs.value">value</a>.</p>
</div>
- <div class="no-number no-toc" id="input.text-content-model">
+ <div class="no-number no-toc" id="input.text-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.text-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.text-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#input.text-content-model">#</a></h2><div class="content-models">
<div id="input.text-mdls">
Index: samp.html
===================================================================
RCS file: /sources/public/html5/markup/samp.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- samp.html 30 Jan 2010 04:44:24 -0000 1.27
+++ samp.html 31 Jan 2010 06:11:00 -0000 1.28
@@ -18,7 +18,9 @@
represents (sample) output from a program or computing
system.</p>
</div>
- <div class="no-number no-toc" id="samp-content-model">
+ <div class="no-number no-toc" id="samp-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#samp-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="samp-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#samp-content-model">#</a></h2><div class="content-models">
<div id="samp-mdls">
Index: object.html
===================================================================
RCS file: /sources/public/html5/markup/object.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- object.html 30 Jan 2010 04:44:24 -0000 1.35
+++ object.html 31 Jan 2010 06:11:00 -0000 1.36
@@ -17,7 +17,13 @@
<p>The <a href="object.html#object" class="element">object</a> element
represents external content.</p>
</div>
- <div class="no-number no-toc" id="object-content-model">
+ <div class="no-number no-toc" id="object-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#object-contents">#</a></h2><div class="prose-model">
+ <p>Zero or more
+ <a href="param.html#param" class="element">param</a>
+ elements, then,
+ <a href="terminology.html#transparent">transparent</a>
+ </p>
+ </div></div><div class="no-number no-toc" id="object-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#object-content-model">#</a></h2><div class="content-models">
<dl id="object-mdls">
Index: input.tel.html
===================================================================
RCS file: /sources/public/html5/markup/input.tel.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- input.tel.html 30 Jan 2010 04:44:23 -0000 1.27
+++ input.tel.html 31 Jan 2010 06:10:59 -0000 1.28
@@ -19,7 +19,7 @@
value is "<code>tel</code>" represents a one-line plain-text
edit control for entering a telephone number.</p>
</div>
- <div class="no-number no-toc" id="input.tel-content-model">
+ <div class="no-number no-toc" id="input.tel-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.tel-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.tel-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#input.tel-content-model">#</a></h2><div class="content-models">
<div id="input.tel-mdls">
Index: input.number.html
===================================================================
RCS file: /sources/public/html5/markup/input.number.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- input.number.html 30 Jan 2010 04:44:23 -0000 1.28
+++ input.number.html 31 Jan 2010 06:10:59 -0000 1.29
@@ -20,7 +20,7 @@
a precise control for setting the element’s value to a
string representing a number.</p>
</div>
- <div class="no-number no-toc" id="input.number-content-model">
+ <div class="no-number no-toc" id="input.number-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.number-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.number-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#input.number-content-model">#</a></h2><div class="content-models">
<div id="input.number-mdls">
Index: input.password.html
===================================================================
RCS file: /sources/public/html5/markup/input.password.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- input.password.html 30 Jan 2010 04:44:23 -0000 1.29
+++ input.password.html 31 Jan 2010 06:10:59 -0000 1.30
@@ -19,7 +19,7 @@
value is "<code>password</code>" represents
a one-line plain-text edit control for entering a password.</p>
</div>
- <div class="no-number no-toc" id="input.password-content-model">
+ <div class="no-number no-toc" id="input.password-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.password-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.password-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#input.password-content-model">#</a></h2><div class="content-models">
<div id="input.password-mdls">
Index: ul.html
===================================================================
RCS file: /sources/public/html5/markup/ul.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- ul.html 30 Jan 2010 04:44:26 -0000 1.25
+++ ul.html 31 Jan 2010 06:11:01 -0000 1.26
@@ -19,7 +19,11 @@
the order of the items would not change the meaning of
list.</p>
</div>
- <div class="no-number no-toc" id="ul-content-model">
+ <div class="no-number no-toc" id="ul-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#ul-contents">#</a></h2><div class="prose-model">
+ <p>Zero or more
+ <a href="li.html#li" class="element">li</a>
+ elements.</p>
+ </div></div><div class="no-number no-toc" id="ul-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#ul-content-model">#</a></h2><div class="content-models">
<div id="ul-mdls">
Index: input.time.html
===================================================================
RCS file: /sources/public/html5/markup/input.time.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- input.time.html 30 Jan 2010 04:44:23 -0000 1.28
+++ input.time.html 31 Jan 2010 06:10:59 -0000 1.29
@@ -20,7 +20,7 @@
a control for setting the element’s value to a string
representing a time (with no timezone information).</p>
</div>
- <div class="no-number no-toc" id="input.time-content-model">
+ <div class="no-number no-toc" id="input.time-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.time-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.time-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#input.time-content-model">#</a></h2><div class="content-models">
<div id="input.time-mdls">
Index: strong.html
===================================================================
RCS file: /sources/public/html5/markup/strong.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- strong.html 30 Jan 2010 04:44:25 -0000 1.27
+++ strong.html 31 Jan 2010 06:11:01 -0000 1.28
@@ -17,7 +17,9 @@
<p>The <a href="strong.html#strong" class="element">strong</a> element
represents a span of text with strong importance.</p>
</div>
- <div class="no-number no-toc" id="strong-content-model">
+ <div class="no-number no-toc" id="strong-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#strong-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="strong-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#strong-content-model">#</a></h2><div class="content-models">
<div id="strong-mdls">
Index: q.html
===================================================================
RCS file: /sources/public/html5/markup/q.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- q.html 30 Jan 2010 04:44:24 -0000 1.28
+++ q.html 31 Jan 2010 06:11:00 -0000 1.29
@@ -17,7 +17,9 @@
<p>The <a href="q.html#q" class="element">q</a> element represents
phrasing content quoted from another source.</p>
</div>
- <div class="no-number no-toc" id="q-content-model">
+ <div class="no-number no-toc" id="q-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#q-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="q-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#q-content-model">#</a></h2><div class="content-models">
<div id="q-mdls">
Index: li.html
===================================================================
RCS file: /sources/public/html5/markup/li.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- li.html 30 Jan 2010 04:44:24 -0000 1.31
+++ li.html 31 Jan 2010 06:10:59 -0000 1.32
@@ -17,7 +17,9 @@
<p>The <a href="li.html#li" class="element">li</a> element represents
a list item.</p>
</div>
- <div class="no-number no-toc" id="li-content-model">
+ <div class="no-number no-toc" id="li-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#li-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">flow elements</a></p></div></div><div class="no-number no-toc" id="li-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#li-content-model">#</a></h2><div class="content-models">
<dl id="li-mdls">
Index: style.html
===================================================================
RCS file: /sources/public/html5/markup/style.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- style.html 30 Jan 2010 04:44:25 -0000 1.32
+++ style.html 31 Jan 2010 06:11:01 -0000 1.33
@@ -19,7 +19,11 @@
element
allows style information to be embedded in documents.</p>
</div>
- <div class="no-number no-toc" id="style-content-model">
+ <div class="no-number no-toc" id="style-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#style-contents">#</a></h2><div class="prose-model">
+ <p>
+ <a href="syntax.html#non-replaceable-character-data">Non-replaceable character data</a>
+ </p>
+ </div></div><div class="no-number no-toc" id="style-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#style-content-model">#</a></h2><div class="content-models">
<dl id="style-mdls">
Index: menu.html
===================================================================
RCS file: /sources/public/html5/markup/menu.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- menu.html 30 Jan 2010 04:44:24 -0000 1.33
+++ menu.html 31 Jan 2010 06:11:00 -0000 1.34
@@ -17,7 +17,17 @@
<p>The <a href="menu.html#menu" class="element">menu</a> element
represents a list of commands.</p>
</div>
- <div class="no-number no-toc" id="menu-content-model">
+ <div class="no-number no-toc" id="menu-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#menu-contents">#</a></h2><div class="prose-model">
+ <p>Exactly one of the following two choices:</p>
+ <ul>
+ <li>One or more <a href="li.html#li" class="element">li</a> elements</li>
+ <li>Or,
+ <a href="common-models.html#common.elem.flow">flow elements</a>
+ and
+ <a href="syntax.html#normal-character-data">normal character data</a>
+ </li>
+ </ul>
+ </div></div><div class="no-number no-toc" id="menu-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#menu-content-model">#</a></h2><div class="content-models">
<div id="menu-mdls">
Index: input.image.html
===================================================================
RCS file: /sources/public/html5/markup/input.image.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- input.image.html 30 Jan 2010 04:44:23 -0000 1.29
+++ input.image.html 31 Jan 2010 06:10:59 -0000 1.30
@@ -22,7 +22,7 @@
form, or alternatively a button from which the user can submit
the form.</p>
</div>
- <div class="no-number no-toc" id="input.image-content-model">
+ <div class="no-number no-toc" id="input.image-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.image-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.image-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#input.image-content-model">#</a></h2><div class="content-models">
<div id="input.image-mdls">
Index: p.html
===================================================================
RCS file: /sources/public/html5/markup/p.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- p.html 30 Jan 2010 04:44:24 -0000 1.31
+++ p.html 31 Jan 2010 06:11:00 -0000 1.32
@@ -17,7 +17,9 @@
<p>The <a href="p.html#p" class="element">p</a> element represents a
paragraph.</p>
</div>
- <div class="no-number no-toc" id="p-content-model">
+ <div class="no-number no-toc" id="p-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#p-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="p-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#p-content-model">#</a></h2><div class="content-models">
<div id="p-mdls">
Index: map.html
===================================================================
RCS file: /sources/public/html5/markup/map.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- map.html 30 Jan 2010 04:44:24 -0000 1.31
+++ map.html 31 Jan 2010 06:11:00 -0000 1.32
@@ -18,7 +18,7 @@
conjunction with any <a href="area.html#area" class="element">area</a>
element descendants, defines an image map.</p>
</div>
- <div class="no-number no-toc" id="map-content-model">
+ <div class="no-number no-toc" id="map-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#map-contents">#</a></h2><div class="prose-model"><div id="prose-model"><p><a href="terminology.html#transparent">Transparent</a></p></div></div></div><div class="no-number no-toc" id="map-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#map-content-model">#</a></h2><div class="content-models">
<dl id="map-mdls">
Index: input.radio.html
===================================================================
RCS file: /sources/public/html5/markup/input.radio.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- input.radio.html 30 Jan 2010 04:44:23 -0000 1.29
+++ input.radio.html 31 Jan 2010 06:10:59 -0000 1.30
@@ -20,7 +20,7 @@
a selection of one item from a list of items (a radio
button).</p>
</div>
- <div class="no-number no-toc" id="input.radio-content-model">
+ <div class="no-number no-toc" id="input.radio-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.radio-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.radio-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#input.radio-content-model">#</a></h2><div class="content-models">
<div id="input.radio-mdls">
Index: param.html
===================================================================
RCS file: /sources/public/html5/markup/param.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- param.html 30 Jan 2010 04:44:24 -0000 1.31
+++ param.html 31 Jan 2010 06:11:00 -0000 1.32
@@ -17,7 +17,7 @@
<p>The <a href="param.html#param" class="element">param</a> element
defines parameters for plugins invoked by <a href="object.html#object" class="element">object</a> elements.</p>
</div>
- <div class="no-number no-toc" id="param-content-model">
+ <div class="no-number no-toc" id="param-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#param-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="param-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#param-content-model">#</a></h2><div class="content-models">
<div id="param-mdls">
Index: span.html
===================================================================
RCS file: /sources/public/html5/markup/span.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- span.html 30 Jan 2010 04:44:25 -0000 1.27
+++ span.html 31 Jan 2010 06:11:01 -0000 1.28
@@ -18,7 +18,9 @@
generic wrapper for phrasing content that by itself does not
represent anything.</p>
</div>
- <div class="no-number no-toc" id="span-content-model">
+ <div class="no-number no-toc" id="span-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#span-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="span-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#span-content-model">#</a></h2><div class="content-models">
<div id="span-mdls">
Index: input.reset.html
===================================================================
RCS file: /sources/public/html5/markup/input.reset.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- input.reset.html 30 Jan 2010 04:44:23 -0000 1.29
+++ input.reset.html 31 Jan 2010 06:10:59 -0000 1.30
@@ -19,7 +19,7 @@
value is "<code>reset</code>" represents a button for
resetting a form.</p>
</div>
- <div class="no-number no-toc" id="input.reset-content-model">
+ <div class="no-number no-toc" id="input.reset-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.reset-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.reset-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#input.reset-content-model">#</a></h2><div class="content-models">
<div id="input.reset-mdls">
Index: option.html
===================================================================
RCS file: /sources/public/html5/markup/option.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- option.html 30 Jan 2010 04:44:24 -0000 1.32
+++ option.html 31 Jan 2010 06:11:00 -0000 1.33
@@ -19,7 +19,11 @@
labelled set of options grouped together in an <a href="optgroup.html#optgroup" class="element">optgroup</a>, or an option
among the list of suggestions in a <a href="datalist.html#datalist" class="element">datalist</a>.</p>
</div>
- <div class="no-number no-toc" id="option-content-model">
+ <div class="no-number no-toc" id="option-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#option-contents">#</a></h2><div class="prose-model">
+ <p>
+ <a href="syntax.html#normal-character-data">Normal character data</a>
+ </p>
+ </div></div><div class="no-number no-toc" id="option-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#option-content-model">#</a></h2><div class="content-models">
<div id="option-mdls">
Index: label.html
===================================================================
RCS file: /sources/public/html5/markup/label.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- label.html 30 Jan 2010 04:44:23 -0000 1.32
+++ label.html 31 Jan 2010 06:10:59 -0000 1.33
@@ -17,7 +17,9 @@
<p>The <a href="label.html#label" class="element">label</a> element
represents a caption for a form control.</p>
</div>
- <div class="no-number no-toc" id="label-content-model">
+ <div class="no-number no-toc" id="label-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#label-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="label-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#label-content-model">#</a></h2><div class="content-models">
<div id="label-mdls">
Index: select.html
===================================================================
RCS file: /sources/public/html5/markup/select.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- select.html 30 Jan 2010 04:44:25 -0000 1.29
+++ select.html 31 Jan 2010 06:11:00 -0000 1.30
@@ -18,7 +18,13 @@
represents a control for selecting among a list of
options.</p>
</div>
- <div class="no-number no-toc" id="select-content-model">
+ <div class="no-number no-toc" id="select-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#select-contents">#</a></h2><div class="prose-model">
+ <p>Zero or more
+ <a href="option.html#option" class="element">option</a>
+ or
+ <a href="optgroup.html#optgroup" class="element">optgroup</a>
+ elements.</p>
+ </div></div><div class="no-number no-toc" id="select-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#select-content-model">#</a></h2><div class="content-models">
<div id="select-mdls">
Index: noscript.html
===================================================================
RCS file: /sources/public/html5/markup/noscript.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- noscript.html 30 Jan 2010 04:44:24 -0000 1.31
+++ noscript.html 31 Jan 2010 06:11:00 -0000 1.32
@@ -19,7 +19,15 @@
that don’t support scripting, by affecting how the document is
parsed.</p>
</div>
- <div class="no-number no-toc" id="noscript-content-model">
+ <div class="no-number no-toc" id="noscript-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#noscript-contents">#</a></h2><div class="prose-model">
+ <p>In a
+ <a href="head.html#head" class="element">head</a>
+ element</p>
+ <p>
+ <a href="syntax.html#normal-character-data">Normal character data</a>
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a>
+ </p>
+ </div></div><div class="no-number no-toc" id="noscript-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#noscript-content-model">#</a></h2><div class="content-models">
<dl id="noscript-mdls">
@@ -53,8 +61,8 @@
<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>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>.</li>
<li><span>
The “noscript” element must not contain any nested
Index: td.html
===================================================================
RCS file: /sources/public/html5/markup/td.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- td.html 30 Jan 2010 04:44:25 -0000 1.32
+++ td.html 31 Jan 2010 06:11:01 -0000 1.33
@@ -17,7 +17,9 @@
<p>The <a href="td.html#td" class="element">td</a> element represents
a data cell in a table.</p>
</div>
- <div class="no-number no-toc" id="td-content-model">
+ <div class="no-number no-toc" id="td-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#td-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">flow elements</a></p></div></div><div class="no-number no-toc" id="td-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#td-content-model">#</a></h2><div class="content-models">
<div id="td-mdls">
Index: input.hidden.html
===================================================================
RCS file: /sources/public/html5/markup/input.hidden.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- input.hidden.html 30 Jan 2010 04:44:23 -0000 1.29
+++ input.hidden.html 31 Jan 2010 06:10:59 -0000 1.30
@@ -20,7 +20,7 @@
represents a value that is not intended to be examined or
manipulated by the user.</p>
</div>
- <div class="no-number no-toc" id="input.hidden-content-model">
+ <div class="no-number no-toc" id="input.hidden-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.hidden-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.hidden-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#input.hidden-content-model">#</a></h2><div class="content-models">
<div id="input.hidden-mdls">
Index: kbd.html
===================================================================
RCS file: /sources/public/html5/markup/kbd.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- kbd.html 30 Jan 2010 04:44:23 -0000 1.28
+++ kbd.html 31 Jan 2010 06:10:59 -0000 1.29
@@ -17,7 +17,9 @@
<p>The <a href="kbd.html#kbd" class="element">kbd</a> element
represents user input.</p>
</div>
- <div class="no-number no-toc" id="kbd-content-model">
+ <div class="no-number no-toc" id="kbd-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#kbd-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="kbd-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#kbd-content-model">#</a></h2><div class="content-models">
<div id="kbd-mdls">
Index: input.search.html
===================================================================
RCS file: /sources/public/html5/markup/input.search.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- input.search.html 30 Jan 2010 04:44:23 -0000 1.30
+++ input.search.html 31 Jan 2010 06:10:59 -0000 1.31
@@ -20,7 +20,7 @@
a one-line plain-text edit control for entering one or more
search terms.</p>
</div>
- <div class="no-number no-toc" id="input.search-content-model">
+ <div class="no-number no-toc" id="input.search-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.search-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.search-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#input.search-content-model">#</a></h2><div class="content-models">
<div id="input.search-mdls">
Index: tfoot.html
===================================================================
RCS file: /sources/public/html5/markup/tfoot.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- tfoot.html 30 Jan 2010 04:44:25 -0000 1.25
+++ tfoot.html 31 Jan 2010 06:11:01 -0000 1.26
@@ -18,7 +18,11 @@
represents the block of rows that consist of the column
summaries (footers) for its parent <a href="table.html#table" class="element">table</a> element.</p>
</div>
- <div class="no-number no-toc" id="tfoot-content-model">
+ <div class="no-number no-toc" id="tfoot-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#tfoot-contents">#</a></h2><div class="prose-model">
+ <p>Zero or more
+ <a href="tr.html#tr" class="element">tr</a>
+ elements</p>
+ </div></div><div class="no-number no-toc" id="tfoot-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#tfoot-content-model">#</a></h2><div class="content-models">
<div id="tfoot-mdls">
Index: rt.html
===================================================================
RCS file: /sources/public/html5/markup/rt.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- rt.html 30 Jan 2010 04:44:24 -0000 1.27
+++ rt.html 31 Jan 2010 06:11:00 -0000 1.28
@@ -17,7 +17,9 @@
<p>The <a href="rt.html#rt" class="element">rt</a> element marks the
ruby text component of a ruby annotation.</p>
</div>
- <div class="no-number no-toc" id="rt-content-model">
+ <div class="no-number no-toc" id="rt-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#rt-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="rt-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#rt-content-model">#</a></h2><div class="content-models">
<div id="rt-mdls">
Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- spec.html 30 Jan 2010 05:49:59 -0000 1.141
+++ spec.html 31 Jan 2010 06:11:01 -0000 1.142
@@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<title>HTML: The Markup Language</title>
<link rel="stylesheet" href="style.css" type="text/css">
-<script src="js/dfn.js"></script><link rel="stylesheet" href="http://www.w3.org/StyleSheets/TR/W3C-WD" type="text/css">
+<script src="js/dfn.js"></script><link rel="stylesheet" href="W3C-ED.css" type="text/css">
</head>
<body>
<div class="head">
@@ -12,13 +12,12 @@
<h1>HTML: The Markup Language</h1>
<h2>
[...1237 lines suppressed...]
+ <div class="no-number no-toc" id="video-contents">
+<h2 class="element-subhead">Permitted content <a class="hash" href="#video-contents">#</a>
+</h2>
+<div class="prose-model">
+ <p>If the element does not have a
+ <a href="#video.attrs.src" class="attribute">src</a>
+ attribute, one or more
+ <a href="#source" class="element">source</a>
+ elements, then,
+ <a href="#transparent">transparent</a>.</p>
+ <p>If the element has a
+ <a href="#video.attrs.src" class="attribute">src</a>
+ attribute,
+ <a href="#transparent">transparent</a>.</p>
+ </div>
+</div>
+<div class="no-number no-toc" id="video-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#video-content-model">#</a>
</h2>
<div class="content-models">
Index: optgroup.html
===================================================================
RCS file: /sources/public/html5/markup/optgroup.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- optgroup.html 30 Jan 2010 04:44:24 -0000 1.26
+++ optgroup.html 31 Jan 2010 06:11:00 -0000 1.27
@@ -17,7 +17,11 @@
<p>The <a href="optgroup.html#optgroup" class="element">optgroup</a>
element represents a group of <a href="option.html#option" class="element">option</a> elements with a common label.</p>
</div>
- <div class="no-number no-toc" id="optgroup-content-model">
+ <div class="no-number no-toc" id="optgroup-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#optgroup-contents">#</a></h2><div class="prose-model">
+ <p>Zero or more
+ <a href="option.html#option" class="element">option</a>
+ elements</p>
+ </div></div><div class="no-number no-toc" id="optgroup-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#optgroup-content-model">#</a></h2><div class="content-models">
<div id="optgroup-mdls">
Index: input.week.html
===================================================================
RCS file: /sources/public/html5/markup/input.week.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- input.week.html 30 Jan 2010 04:44:23 -0000 1.28
+++ input.week.html 31 Jan 2010 06:10:59 -0000 1.29
@@ -20,7 +20,7 @@
a control for setting the element’s value to a string
representing a week.</p>
</div>
- <div class="no-number no-toc" id="input.week-content-model">
+ <div class="no-number no-toc" id="input.week-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.week-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.week-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#input.week-content-model">#</a></h2><div class="content-models">
<div id="input.week-mdls">
Index: small.html
===================================================================
RCS file: /sources/public/html5/markup/small.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- small.html 30 Jan 2010 04:44:25 -0000 1.27
+++ small.html 31 Jan 2010 06:11:00 -0000 1.28
@@ -18,7 +18,9 @@
represents so-called “small print” such as legal disclaimers
and caveats.</p>
</div>
- <div class="no-number no-toc" id="small-content-model">
+ <div class="no-number no-toc" id="small-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#small-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="small-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#small-content-model">#</a></h2><div class="content-models">
<div id="small-mdls">
Index: ruby.html
===================================================================
RCS file: /sources/public/html5/markup/ruby.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- ruby.html 30 Jan 2010 04:44:24 -0000 1.27
+++ ruby.html 31 Jan 2010 06:11:00 -0000 1.28
@@ -17,7 +17,25 @@
<p>The <a href="ruby.html#ruby" class="element">ruby</a> element allows
spans of phrasing content to be marked with ruby annotations.</p>
</div>
- <div class="no-number no-toc" id="ruby-content-model">
+ <div class="no-number no-toc" id="ruby-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#ruby-contents">#</a></h2><div class="prose-model">
+ <p>One or more groups of the following:
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a>
+ and
+ <a href="syntax.html#normal-character-data">normal character data</a>
+ followed by either:</p>
+ <ul>
+ <li>a single
+ <a href="rt.html#rt" class="element">rt</a>
+ element</li>
+ <li>or, an
+ <a href="rp.html#rp" class="element">rp</a>
+ element, followed by an
+ <a href="rt.html#rt" class="element">rt</a>
+ element, followed by another
+ <a href="rp.html#rp" class="element">rp</a>
+ </li>
+ </ul>
+ </div></div><div class="no-number no-toc" id="ruby-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#ruby-content-model">#</a></h2><div class="content-models">
<div id="ruby-mdls">
Index: ol.html
===================================================================
RCS file: /sources/public/html5/markup/ol.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- ol.html 30 Jan 2010 04:44:24 -0000 1.27
+++ ol.html 31 Jan 2010 06:11:00 -0000 1.28
@@ -19,7 +19,11 @@
items are intentionally ordered, such that changing the order
would change the meaning of the list.</p>
</div>
- <div class="no-number no-toc" id="ol-content-model">
+ <div class="no-number no-toc" id="ol-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#ol-contents">#</a></h2><div class="prose-model">
+ <p>Zero or more
+ <a href="li.html#li" class="element">li</a>
+ elements</p>
+ </div></div><div class="no-number no-toc" id="ol-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#ol-content-model">#</a></h2><div class="content-models">
<div id="ol-mdls">
Index: thead.html
===================================================================
RCS file: /sources/public/html5/markup/thead.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- thead.html 30 Jan 2010 04:44:25 -0000 1.25
+++ thead.html 31 Jan 2010 06:11:01 -0000 1.26
@@ -20,7 +20,11 @@
<a href="table.html#table" class="element">table</a>
element.</p>
</div>
- <div class="no-number no-toc" id="thead-content-model">
+ <div class="no-number no-toc" id="thead-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#thead-contents">#</a></h2><div class="prose-model">
+ <p>Zero or more
+ <a href="tr.html#tr" class="element">tr</a>
+ elements</p>
+ </div></div><div class="no-number no-toc" id="thead-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#thead-content-model">#</a></h2><div class="content-models">
<div id="thead-mdls">
Index: tbody.html
===================================================================
RCS file: /sources/public/html5/markup/tbody.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- tbody.html 30 Jan 2010 04:44:25 -0000 1.25
+++ tbody.html 31 Jan 2010 06:11:01 -0000 1.26
@@ -19,7 +19,11 @@
its parent <a href="table.html#table" class="element">table</a>
element.</p>
</div>
- <div class="no-number no-toc" id="tbody-content-model">
+ <div class="no-number no-toc" id="tbody-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#tbody-contents">#</a></h2><div class="prose-model">
+ <p>Zero or more
+ <a href="tr.html#tr" class="element">tr</a>
+ elements</p>
+ </div></div><div class="no-number no-toc" id="tbody-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#tbody-content-model">#</a></h2><div class="content-models">
<div id="tbody-mdls">
Index: video.html
===================================================================
RCS file: /sources/public/html5/markup/video.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- video.html 30 Jan 2010 04:44:26 -0000 1.32
+++ video.html 31 Jan 2010 06:11:01 -0000 1.33
@@ -17,7 +17,18 @@
<p>The <a href="video.html#video" class="element">video</a> element
represents a video or movie.</p>
</div>
- <div class="no-number no-toc" id="video-content-model">
+ <div class="no-number no-toc" id="video-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#video-contents">#</a></h2><div class="prose-model">
+ <p>If the element does not have a
+ <a href="video.html#video.attrs.src" class="attribute">src</a>
+ attribute, one or more
+ <a href="source.html#source" class="element">source</a>
+ elements, then,
+ <a href="terminology.html#transparent">transparent</a>.</p>
+ <p>If the element has a
+ <a href="video.html#video.attrs.src" class="attribute">src</a>
+ attribute,
+ <a href="terminology.html#transparent">transparent</a>.</p>
+ </div></div><div class="no-number no-toc" id="video-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#video-content-model">#</a></h2><div class="content-models">
<dl id="video-mdls">
Index: source.html
===================================================================
RCS file: /sources/public/html5/markup/source.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- source.html 30 Jan 2010 04:44:25 -0000 1.34
+++ source.html 31 Jan 2010 06:11:01 -0000 1.35
@@ -24,7 +24,7 @@
<a href="video.html#video" class="element">video</a>
elements.</p>
</div>
- <div class="no-number no-toc" id="source-content-model">
+ <div class="no-number no-toc" id="source-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#source-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="source-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#source-content-model">#</a></h2><div class="content-models">
<div id="source-mdls">
Index: meta.charset.html
===================================================================
RCS file: /sources/public/html5/markup/meta.charset.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- meta.charset.html 30 Jan 2010 04:44:24 -0000 1.32
+++ meta.charset.html 31 Jan 2010 06:11:00 -0000 1.33
@@ -19,7 +19,7 @@
attribute represents a <a href="syntax.html#encoding-declaration">character encoding
declaration</a>.</p>
</div>
- <div class="no-number no-toc" id="meta.charset-content-model">
+ <div class="no-number no-toc" id="meta.charset-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#meta.charset-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="meta.charset-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#meta.charset-content-model">#</a></h2><div class="content-models">
<div id="meta.charset-mdls">
Index: output.html
===================================================================
RCS file: /sources/public/html5/markup/output.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- output.html 30 Jan 2010 04:44:24 -0000 1.30
+++ output.html 31 Jan 2010 06:11:00 -0000 1.31
@@ -17,7 +17,9 @@
<p>The <a href="output.html#output" class="element">output</a> element
represents the result of a calculation.</p>
</div>
- <div class="no-number no-toc" id="output-content-model">
+ <div class="no-number no-toc" id="output-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#output-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="output-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#output-content-model">#</a></h2><div class="content-models">
<div id="output-mdls">
Index: input.submit.html
===================================================================
RCS file: /sources/public/html5/markup/input.submit.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- input.submit.html 30 Jan 2010 04:44:23 -0000 1.29
+++ input.submit.html 31 Jan 2010 06:10:59 -0000 1.30
@@ -19,7 +19,7 @@
value is "<code>submit</code>" represents a button for
submitting a form.</p>
</div>
- <div class="no-number no-toc" id="input.submit-content-model">
+ <div class="no-number no-toc" id="input.submit-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.submit-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.submit-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#input.submit-content-model">#</a></h2><div class="content-models">
<div id="input.submit-mdls">
Index: var.html
===================================================================
RCS file: /sources/public/html5/markup/var.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- var.html 30 Jan 2010 04:44:26 -0000 1.27
+++ var.html 31 Jan 2010 06:11:01 -0000 1.28
@@ -19,7 +19,9 @@
programming context, or placeholder text that the reader is
meant to mentally replace with some other literal value.</p>
</div>
- <div class="no-number no-toc" id="var-content-model">
+ <div class="no-number no-toc" id="var-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#var-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="var-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#var-content-model">#</a></h2><div class="content-models">
<div id="var-mdls">
Index: sub.html
===================================================================
RCS file: /sources/public/html5/markup/sub.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- sub.html 30 Jan 2010 04:44:25 -0000 1.27
+++ sub.html 31 Jan 2010 06:11:01 -0000 1.28
@@ -17,7 +17,9 @@
<p>The <a href="sub.html#sub" class="element">sub</a> element
represents subscript.</p>
</div>
- <div class="no-number no-toc" id="sub-content-model">
+ <div class="no-number no-toc" id="sub-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#sub-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="sub-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#sub-content-model">#</a></h2><div class="content-models">
<div id="sub-mdls">
Index: title.html
===================================================================
RCS file: /sources/public/html5/markup/title.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- title.html 30 Jan 2010 04:44:25 -0000 1.26
+++ title.html 31 Jan 2010 06:11:01 -0000 1.27
@@ -17,7 +17,11 @@
<p>The <a href="title.html#title" class="element">title</a> element
represents the document’s title or name.</p>
</div>
- <div class="no-number no-toc" id="title-content-model">
+ <div class="no-number no-toc" id="title-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#title-contents">#</a></h2><div class="prose-model">
+ <p>
+ <a href="syntax.html#replaceable-character-data">Replaceable character data</a>
+ </p>
+ </div></div><div class="no-number no-toc" id="title-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#title-content-model">#</a></h2><div class="content-models">
<div id="title-mdls">
Index: pre.html
===================================================================
RCS file: /sources/public/html5/markup/pre.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- pre.html 30 Jan 2010 04:44:24 -0000 1.29
+++ pre.html 31 Jan 2010 06:11:00 -0000 1.30
@@ -19,7 +19,9 @@
represented by typographic conventions rather than by
elements.</p>
</div>
- <div class="no-number no-toc" id="pre-content-model">
+ <div class="no-number no-toc" id="pre-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#pre-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="pre-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#pre-content-model">#</a></h2><div class="content-models">
<div id="pre-mdls">
Index: rp.html
===================================================================
RCS file: /sources/public/html5/markup/rp.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- rp.html 30 Jan 2010 04:44:24 -0000 1.27
+++ rp.html 31 Jan 2010 06:11:00 -0000 1.28
@@ -19,7 +19,9 @@
ruby annotation, to be shown by UAs that don’t support
ruby annotations.</p>
</div>
- <div class="no-number no-toc" id="rp-content-model">
+ <div class="no-number no-toc" id="rp-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#rp-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="rp-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#rp-content-model">#</a></h2><div class="content-models">
<div id="rp-mdls">
Index: sup.html
===================================================================
RCS file: /sources/public/html5/markup/sup.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- sup.html 30 Jan 2010 04:44:25 -0000 1.27
+++ sup.html 31 Jan 2010 06:11:01 -0000 1.28
@@ -17,7 +17,9 @@
<p>The <a href="sup.html#sup" class="element">sup</a> element
represents superscript.</p>
</div>
- <div class="no-number no-toc" id="sup-content-model">
+ <div class="no-number no-toc" id="sup-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#sup-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="sup-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#sup-content-model">#</a></h2><div class="content-models">
<div id="sup-mdls">
Index: input.url.html
===================================================================
RCS file: /sources/public/html5/markup/input.url.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- input.url.html 30 Jan 2010 04:44:23 -0000 1.28
+++ input.url.html 31 Jan 2010 06:10:59 -0000 1.29
@@ -20,7 +20,7 @@
a control for editing an absolute URL given in the element’s
value.</p>
</div>
- <div class="no-number no-toc" id="input.url-content-model">
+ <div class="no-number no-toc" id="input.url-contents"><h2 class="element-subhead">Permitted content <a class="hash" href="#input.url-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="input.url-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#input.url-content-model">#</a></h2><div class="content-models">
<div id="input.url-mdls">
Received on Sunday, 31 January 2010 06:11:37 UTC