- From: poot <cvsmail@w3.org>
- Date: Fri, 29 Jan 2010 12:43:27 +0900 (JST)
- To: public-html-diffs@w3.org
mike: prose model
http://dev.w3.org/cvsweb/html5/markup/spec.html?r1=1.130&r2=1.131&f=h
===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -d -r1.364 -r1.365
--- Overview.html 29 Jan 2010 00:09:11 -0000 1.364
+++ Overview.html 29 Jan 2010 03:43:02 -0000 1.365
@@ -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">description 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">definition 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>
Index: div.html
===================================================================
RCS file: /sources/public/html5/markup/div.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- div.html 29 Jan 2010 02:30:44 -0000 1.26
+++ div.html 29 Jan 2010 03:43:02 -0000 1.27
@@ -18,7 +18,9 @@
generic container for flow content that by itself does not
represent anything.</p>
</div>
- <div class="no-number no-toc" id="div-content-model">
+ <div class="no-number no-toc" id="div-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#div-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="div-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#div-content-model">#</a></h2><div class="content-models">
<div id="div-mdls">
Index: dfn.html
===================================================================
RCS file: /sources/public/html5/markup/dfn.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- dfn.html 29 Jan 2010 02:30:44 -0000 1.23
+++ dfn.html 29 Jan 2010 03:43:02 -0000 1.24
@@ -17,7 +17,9 @@
<p>The <a href="dfn.html#dfn" class="element">dfn</a> element
represents the defining instance of a term.</p>
</div>
- <div class="no-number no-toc" id="dfn-content-model">
+ <div class="no-number no-toc" id="dfn-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#dfn-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="dfn-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#dfn-content-model">#</a></h2><div class="content-models">
<div id="dfn-mdls">
Index: dd.html
===================================================================
RCS file: /sources/public/html5/markup/dd.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- dd.html 29 Jan 2010 02:30:44 -0000 1.25
+++ dd.html 29 Jan 2010 03:43:02 -0000 1.26
@@ -19,7 +19,9 @@
element represents a
<a href="dd.html#dd-description">description or value</a>.</p>
</div>
- <div class="no-number no-toc" id="dd-content-model">
+ <div class="no-number no-toc" id="dd-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#dd-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="dd-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#dd-content-model">#</a></h2><div class="content-models">
<div id="dd-mdls">
@@ -65,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="dl.html#description-list">description list</a>.</p>
+ <a href=".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.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- dt.html 29 Jan 2010 02:30:44 -0000 1.25
+++ dt.html 29 Jan 2010 03:43:02 -0000 1.26
@@ -19,7 +19,9 @@
element represents a
<a href="dt.html#dt-term">term or name</a>.</p>
</div>
- <div class="no-number no-toc" id="dt-content-model">
+ <div class="no-number no-toc" id="dt-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#dt-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="dt-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#dt-content-model">#</a></h2><div class="content-models">
<div id="dt-mdls">
@@ -64,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="dl.html#description-list">description list</a>.</p>
+ <a href=".html#description-list">description list</a>.</p>
</div></div></div>
<hr class="footerbreak"></hr>
<div class="nav">
Index: del.html
===================================================================
RCS file: /sources/public/html5/markup/del.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- del.html 29 Jan 2010 02:30:44 -0000 1.27
+++ del.html 29 Jan 2010 03:43:02 -0000 1.28
@@ -18,7 +18,7 @@
represents a range of text that has been deleted from a
document.</p>
</div>
- <div class="no-number no-toc" id="del-content-model">
+ <div class="no-number no-toc" id="del-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#del-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="del-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#del-content-model">#</a></h2><div class="content-models">
<dl id="del-mdls">
Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- spec.html 29 Jan 2010 03:06:18 -0000 1.130
+++ spec.html 29 Jan 2010 03:43:02 -0000 1.131
@@ -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">description 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">definition 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>
@@ -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">description 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">definition 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>
@@ -5145,16 +5145,14 @@
<h2 class="element-subhead">Permitted contents <a class="hash" href="#datalist-contents">#</a>
</h2>
<div class="prose-model">
- <p>One of the following two choices:</p>
- <ul>
-<li>
-<a href="#normal-character-data">Normal character data</a>
- and
- <a href="#common.elem.phrasing">phrasing elements</a>
- </li>
- <li>or, zero or more <a href="#option">option</a> elements</li>
- </ul>
-</div>
+ <p>Zero or more
+ <a href="#option" class="element">option</a>
+ elements intermixed with
+ <a href="#common.elem.phrasing">phrasing elements</a>
+ and
+ <a href="#normal-character-data">normal character data</a>
+ </p>
+ </div>
</div>
<div class="no-number no-toc" id="datalist-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#datalist-content-model">#</a>
@@ -5230,7 +5228,14 @@
element represents a
<a href="#dd-description">description or value</a>.</p>
</div>
- <div class="no-number no-toc" id="dd-content-model">
+ <div class="no-number no-toc" id="dd-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#dd-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="dd-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#dd-content-model">#</a>
</h2>
<div class="content-models">
@@ -5312,7 +5317,12 @@
represents a range of text that has been deleted from a
document.</p>
</div>
- <div class="no-number no-toc" id="del-content-model">
+ <div class="no-number no-toc" id="del-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#del-contents">#</a>
+</h2>
+<div class="prose-model"><div id="prose-model"><p><a href="#transparent">Transparent</a></p></div></div>
+</div>
+<div class="no-number no-toc" id="del-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#del-content-model">#</a>
</h2>
<div class="content-models">
@@ -5400,7 +5410,14 @@
<p>The <a href="#dfn" class="element">dfn</a> element
represents the defining instance of a term.</p>
</div>
- <div class="no-number no-toc" id="dfn-content-model">
+ <div class="no-number no-toc" id="dfn-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#dfn-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="dfn-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#dfn-content-model">#</a>
</h2>
<div class="content-models">
@@ -5457,7 +5474,14 @@
generic container for flow content that by itself does not
represent anything.</p>
</div>
- <div class="no-number no-toc" id="div-content-model">
+ <div class="no-number no-toc" id="div-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#div-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="div-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#div-content-model">#</a>
</h2>
<div class="content-models">
@@ -5533,12 +5557,9 @@
</div>
<div id="dl" class="section">
<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="#dl-toc">T</a>
+<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>
</h2>
- <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 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-subhead">Content model <a class="hash" href="#dl-content-model">#</a>
</h2>
@@ -5602,23 +5623,6 @@
</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">
@@ -5630,7 +5634,14 @@
element represents a
<a href="#dt-term">term or name</a>.</p>
</div>
- <div class="no-number no-toc" id="dt-content-model">
+ <div class="no-number no-toc" id="dt-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#dt-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="dt-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#dt-content-model">#</a>
</h2>
<div class="content-models">
Index: datalist.html
===================================================================
RCS file: /sources/public/html5/markup/datalist.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- datalist.html 29 Jan 2010 03:06:17 -0000 1.27
+++ datalist.html 29 Jan 2010 03:43:02 -0000 1.28
@@ -20,14 +20,13 @@
that represent predefined options for other controls.</p>
</div>
<div class="no-number no-toc" id="datalist-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#datalist-contents">#</a></h2><div class="prose-model">
- <p>One of the following two choices:</p>
- <ul>
- <li><a href="syntax.html#normal-character-data">Normal character data</a>
- and
- <a href="common-models.html#common.elem.phrasing">phrasing elements</a>
- </li>
- <li>or, zero or more <a href="option.html#option">option</a> elements</li>
- </ul>
+ <p>Zero or more
+ <a href="option.html#option" class="element">option</a>
+ elements intermixed with
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a>
+ and
+ <a href="syntax.html#normal-character-data">normal character data</a>
+ </p>
</div></div><div class="no-number no-toc" id="datalist-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#datalist-content-model">#</a></h2><div class="content-models">
Index: elements.html
===================================================================
RCS file: /sources/public/html5/markup/elements.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- elements.html 28 Jan 2010 17:57:25 -0000 1.26
+++ elements.html 29 Jan 2010 03:43:02 -0000 1.27
@@ -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">description 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">definition 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>
Index: dl.html
===================================================================
RCS file: /sources/public/html5/markup/dl.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- dl.html 29 Jan 2010 02:30:44 -0000 1.23
+++ dl.html 29 Jan 2010 03:43:02 -0000 1.24
@@ -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 – description list</title>
+<title>HTML5: dl – definition 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,11 +12,8 @@
<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">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>
+ <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-subhead">Content model <a class="hash" href="#dl-content-model">#</a></h2><div class="content-models">
@@ -59,21 +56,7 @@
<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 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>
+</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>
<hr class="footerbreak"></hr>
<div class="nav">
<span class="nav-prev"><a href="div.html">« div</a></span>
Received on Friday, 29 January 2010 03:43:57 UTC