- From: poot <cvsmail@w3.org>
- Date: Fri, 29 Jan 2010 13:12:26 +0900 (JST)
- To: public-html-diffs@w3.org
mike: prose model
http://dev.w3.org/cvsweb/html5/markup/spec.html?r1=1.131&r2=1.132&f=h
===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.365
retrieving revision 1.366
diff -u -d -r1.365 -r1.366
--- Overview.html 29 Jan 2010 03:43:02 -0000 1.365
+++ Overview.html 29 Jan 2010 04:11:57 -0000 1.366
@@ -322,7 +322,7 @@
<span class="toc-section-number"></span><a href="div.html#div"><span class="toc-section-number"></span> <span class="element">div</span> – <span class="shortdesc">generic flow container</span></a>
</li>
<li id="dl-toc">
-<span class="toc-section-number"></span><a href="dl.html#dl"><span class="toc-section-number"></span> <span class="element">dl</span> – <span class="shortdesc">definition list</span></a>
+<span class="toc-section-number"></span><a href="dl.html#dl"><span class="toc-section-number"></span> <span class="element">dl</span> – <span class="shortdesc">description list</span></a>
</li>
<li id="dt-toc">
<span class="toc-section-number"></span><a href="dt.html#dt"><span class="toc-section-number"></span> <span class="element">dt</span> – <span class="shortdesc">term or name</span></a>
@@ -346,19 +346,19 @@
<span class="toc-section-number"></span><a href="h1.html#h1"><span class="toc-section-number"></span> <span class="element">h1</span> – <span class="shortdesc">heading (level 1)</span></a>
</li>
<li id="h2-toc">
-<span class="toc-section-number"></span><a href="h2.html#h2"><span class="toc-section-number"></span> <span class="element">h2</span> – <span class="shortdesc">heading (level 2)</span></a>
+<span class="toc-section-number"></span><a href="h2.html#h2"><span class="toc-section-number"></span> <span class="element">h2</span> – <span class="shortdesc">heading (level 1)</span></a>
</li>
<li id="h3-toc">
-<span class="toc-section-number"></span><a href="h3.html#h3"><span class="toc-section-number"></span> <span class="element">h3</span> – <span class="shortdesc">heading (level 3)</span></a>
+<span class="toc-section-number"></span><a href="h3.html#h3"><span class="toc-section-number"></span> <span class="element">h3</span> – <span class="shortdesc">heading (level 1)</span></a>
</li>
<li id="h4-toc">
-<span class="toc-section-number"></span><a href="h4.html#h4"><span class="toc-section-number"></span> <span class="element">h4</span> – <span class="shortdesc">heading (level 4)</span></a>
+<span class="toc-section-number"></span><a href="h4.html#h4"><span class="toc-section-number"></span> <span class="element">h4</span> – <span class="shortdesc">heading (level 1)</span></a>
</li>
<li id="h5-toc">
-<span class="toc-section-number"></span><a href="h5.html#h5"><span class="toc-section-number"></span> <span class="element">h5</span> – <span class="shortdesc">heading (level 5)</span></a>
+<span class="toc-section-number"></span><a href="h5.html#h5"><span class="toc-section-number"></span> <span class="element">h5</span> – <span class="shortdesc">heading (level 1)</span></a>
</li>
<li id="h6-toc">
-<span class="toc-section-number"></span><a href="h6.html#h6"><span class="toc-section-number"></span> <span class="element">h6</span> – <span class="shortdesc">heading (level 6)</span></a>
+<span class="toc-section-number"></span><a href="h6.html#h6"><span class="toc-section-number"></span> <span class="element">h6</span> – <span class="shortdesc">heading (level 1)</span></a>
</li>
<li id="head-toc">
<span class="toc-section-number"></span><a href="head.html#head"><span class="toc-section-number"></span> <span class="element">head</span> – <span class="shortdesc">document metadata</span></a>
Index: footer.html
===================================================================
RCS file: /sources/public/html5/markup/footer.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- footer.html 29 Jan 2010 02:30:44 -0000 1.26
+++ footer.html 29 Jan 2010 04:11:58 -0000 1.27
@@ -17,7 +17,9 @@
<p>The <a href="footer.html#footer" class="element">footer</a> element
represents the footer for the section it applies to.</p>
</div>
- <div class="no-number no-toc" id="footer-content-model">
+ <div class="no-number no-toc" id="footer-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#footer-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">flow elements</a></p></div></div><div class="no-number no-toc" id="footer-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#footer-content-model">#</a></h2><div class="content-models">
<div id="footer-mdls">
Index: h6.html
===================================================================
RCS file: /sources/public/html5/markup/h6.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- h6.html 29 Jan 2010 02:30:45 -0000 1.27
+++ h6.html 29 Jan 2010 04:11:58 -0000 1.28
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>HTML5: h6 – heading (level 6)</title>
+<title>HTML5: h6 – heading (level 1)</title>
<link rel="stylesheet" href="style.css" type="text/css"></link>
<link rel="stylesheet" href="W3C-ED.css" type="text/css"></link>
</head>
@@ -12,7 +12,7 @@
<span class="nav-next"><a href="head.html">head »</a></span>
</div>
<div id="h6" class="section">
- <h2 class="element-head"><span class="element">h6</span> – <span class="shortdesc">heading (level 6)</span> <a class="hash" href="#h6">#</a> <a class="toc-bak" href="Overview.html#h6-toc">T</a></h2>
+ <h2 class="element-head"><span class="element">h6</span> – <span class="shortdesc">heading (level 1)</span> <a class="hash" href="#h6">#</a> <a class="toc-bak" href="Overview.html#h6-toc">T</a></h2>
<div id="h6-longdesc" class="longdesc">
<p>The <a href="h1.html#h1" class="element">h1</a> through <a href="h6.html#h6" class="element">h6</a> elements are headings for
the sections with which they are associated.</p>
Index: h4.html
===================================================================
RCS file: /sources/public/html5/markup/h4.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- h4.html 29 Jan 2010 02:30:45 -0000 1.27
+++ h4.html 29 Jan 2010 04:11:58 -0000 1.28
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>HTML5: h4 – heading (level 4)</title>
+<title>HTML5: h4 – heading (level 1)</title>
<link rel="stylesheet" href="style.css" type="text/css"></link>
<link rel="stylesheet" href="W3C-ED.css" type="text/css"></link>
</head>
@@ -12,7 +12,7 @@
<span class="nav-next"><a href="h5.html">h5 »</a></span>
</div>
<div id="h4" class="section">
- <h2 class="element-head"><span class="element">h4</span> – <span class="shortdesc">heading (level 4)</span> <a class="hash" href="#h4">#</a> <a class="toc-bak" href="Overview.html#h4-toc">T</a></h2>
+ <h2 class="element-head"><span class="element">h4</span> – <span class="shortdesc">heading (level 1)</span> <a class="hash" href="#h4">#</a> <a class="toc-bak" href="Overview.html#h4-toc">T</a></h2>
<div id="h4-longdesc" class="longdesc">
<p>The <a href="h1.html#h1" class="element">h1</a> through <a href="h6.html#h6" class="element">h6</a> elements are headings for
the sections with which they are associated.</p>
Index: embed.html
===================================================================
RCS file: /sources/public/html5/markup/embed.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- embed.html 29 Jan 2010 02:30:44 -0000 1.26
+++ embed.html 29 Jan 2010 04:11:58 -0000 1.27
@@ -17,7 +17,7 @@
<p>The <a href="embed.html#embed" class="element">embed</a> element
represents an integration point for external content.</p>
</div>
- <div class="no-number no-toc" id="embed-content-model">
+ <div class="no-number no-toc" id="embed-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#embed-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="embed-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#embed-content-model">#</a></h2><div class="content-models">
<div id="embed-mdls">
Index: dd.html
===================================================================
RCS file: /sources/public/html5/markup/dd.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- dd.html 29 Jan 2010 03:43:02 -0000 1.26
+++ dd.html 29 Jan 2010 04:11:58 -0000 1.27
@@ -67,7 +67,7 @@
element represents the
<dfn id="dd-description" title="dd-description">description or value</dfn>
part of a term-description (name-value) grouping in a
- <a href=".html#description-list">description list</a>.</p>
+ <a href="dl.html#description-list">description list</a>.</p>
</div></div></div>
<hr class="footerbreak"></hr>
<div class="nav">
Index: dt.html
===================================================================
RCS file: /sources/public/html5/markup/dt.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- dt.html 29 Jan 2010 03:43:02 -0000 1.26
+++ dt.html 29 Jan 2010 04:11:58 -0000 1.27
@@ -66,7 +66,7 @@
element represents the
<dfn id="dt-term" title="dt-term">term or name</dfn>
part of a term-description (name-value) grouping in a
- <a href=".html#description-list">description list</a>.</p>
+ <a href="dl.html#description-list">description list</a>.</p>
</div></div></div>
<hr class="footerbreak"></hr>
<div class="nav">
Index: h2.html
===================================================================
RCS file: /sources/public/html5/markup/h2.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- h2.html 29 Jan 2010 02:30:45 -0000 1.27
+++ h2.html 29 Jan 2010 04:11:58 -0000 1.28
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>HTML5: h2 – heading (level 2)</title>
+<title>HTML5: h2 – heading (level 1)</title>
<link rel="stylesheet" href="style.css" type="text/css"></link>
<link rel="stylesheet" href="W3C-ED.css" type="text/css"></link>
</head>
@@ -12,7 +12,7 @@
<span class="nav-next"><a href="h3.html">h3 »</a></span>
</div>
<div id="h2" class="section">
- <h2 class="element-head"><span class="element">h2</span> – <span class="shortdesc">heading (level 2)</span> <a class="hash" href="#h2">#</a> <a class="toc-bak" href="Overview.html#h2-toc">T</a></h2>
+ <h2 class="element-head"><span class="element">h2</span> – <span class="shortdesc">heading (level 1)</span> <a class="hash" href="#h2">#</a> <a class="toc-bak" href="Overview.html#h2-toc">T</a></h2>
<div id="h2-longdesc" class="longdesc">
<p>The <a href="h1.html#h1" class="element">h1</a> through <a href="h6.html#h6" class="element">h6</a> elements are headings for
the sections with which they are associated.</p>
Index: em.html
===================================================================
RCS file: /sources/public/html5/markup/em.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- em.html 29 Jan 2010 02:30:44 -0000 1.23
+++ em.html 29 Jan 2010 04:11:58 -0000 1.24
@@ -17,7 +17,9 @@
<p>The <a href="em.html#em" class="element">em</a> element represents
a span of text with emphatic stress.</p>
</div>
- <div class="no-number no-toc" id="em-content-model">
+ <div class="no-number no-toc" id="em-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#em-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></p></div></div><div class="no-number no-toc" id="em-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#em-content-model">#</a></h2><div class="content-models">
<div id="em-mdls">
Index: fieldset.html
===================================================================
RCS file: /sources/public/html5/markup/fieldset.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- fieldset.html 29 Jan 2010 02:30:44 -0000 1.25
+++ fieldset.html 29 Jan 2010 04:11:58 -0000 1.26
@@ -17,7 +17,15 @@
<p>The <code><a href="fieldset.html#fieldset" class="element">fieldset</a></code> element represents a
set of form controls grouped under a common name.</p>
</div>
- <div class="no-number no-toc" id="fieldset-content-model">
+ <div class="no-number no-toc" id="fieldset-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#fieldset-contents">#</a></h2><div class="prose-model">
+ <p>Optionally, a
+ <a href="legend.html#legend" class="element">legend</a>,
+ followed by
+ <a href="common-models.html#common.elem.flow">flow elements</a>
+ and
+ <a href="syntax.html#normal-character-data">normal character data</a>
+ </p>
+ </div></div><div class="no-number no-toc" id="fieldset-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#fieldset-content-model">#</a></h2><div class="content-models">
<div id="fieldset-mdls">
Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- spec.html 29 Jan 2010 03:43:02 -0000 1.131
+++ spec.html 29 Jan 2010 04:11:58 -0000 1.132
@@ -321,7 +321,7 @@
<span class="toc-section-number"></span><a href="#div"><span class="toc-section-number"></span> <span class="element">div</span> – <span class="shortdesc">generic flow container</span></a>
</li>
<li id="dl-toc">
-<span class="toc-section-number"></span><a href="#dl"><span class="toc-section-number"></span> <span class="element">dl</span> – <span class="shortdesc">definition list</span></a>
+<span class="toc-section-number"></span><a href="#dl"><span class="toc-section-number"></span> <span class="element">dl</span> – <span class="shortdesc">description list</span></a>
</li>
<li id="dt-toc">
<span class="toc-section-number"></span><a href="#dt"><span class="toc-section-number"></span> <span class="element">dt</span> – <span class="shortdesc">term or name</span></a>
@@ -345,19 +345,19 @@
<span class="toc-section-number"></span><a href="#h1"><span class="toc-section-number"></span> <span class="element">h1</span> – <span class="shortdesc">heading (level 1)</span></a>
</li>
<li id="h2-toc">
-<span class="toc-section-number"></span><a href="#h2"><span class="toc-section-number"></span> <span class="element">h2</span> – <span class="shortdesc">heading (level 2)</span></a>
+<span class="toc-section-number"></span><a href="#h2"><span class="toc-section-number"></span> <span class="element">h2</span> – <span class="shortdesc">heading (level 1)</span></a>
</li>
<li id="h3-toc">
-<span class="toc-section-number"></span><a href="#h3"><span class="toc-section-number"></span> <span class="element">h3</span> – <span class="shortdesc">heading (level 3)</span></a>
+<span class="toc-section-number"></span><a href="#h3"><span class="toc-section-number"></span> <span class="element">h3</span> – <span class="shortdesc">heading (level 1)</span></a>
</li>
<li id="h4-toc">
-<span class="toc-section-number"></span><a href="#h4"><span class="toc-section-number"></span> <span class="element">h4</span> – <span class="shortdesc">heading (level 4)</span></a>
+<span class="toc-section-number"></span><a href="#h4"><span class="toc-section-number"></span> <span class="element">h4</span> – <span class="shortdesc">heading (level 1)</span></a>
</li>
<li id="h5-toc">
-<span class="toc-section-number"></span><a href="#h5"><span class="toc-section-number"></span> <span class="element">h5</span> – <span class="shortdesc">heading (level 5)</span></a>
+<span class="toc-section-number"></span><a href="#h5"><span class="toc-section-number"></span> <span class="element">h5</span> – <span class="shortdesc">heading (level 1)</span></a>
</li>
<li id="h6-toc">
-<span class="toc-section-number"></span><a href="#h6"><span class="toc-section-number"></span> <span class="element">h6</span> – <span class="shortdesc">heading (level 6)</span></a>
+<span class="toc-section-number"></span><a href="#h6"><span class="toc-section-number"></span> <span class="element">h6</span> – <span class="shortdesc">heading (level 1)</span></a>
</li>
<li id="head-toc">
<span class="toc-section-number"></span><a href="#head"><span class="toc-section-number"></span> <span class="element">head</span> – <span class="shortdesc">document metadata</span></a>
@@ -2263,7 +2263,7 @@
<span class="toc-section-number"></span><a href="#div"><span class="toc-section-number"></span> <span class="element">div</span> – <span class="shortdesc">generic flow container</span></a>
</li>
<li id="dl-toc">
-<span class="toc-section-number"></span><a href="#dl"><span class="toc-section-number"></span> <span class="element">dl</span> – <span class="shortdesc">definition list</span></a>
+<span class="toc-section-number"></span><a href="#dl"><span class="toc-section-number"></span> <span class="element">dl</span> – <span class="shortdesc">description list</span></a>
</li>
<li id="dt-toc">
<span class="toc-section-number"></span><a href="#dt"><span class="toc-section-number"></span> <span class="element">dt</span> – <span class="shortdesc">term or name</span></a>
@@ -2287,19 +2287,19 @@
<span class="toc-section-number"></span><a href="#h1"><span class="toc-section-number"></span> <span class="element">h1</span> – <span class="shortdesc">heading (level 1)</span></a>
</li>
<li id="h2-toc">
-<span class="toc-section-number"></span><a href="#h2"><span class="toc-section-number"></span> <span class="element">h2</span> – <span class="shortdesc">heading (level 2)</span></a>
+<span class="toc-section-number"></span><a href="#h2"><span class="toc-section-number"></span> <span class="element">h2</span> – <span class="shortdesc">heading (level 1)</span></a>
</li>
<li id="h3-toc">
-<span class="toc-section-number"></span><a href="#h3"><span class="toc-section-number"></span> <span class="element">h3</span> – <span class="shortdesc">heading (level 3)</span></a>
+<span class="toc-section-number"></span><a href="#h3"><span class="toc-section-number"></span> <span class="element">h3</span> – <span class="shortdesc">heading (level 1)</span></a>
</li>
<li id="h4-toc">
-<span class="toc-section-number"></span><a href="#h4"><span class="toc-section-number"></span> <span class="element">h4</span> – <span class="shortdesc">heading (level 4)</span></a>
+<span class="toc-section-number"></span><a href="#h4"><span class="toc-section-number"></span> <span class="element">h4</span> – <span class="shortdesc">heading (level 1)</span></a>
</li>
<li id="h5-toc">
-<span class="toc-section-number"></span><a href="#h5"><span class="toc-section-number"></span> <span class="element">h5</span> – <span class="shortdesc">heading (level 5)</span></a>
+<span class="toc-section-number"></span><a href="#h5"><span class="toc-section-number"></span> <span class="element">h5</span> – <span class="shortdesc">heading (level 1)</span></a>
</li>
<li id="h6-toc">
-<span class="toc-section-number"></span><a href="#h6"><span class="toc-section-number"></span> <span class="element">h6</span> – <span class="shortdesc">heading (level 6)</span></a>
+<span class="toc-section-number"></span><a href="#h6"><span class="toc-section-number"></span> <span class="element">h6</span> – <span class="shortdesc">heading (level 1)</span></a>
</li>
<li id="head-toc">
<span class="toc-section-number"></span><a href="#head"><span class="toc-section-number"></span> <span class="element">head</span> – <span class="shortdesc">document metadata</span></a>
@@ -5557,10 +5557,24 @@
</div>
<div id="dl" class="section">
<h2 class="element-head">
-<span class="element">dl</span> – <span class="shortdesc">definition list</span> <a class="hash" href="#dl">#</a> <a class="toc-bak" href="#dl-toc">T</a>
+<span class="element">dl</span> – <span class="shortdesc">description list</span> <a class="hash" href="#dl">#</a> <a class="toc-bak" href="#dl-toc">T</a>
</h2>
- <div id="dl-longdesc" class="longdesc"><p><i class="TK">(element description to come)</i></p></div>
- <div class="no-number no-toc" id="dl-content-model">
+ <div id="dl-longdesc" class="longdesc">
+ <p>The <a href="#dl" class="element">dl</a> element represents
+ a <a href="#description-list">description list</a>.</p>
+ </div>
+ <div class="no-number no-toc" id="dl-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#dl-contents">#</a>
+</h2>
+<div class="prose-model">
+ <p>Zero or more groups each consisting of one or more
+ <a href="#dt" class="element">dt</a>
+ elements followed by one or more
+ <a href="#dd" class="element">dd</a>
+ elements.</p>
+ </div>
+</div>
+<div class="no-number no-toc" id="dl-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#dl-content-model">#</a>
</h2>
<div class="content-models">
@@ -5623,6 +5637,23 @@
</div>
</div>
</div>
+ <div class="no-number no-toc" id="dl-details">
+ <h2 class="element-subhead">Details <a class="hash" href="#dl-details">#</a>
+</h2>
+<div class="details">
+ <p>The <a href="#dl" class="element">dl</a> element represents
+ a
+ <dfn id="description-list" title="description-list">description list</dfn>,
+ which consists of zero or more term-description (name-value)
+ groupings; each grouping associates one or more
+ <a href="#dt-term">terms/names</a>
+ (the contents of <a href="#dt" class="element">dt</a>
+ elements) with one or more
+ <a href="#dd-description">descriptions/values</a>
+ (the contents of <a href="#dd" class="element">dd</a>
+ elements).</p>
+ </div>
+</div>
</div>
<div id="dt" class="section">
<h2 class="element-head">
@@ -5717,7 +5748,14 @@
<p>The <a href="#em" class="element">em</a> element represents
a span of text with emphatic stress.</p>
</div>
- <div class="no-number no-toc" id="em-content-model">
+ <div class="no-number no-toc" id="em-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#em-contents">#</a>
+</h2>
+<div class="prose-model"><p><a href="#normal-character-data">Normal character data</a>
+ and
+ <a href="#common.elem.phrasing">phrasing elements</a></p></div>
+</div>
+<div class="no-number no-toc" id="em-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#em-content-model">#</a>
</h2>
<div class="content-models">
@@ -5775,7 +5813,12 @@
<p>The <a href="#embed" class="element">embed</a> element
represents an integration point for external content.</p>
</div>
- <div class="no-number no-toc" id="embed-content-model">
+ <div class="no-number no-toc" id="embed-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#embed-contents">#</a>
+</h2>
+<div class="prose-model"><p>Empty</p></div>
+</div>
+<div class="no-number no-toc" id="embed-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#embed-content-model">#</a>
</h2>
<div class="content-models">
@@ -5894,7 +5937,20 @@
<p>The <code><a href="#fieldset" class="element">fieldset</a></code> element represents a
set of form controls grouped under a common name.</p>
</div>
- <div class="no-number no-toc" id="fieldset-content-model">
+ <div class="no-number no-toc" id="fieldset-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#fieldset-contents">#</a>
+</h2>
+<div class="prose-model">
+ <p>Optionally, a
+ <a href="#legend" class="element">legend</a>,
+ followed by
+ <a href="#common.elem.flow">flow elements</a>
+ and
+ <a href="#normal-character-data">normal character data</a>
+ </p>
+ </div>
+</div>
+<div class="no-number no-toc" id="fieldset-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#fieldset-content-model">#</a>
</h2>
<div class="content-models">
@@ -5970,7 +6026,14 @@
<p>The <a href="#footer" class="element">footer</a> element
represents the footer for the section it applies to.</p>
</div>
- <div class="no-number no-toc" id="footer-content-model">
+ <div class="no-number no-toc" id="footer-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#footer-contents">#</a>
+</h2>
+<div class="prose-model"><p><a href="#normal-character-data">Normal character data</a>
+ and
+ <a href="#common.elem.phrasing">flow elements</a></p></div>
+</div>
+<div class="no-number no-toc" id="footer-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#footer-content-model">#</a>
</h2>
<div class="content-models">
@@ -6055,7 +6118,14 @@
<p>The <a href="#form" class="element">form</a> element
represents a user-submittable form.</p>
</div>
- <div class="no-number no-toc" id="form-content-model">
+ <div class="no-number no-toc" id="form-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#form-contents">#</a>
+</h2>
+<div class="prose-model"><p><a href="#normal-character-data">Normal character data</a>
+ and
+ <a href="#common.elem.phrasing">flow elements</a></p></div>
+</div>
+<div class="no-number no-toc" id="form-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#form-content-model">#</a>
</h2>
<div class="content-models">
@@ -6278,7 +6348,7 @@
</div>
<div id="h2" class="section">
<h2 class="element-head">
-<span class="element">h2</span> – <span class="shortdesc">heading (level 2)</span> <a class="hash" href="#h2">#</a> <a class="toc-bak" href="#h2-toc">T</a>
+<span class="element">h2</span> – <span class="shortdesc">heading (level 1)</span> <a class="hash" href="#h2">#</a> <a class="toc-bak" href="#h2-toc">T</a>
</h2>
<div id="h2-longdesc" class="longdesc">
<p>The <a href="#h1" class="element">h1</a> through <a href="#h6" class="element">h6</a> elements are headings for
@@ -6368,7 +6438,7 @@
</div>
<div id="h3" class="section">
<h2 class="element-head">
-<span class="element">h3</span> – <span class="shortdesc">heading (level 3)</span> <a class="hash" href="#h3">#</a> <a class="toc-bak" href="#h3-toc">T</a>
+<span class="element">h3</span> – <span class="shortdesc">heading (level 1)</span> <a class="hash" href="#h3">#</a> <a class="toc-bak" href="#h3-toc">T</a>
</h2>
<div id="h3-longdesc" class="longdesc">
<p>The <a href="#h1" class="element">h1</a> through <a href="#h6" class="element">h6</a> elements are headings for
@@ -6458,7 +6528,7 @@
</div>
<div id="h4" class="section">
<h2 class="element-head">
-<span class="element">h4</span> – <span class="shortdesc">heading (level 4)</span> <a class="hash" href="#h4">#</a> <a class="toc-bak" href="#h4-toc">T</a>
+<span class="element">h4</span> – <span class="shortdesc">heading (level 1)</span> <a class="hash" href="#h4">#</a> <a class="toc-bak" href="#h4-toc">T</a>
</h2>
<div id="h4-longdesc" class="longdesc">
<p>The <a href="#h1" class="element">h1</a> through <a href="#h6" class="element">h6</a> elements are headings for
@@ -6546,7 +6616,7 @@
</div>
<div id="h5" class="section">
<h2 class="element-head">
-<span class="element">h5</span> – <span class="shortdesc">heading (level 5)</span> <a class="hash" href="#h5">#</a> <a class="toc-bak" href="#h5-toc">T</a>
+<span class="element">h5</span> – <span class="shortdesc">heading (level 1)</span> <a class="hash" href="#h5">#</a> <a class="toc-bak" href="#h5-toc">T</a>
</h2>
<div id="h5-longdesc" class="longdesc">
<p>The <a href="#h1" class="element">h1</a> through <a href="#h6" class="element">h6</a> elements are headings for
@@ -6636,7 +6706,7 @@
</div>
<div id="h6" class="section">
<h2 class="element-head">
-<span class="element">h6</span> – <span class="shortdesc">heading (level 6)</span> <a class="hash" href="#h6">#</a> <a class="toc-bak" href="#h6-toc">T</a>
+<span class="element">h6</span> – <span class="shortdesc">heading (level 1)</span> <a class="hash" href="#h6">#</a> <a class="toc-bak" href="#h6-toc">T</a>
</h2>
<div id="h6-longdesc" class="longdesc">
<p>The <a href="#h1" class="element">h1</a> through <a href="#h6" class="element">h6</a> elements are headings for
Index: h3.html
===================================================================
RCS file: /sources/public/html5/markup/h3.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- h3.html 29 Jan 2010 02:30:45 -0000 1.27
+++ h3.html 29 Jan 2010 04:11:58 -0000 1.28
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>HTML5: h3 – heading (level 3)</title>
+<title>HTML5: h3 – heading (level 1)</title>
<link rel="stylesheet" href="style.css" type="text/css"></link>
<link rel="stylesheet" href="W3C-ED.css" type="text/css"></link>
</head>
@@ -12,7 +12,7 @@
<span class="nav-next"><a href="h4.html">h4 »</a></span>
</div>
<div id="h3" class="section">
- <h2 class="element-head"><span class="element">h3</span> – <span class="shortdesc">heading (level 3)</span> <a class="hash" href="#h3">#</a> <a class="toc-bak" href="Overview.html#h3-toc">T</a></h2>
+ <h2 class="element-head"><span class="element">h3</span> – <span class="shortdesc">heading (level 1)</span> <a class="hash" href="#h3">#</a> <a class="toc-bak" href="Overview.html#h3-toc">T</a></h2>
<div id="h3-longdesc" class="longdesc">
<p>The <a href="h1.html#h1" class="element">h1</a> through <a href="h6.html#h6" class="element">h6</a> elements are headings for
the sections with which they are associated.</p>
Index: form.html
===================================================================
RCS file: /sources/public/html5/markup/form.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- form.html 29 Jan 2010 02:30:45 -0000 1.29
+++ form.html 29 Jan 2010 04:11:58 -0000 1.30
@@ -17,7 +17,9 @@
<p>The <a href="form.html#form" class="element">form</a> element
represents a user-submittable form.</p>
</div>
- <div class="no-number no-toc" id="form-content-model">
+ <div class="no-number no-toc" id="form-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#form-contents">#</a></h2><div class="prose-model"><p><a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">flow elements</a></p></div></div><div class="no-number no-toc" id="form-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#form-content-model">#</a></h2><div class="content-models">
<div id="form-mdls">
Index: elements.html
===================================================================
RCS file: /sources/public/html5/markup/elements.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- elements.html 29 Jan 2010 03:43:02 -0000 1.27
+++ elements.html 29 Jan 2010 04:11:58 -0000 1.28
@@ -81,7 +81,7 @@
</li>
<li id="div-toc"><span class="toc-section-number"></span><a href="div.html#div"><span class="toc-section-number"></span> <span class="element">div</span> – <span class="shortdesc">generic flow container</span></a>
</li>
-<li id="dl-toc"><span class="toc-section-number"></span><a href="dl.html#dl"><span class="toc-section-number"></span> <span class="element">dl</span> – <span class="shortdesc">definition list</span></a>
+<li id="dl-toc"><span class="toc-section-number"></span><a href="dl.html#dl"><span class="toc-section-number"></span> <span class="element">dl</span> – <span class="shortdesc">description list</span></a>
</li>
<li id="dt-toc"><span class="toc-section-number"></span><a href="dt.html#dt"><span class="toc-section-number"></span> <span class="element">dt</span> – <span class="shortdesc">term or name</span></a>
</li>
@@ -97,15 +97,15 @@
</li>
<li id="h1-toc"><span class="toc-section-number"></span><a href="h1.html#h1"><span class="toc-section-number"></span> <span class="element">h1</span> – <span class="shortdesc">heading (level 1)</span></a>
</li>
-<li id="h2-toc"><span class="toc-section-number"></span><a href="h2.html#h2"><span class="toc-section-number"></span> <span class="element">h2</span> – <span class="shortdesc">heading (level 2)</span></a>
+<li id="h2-toc"><span class="toc-section-number"></span><a href="h2.html#h2"><span class="toc-section-number"></span> <span class="element">h2</span> – <span class="shortdesc">heading (level 1)</span></a>
</li>
-<li id="h3-toc"><span class="toc-section-number"></span><a href="h3.html#h3"><span class="toc-section-number"></span> <span class="element">h3</span> – <span class="shortdesc">heading (level 3)</span></a>
+<li id="h3-toc"><span class="toc-section-number"></span><a href="h3.html#h3"><span class="toc-section-number"></span> <span class="element">h3</span> – <span class="shortdesc">heading (level 1)</span></a>
</li>
-<li id="h4-toc"><span class="toc-section-number"></span><a href="h4.html#h4"><span class="toc-section-number"></span> <span class="element">h4</span> – <span class="shortdesc">heading (level 4)</span></a>
+<li id="h4-toc"><span class="toc-section-number"></span><a href="h4.html#h4"><span class="toc-section-number"></span> <span class="element">h4</span> – <span class="shortdesc">heading (level 1)</span></a>
</li>
-<li id="h5-toc"><span class="toc-section-number"></span><a href="h5.html#h5"><span class="toc-section-number"></span> <span class="element">h5</span> – <span class="shortdesc">heading (level 5)</span></a>
+<li id="h5-toc"><span class="toc-section-number"></span><a href="h5.html#h5"><span class="toc-section-number"></span> <span class="element">h5</span> – <span class="shortdesc">heading (level 1)</span></a>
</li>
-<li id="h6-toc"><span class="toc-section-number"></span><a href="h6.html#h6"><span class="toc-section-number"></span> <span class="element">h6</span> – <span class="shortdesc">heading (level 6)</span></a>
+<li id="h6-toc"><span class="toc-section-number"></span><a href="h6.html#h6"><span class="toc-section-number"></span> <span class="element">h6</span> – <span class="shortdesc">heading (level 1)</span></a>
</li>
<li id="head-toc"><span class="toc-section-number"></span><a href="head.html#head"><span class="toc-section-number"></span> <span class="element">head</span> – <span class="shortdesc">document metadata</span></a>
</li>
Index: dl.html
===================================================================
RCS file: /sources/public/html5/markup/dl.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- dl.html 29 Jan 2010 03:43:02 -0000 1.24
+++ dl.html 29 Jan 2010 04:11:58 -0000 1.25
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>HTML5: dl – definition list</title>
+<title>HTML5: dl – description list</title>
<link rel="stylesheet" href="style.css" type="text/css"></link>
<link rel="stylesheet" href="W3C-ED.css" type="text/css"></link>
</head>
@@ -12,9 +12,18 @@
<span class="nav-next"><a href="dt.html">dt »</a></span>
</div>
<div id="dl" class="section">
- <h2 class="element-head"><span class="element">dl</span> – <span class="shortdesc">definition list</span> <a class="hash" href="#dl">#</a> <a class="toc-bak" href="Overview.html#dl-toc">T</a></h2>
- <div id="dl-longdesc" class="longdesc"><p><i class="TK">(element description to come)</i></p></div>
- <div class="no-number no-toc" id="dl-content-model">
+ <h2 class="element-head"><span class="element">dl</span> – <span class="shortdesc">description list</span> <a class="hash" href="#dl">#</a> <a class="toc-bak" href="Overview.html#dl-toc">T</a></h2>
+ <div id="dl-longdesc" class="longdesc">
+ <p>The <a href="dl.html#dl" class="element">dl</a> element represents
+ a <a href="dl.html#description-list">description list</a>.</p>
+ </div>
+ <div class="no-number no-toc" id="dl-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#dl-contents">#</a></h2><div class="prose-model">
+ <p>Zero or more groups each consisting of one or more
+ <a href="dt.html#dt" class="element">dt</a>
+ elements followed by one or more
+ <a href="dd.html#dd" class="element">dd</a>
+ elements.</p>
+ </div></div><div class="no-number no-toc" id="dl-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#dl-content-model">#</a></h2><div class="content-models">
<div id="dl-mdls">
@@ -56,7 +65,21 @@
<div class="no-number no-toc" id="dl-display">
<h2 class="element-subhead">Typical default display properties <a class="hash" href="#dl-display">#</a></h2>
<div class="css-props" id="dl-css"><div class="selectors"><span class="selector">dl</span> {
-</div><div class="properties"><div class="css-property"><span class="prop-name">display</span>: <span class="prop-value">block</span>;</div><div class="css-property"><span class="prop-name">margin</span>: <span class="prop-value">1em 0 1em 0</span>; }</div></div></div></div></div>
+</div><div class="properties"><div class="css-property"><span class="prop-name">display</span>: <span class="prop-value">block</span>;</div><div class="css-property"><span class="prop-name">margin</span>: <span class="prop-value">1em 0 1em 0</span>; }</div></div></div></div>
+ <div class="no-number no-toc" id="dl-details">
+ <h2 class="element-subhead">Details <a class="hash" href="#dl-details">#</a></h2><div class="details">
+ <p>The <a href="dl.html#dl" class="element">dl</a> element represents
+ a
+ <dfn id="description-list" title="description-list">description list</dfn>,
+ which consists of zero or more term-description (name-value)
+ groupings; each grouping associates one or more
+ <a href="dt.html#dt-term">terms/names</a>
+ (the contents of <a href="dt.html#dt" class="element">dt</a>
+ elements) with one or more
+ <a href="dd.html#dd-description">descriptions/values</a>
+ (the contents of <a href="dd.html#dd" class="element">dd</a>
+ elements).</p>
+ </div></div></div>
<hr class="footerbreak"></hr>
<div class="nav">
<span class="nav-prev"><a href="div.html">« div</a></span>
Index: h5.html
===================================================================
RCS file: /sources/public/html5/markup/h5.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- h5.html 29 Jan 2010 02:30:45 -0000 1.27
+++ h5.html 29 Jan 2010 04:11:58 -0000 1.28
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-<title>HTML5: h5 – heading (level 5)</title>
+<title>HTML5: h5 – heading (level 1)</title>
<link rel="stylesheet" href="style.css" type="text/css"></link>
<link rel="stylesheet" href="W3C-ED.css" type="text/css"></link>
</head>
@@ -12,7 +12,7 @@
<span class="nav-next"><a href="h6.html">h6 »</a></span>
</div>
<div id="h5" class="section">
- <h2 class="element-head"><span class="element">h5</span> – <span class="shortdesc">heading (level 5)</span> <a class="hash" href="#h5">#</a> <a class="toc-bak" href="Overview.html#h5-toc">T</a></h2>
+ <h2 class="element-head"><span class="element">h5</span> – <span class="shortdesc">heading (level 1)</span> <a class="hash" href="#h5">#</a> <a class="toc-bak" href="Overview.html#h5-toc">T</a></h2>
<div id="h5-longdesc" class="longdesc">
<p>The <a href="h1.html#h1" class="element">h1</a> through <a href="h6.html#h6" class="element">h6</a> elements are headings for
the sections with which they are associated.</p>
Received on Friday, 29 January 2010 04:12:56 UTC