- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 29 Jan 2010 01:18:39 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv7858
Modified Files:
abbr.html address.html area.html article.html aside.html
audio.html spec.html terminology.html
Log Message:
prose model
Index: address.html
===================================================================
RCS file: /sources/public/html5/markup/address.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- address.html 29 Jan 2010 00:40:37 -0000 1.24
+++ address.html 29 Jan 2010 01:18:37 -0000 1.25
@@ -17,7 +17,13 @@
<p>The <a href="address.html#address" class="element">address</a>
element represents contact information.</p>
</div>
- <div class="no-number no-toc" id="address-content-model">
+ <div class="no-number no-toc" id="address-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#address-contents">#</a></h2><div class="prose-model">
+ <p>
+ <a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.flow">flow elements</a>
+ </p>
+ </div></div><div class="no-number no-toc" id="address-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#address-content-model">#</a></h2><div class="content-models">
<div id="address-mdls">
Index: abbr.html
===================================================================
RCS file: /sources/public/html5/markup/abbr.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- abbr.html 29 Jan 2010 00:40:37 -0000 1.22
+++ abbr.html 29 Jan 2010 01:18:37 -0000 1.23
@@ -18,7 +18,13 @@
<a href="abbr.html#abbr" class="element">abbr</a>
element represents an abbreviation or acronym.</p>
</div>
- <div class="no-number no-toc" id="abbr-content-model">
+ <div class="no-number no-toc" id="abbr-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#abbr-contents">#</a></h2><div class="prose-model">
+ <p>
+ <a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a>
+ </p>
+ </div></div><div class="no-number no-toc" id="abbr-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#abbr-content-model">#</a></h2><div class="content-models">
<div id="abbr-mdls">
Index: audio.html
===================================================================
RCS file: /sources/public/html5/markup/audio.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- audio.html 29 Jan 2010 00:40:37 -0000 1.28
+++ audio.html 29 Jan 2010 01:18:37 -0000 1.29
@@ -17,7 +17,18 @@
<p>An <a href="audio.html#audio" class="element">audio</a> element
represents an audio stream.</p>
</div>
- <div class="no-number no-toc" id="audio-content-model">
+ <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">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">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>
+ </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">
<dl id="audio-mdls">
Index: aside.html
===================================================================
RCS file: /sources/public/html5/markup/aside.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- aside.html 29 Jan 2010 00:40:37 -0000 1.25
+++ aside.html 29 Jan 2010 01:18:37 -0000 1.26
@@ -18,7 +18,13 @@
represents content that is tangentially related to the content
that forms the main textual flow of a document.</p>
</div>
- <div class="no-number no-toc" id="aside-content-model">
+ <div class="no-number no-toc" id="aside-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#aside-contents">#</a></h2><div class="prose-model">
+ <p>
+ <a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.flow">flow elements</a>
+ </p>
+ </div></div><div class="no-number no-toc" id="aside-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#aside-content-model">#</a></h2><div class="content-models">
<div id="aside-mdls">
Index: area.html
===================================================================
RCS file: /sources/public/html5/markup/area.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- area.html 29 Jan 2010 00:40:37 -0000 1.27
+++ area.html 29 Jan 2010 01:18:37 -0000 1.28
@@ -20,7 +20,9 @@
corresponding area on an image map, or a dead area on an
image map.</p>
</div>
- <div class="no-number no-toc" id="area-content-model">
+ <div class="no-number no-toc" id="area-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#area-contents">#</a></h2><div class="prose-model">
+ <p>Empty</p>
+ </div></div><div class="no-number no-toc" id="area-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#area-content-model">#</a></h2><div class="content-models">
<div id="area-mdls">
Index: terminology.html
===================================================================
RCS file: /sources/public/html5/markup/terminology.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- terminology.html 28 Jan 2010 23:22:14 -0000 1.21
+++ terminology.html 29 Jan 2010 01:18:37 -0000 1.22
@@ -80,17 +80,17 @@
<li>when element <var>foo</var> is a child of a
parent element <var>bar</var> whose content model
is allowed to contain
- <a href="common-models.html#common.elem.flow">flow content</a>,
+ <a href="common-models.html#common.elem.flow">flow elements</a>,
then the contents of element <var>foo</var> may also
contain
- <a href="common-models.html#common.elem.flow">flow content</a></li>
+ <a href="common-models.html#common.elem.flow">flow elements</a></li>
<li>when element <var>foo</var> is a child of a
parent element <var>baz</var> whose content model
- restricts it to only containing
- <a href="common-models.html#common.elem.phrasing">phrasing content</a>,
- then the contents of element <var>foo</var> are also
- restricted to only containing
- <a href="common-models.html#common.elem.phrasing">phrasing content</a></li>
+ restricts its child elements to only being
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a>,
+ then any child elements of element <var>foo</var> are also
+ restricted to only being
+ <a href="common-models.html#common.elem.phrasing">phrasing elements</a></li>
</ul>
</dd>
<dt><dfn id="view" title="view">view</dfn></dt>
Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- spec.html 29 Jan 2010 00:44:38 -0000 1.122
+++ spec.html 29 Jan 2010 01:18:37 -0000 1.123
@@ -780,18 +780,18 @@
<li>when element <var>foo</var> is a child of a
parent element <var>bar</var> whose content model
is allowed to contain
- <a href="#common.elem.flow">flow content</a>,
+ <a href="#common.elem.flow">flow elements</a>,
then the contents of element <var>foo</var> may also
contain
- <a href="#common.elem.flow">flow content</a>
+ <a href="#common.elem.flow">flow elements</a>
</li>
<li>when element <var>foo</var> is a child of a
parent element <var>baz</var> whose content model
- restricts it to only containing
- <a href="#common.elem.phrasing">phrasing content</a>,
- then the contents of element <var>foo</var> are also
- restricted to only containing
- <a href="#common.elem.phrasing">phrasing content</a>
+ restricts its child elements to only being
+ <a href="#common.elem.phrasing">phrasing elements</a>,
+ then any child elements of element <var>foo</var> are also
+ restricted to only being
+ <a href="#common.elem.phrasing">phrasing elements</a>
</li>
</ul>
</dd>
@@ -2794,7 +2794,18 @@
<a href="#abbr" class="element">abbr</a>
element represents an abbreviation or acronym.</p>
</div>
- <div class="no-number no-toc" id="abbr-content-model">
+ <div class="no-number no-toc" id="abbr-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#abbr-contents">#</a>
+</h2>
+<div class="prose-model">
+ <p>
+ <a href="#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="abbr-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#abbr-content-model">#</a>
</h2>
<div class="content-models">
@@ -2851,7 +2862,18 @@
<p>The <a href="#address" class="element">address</a>
element represents contact information.</p>
</div>
- <div class="no-number no-toc" id="address-content-model">
+ <div class="no-number no-toc" id="address-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#address-contents">#</a>
+</h2>
+<div class="prose-model">
+ <p>
+ <a href="#normal-character-data">Normal character data</a>
+ and
+ <a href="#common.elem.flow">flow elements</a>
+ </p>
+ </div>
+</div>
+<div class="no-number no-toc" id="address-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#address-content-model">#</a>
</h2>
<div class="content-models">
@@ -2940,7 +2962,14 @@
corresponding area on an image map, or a dead area on an
image map.</p>
</div>
- <div class="no-number no-toc" id="area-content-model">
+ <div class="no-number no-toc" id="area-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#area-contents">#</a>
+</h2>
+<div class="prose-model">
+ <p>Empty</p>
+ </div>
+</div>
+<div class="no-number no-toc" id="area-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#area-content-model">#</a>
</h2>
<div class="content-models">
@@ -3121,7 +3150,18 @@
of a document or site; for example, a magazine or newspaper
article, or a blog entry.</p>
</div>
- <div class="no-number no-toc" id="article-content-model">
+ <div class="no-number no-toc" id="article-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#article-contents">#</a>
+</h2>
+<div class="prose-model">
+ <p>
+ <a href="#normal-character-data">Normal character data</a>
+ and
+ <a href="#common.elem.flow">flow elements</a>
+ </p>
+ </div>
+</div>
+<div class="no-number no-toc" id="article-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#article-content-model">#</a>
</h2>
<div class="content-models">
@@ -3192,7 +3232,18 @@
represents content that is tangentially related to the content
that forms the main textual flow of a document.</p>
</div>
- <div class="no-number no-toc" id="aside-content-model">
+ <div class="no-number no-toc" id="aside-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#aside-contents">#</a>
+</h2>
+<div class="prose-model">
+ <p>
+ <a href="#normal-character-data">Normal character data</a>
+ and
+ <a href="#common.elem.flow">flow elements</a>
+ </p>
+ </div>
+</div>
+<div class="no-number no-toc" id="aside-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#aside-content-model">#</a>
</h2>
<div class="content-models">
@@ -3271,7 +3322,23 @@
<p>An <a href="#audio" class="element">audio</a> element
represents an audio stream.</p>
</div>
- <div class="no-number no-toc" id="audio-content-model">
+ <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.attrs.src">src</a>
+ attribute,
+ <a href="#transparent">transparent</a>.</p>
+ <p>If the element does not have a
+ <a href="#audio.attrs.src">src</a>
+ attribute: one or more
+ <a href="#source" class="#element">source</a>
+ elements, then,
+ <a href="#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: article.html
===================================================================
RCS file: /sources/public/html5/markup/article.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- article.html 29 Jan 2010 00:40:37 -0000 1.28
+++ article.html 29 Jan 2010 01:18:37 -0000 1.29
@@ -19,7 +19,13 @@
of a document or site; for example, a magazine or newspaper
article, or a blog entry.</p>
</div>
- <div class="no-number no-toc" id="article-content-model">
+ <div class="no-number no-toc" id="article-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#article-contents">#</a></h2><div class="prose-model">
+ <p>
+ <a href="syntax.html#normal-character-data">Normal character data</a>
+ and
+ <a href="common-models.html#common.elem.flow">flow elements</a>
+ </p>
+ </div></div><div class="no-number no-toc" id="article-content-model">
<h2 class="element-subhead">Content model <a class="hash" href="#article-content-model">#</a></h2><div class="content-models">
<div id="article-mdls">
Received on Friday, 29 January 2010 01:18:41 UTC