- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 29 Jan 2010 02:51:42 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv17047
Modified Files:
audio.html col.html colgroup.html command.checkbox.html
command.command.html command.radio.html spec.html
Log Message:
prose model
Index: audio.html
===================================================================
RCS file: /sources/public/html5/markup/audio.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- audio.html 29 Jan 2010 02:30:44 -0000 1.31
+++ audio.html 29 Jan 2010 02:51:40 -0000 1.32
@@ -18,16 +18,16 @@
represents an audio stream.</p>
</div>
<div class="no-number no-toc" id="audio-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#audio-contents">#</a></h2><div class="prose-model">
- <p>If the element has a
- <a href="audio.html#audio.attrs.src" class="attribute">src</a>
- attribute,
- <a href="terminology.html#transparent">transparent</a>.</p>
<p>If the element does not have a
<a href="audio.html#audio.attrs.src" class="attribute">src</a>
- attribute: one or more
+ 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="audio.html#audio.attrs.src" class="attribute">src</a>
+ attribute,
+ <a href="terminology.html#transparent">transparent</a>.</p>
</div></div><div class="no-number no-toc" id="audio-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#audio-content-model">#</a></h2><div class="content-models">
Index: command.command.html
===================================================================
RCS file: /sources/public/html5/markup/command.command.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- command.command.html 29 Jan 2010 02:30:44 -0000 1.24
+++ command.command.html 29 Jan 2010 02:51:40 -0000 1.25
@@ -19,7 +19,7 @@
value is "<code>command</code>" represents a command with an
associated action.</p>
</div>
- <div class="no-number no-toc" id="command.command-content-model">
+ <div class="no-number no-toc" id="command.command-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#command.command-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="command.command-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#command.command-content-model">#</a></h2><div class="content-models">
<div id="command.command-mdls">
Index: col.html
===================================================================
RCS file: /sources/public/html5/markup/col.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- col.html 29 Jan 2010 02:30:44 -0000 1.23
+++ col.html 29 Jan 2010 02:51:40 -0000 1.24
@@ -19,7 +19,7 @@
by its <a href="colgroup.html#colgroup" class="element">colgroup</a>
parent.</p>
</div>
- <div class="no-number no-toc" id="col-content-model">
+ <div class="no-number no-toc" id="col-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#col-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="col-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#col-content-model">#</a></h2><div class="content-models">
<div id="col-mdls">
Index: command.radio.html
===================================================================
RCS file: /sources/public/html5/markup/command.radio.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- command.radio.html 29 Jan 2010 02:30:44 -0000 1.24
+++ command.radio.html 29 Jan 2010 02:51:40 -0000 1.25
@@ -19,7 +19,7 @@
value is "<code>radio</code>" represents
a selection of one item from a list of items.</p>
</div>
- <div class="no-number no-toc" id="command.radio-content-model">
+ <div class="no-number no-toc" id="command.radio-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#command.radio-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="command.radio-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#command.radio-content-model">#</a></h2><div class="content-models">
<div id="command.radio-mdls">
Index: command.checkbox.html
===================================================================
RCS file: /sources/public/html5/markup/command.checkbox.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- command.checkbox.html 29 Jan 2010 02:30:44 -0000 1.24
+++ command.checkbox.html 29 Jan 2010 02:51:40 -0000 1.25
@@ -19,7 +19,7 @@
value is "<code>checkbox</code>" represents a state or option
that can be toggled.</p>
</div>
- <div class="no-number no-toc" id="command.checkbox-content-model">
+ <div class="no-number no-toc" id="command.checkbox-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#command.checkbox-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="command.checkbox-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#command.checkbox-content-model">#</a></h2><div class="content-models">
<div id="command.checkbox-mdls">
Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- spec.html 29 Jan 2010 02:35:42 -0000 1.127
+++ spec.html 29 Jan 2010 02:51:40 -0000 1.128
@@ -3300,16 +3300,16 @@
<h2 class="element-subhead">Permitted contents <a class="hash" href="#audio-contents">#</a>
</h2>
<div class="prose-model">
- <p>If the element has a
- <a href="#audio.attrs.src" class="attribute">src</a>
- attribute,
- <a href="#transparent">transparent</a>.</p>
<p>If the element does not have a
<a href="#audio.attrs.src" class="attribute">src</a>
- attribute: one or more
+ 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="#audio.attrs.src" class="attribute">src</a>
+ attribute,
+ <a href="#transparent">transparent</a>.</p>
</div>
</div>
<div class="no-number no-toc" id="audio-content-model">
@@ -4571,7 +4571,12 @@
by its <a href="#colgroup" class="element">colgroup</a>
parent.</p>
</div>
- <div class="no-number no-toc" id="col-content-model">
+ <div class="no-number no-toc" id="col-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#col-contents">#</a>
+</h2>
+<div class="prose-model"><p>Empty</p></div>
+</div>
+<div class="no-number no-toc" id="col-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#col-content-model">#</a>
</h2>
<div class="content-models">
@@ -4677,6 +4682,15 @@
</h2>
<div class="prose-model">
<p>Zero or more <a href="#col" class="element">col</a> elements</p>
+
+ <p>If the element does not have a
+ <a href="#colgroup.attrs.span" class="attribute">span</a>
+ attribute, zero or more
+ <a href="#col" class="element">col</a>
+ elements.</p>
+ <p>If the element has a
+ <a href="#colgroup.attrs.span" class="attribute">span</a>
+ attribute, empty.</p>
</div>
</div>
<div class="no-number no-toc" id="colgroup-content-model">
@@ -4810,7 +4824,12 @@
value is "<code>command</code>" represents a command with an
associated action.</p>
</div>
- <div class="no-number no-toc" id="command.command-content-model">
+ <div class="no-number no-toc" id="command.command-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#command.command-contents">#</a>
+</h2>
+<div class="prose-model"><p>Empty</p></div>
+</div>
+<div class="no-number no-toc" id="command.command-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#command.command-content-model">#</a>
</h2>
<div class="content-models">
@@ -4904,7 +4923,12 @@
value is "<code>radio</code>" represents
a selection of one item from a list of items.</p>
</div>
- <div class="no-number no-toc" id="command.radio-content-model">
+ <div class="no-number no-toc" id="command.radio-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#command.radio-contents">#</a>
+</h2>
+<div class="prose-model"><p>Empty</p></div>
+</div>
+<div class="no-number no-toc" id="command.radio-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#command.radio-content-model">#</a>
</h2>
<div class="content-models">
@@ -5012,7 +5036,12 @@
value is "<code>checkbox</code>" represents a state or option
that can be toggled.</p>
</div>
- <div class="no-number no-toc" id="command.checkbox-content-model">
+ <div class="no-number no-toc" id="command.checkbox-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#command.checkbox-contents">#</a>
+</h2>
+<div class="prose-model"><p>Empty</p></div>
+</div>
+<div class="no-number no-toc" id="command.checkbox-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#command.checkbox-content-model">#</a>
</h2>
<div class="content-models">
Index: colgroup.html
===================================================================
RCS file: /sources/public/html5/markup/colgroup.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- colgroup.html 29 Jan 2010 02:35:42 -0000 1.23
+++ colgroup.html 29 Jan 2010 02:51:40 -0000 1.24
@@ -20,6 +20,15 @@
</div>
<div class="no-number no-toc" id="colgroup-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#colgroup-contents">#</a></h2><div class="prose-model">
<p>Zero or more <a href="col.html#col" class="element">col</a> elements</p>
+
+ <p>If the element does not have a
+ <a href="colgroup.html#colgroup.attrs.span" class="attribute">span</a>
+ attribute, zero or more
+ <a href="col.html#col" class="element">col</a>
+ elements.</p>
+ <p>If the element has a
+ <a href="colgroup.html#colgroup.attrs.span" class="attribute">span</a>
+ attribute, empty.</p>
</div></div><div class="no-number no-toc" id="colgroup-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#colgroup-content-model">#</a></h2><div class="content-models">
Received on Friday, 29 January 2010 02:51:44 UTC