- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 29 Jan 2010 02:30:57 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup/elements
In directory hutz:/tmp/cvs-serv13937/elements
Modified Files:
a.html abbr.html address.html area.html article.html
aside.html b.html base.html bdo.html blockquote.html body.html
br.html button.button.html button.reset.html
button.submit.html canvas.html caption.html cite.html
code.html colgroup.html source.html
Log Message:
prose model
Index: body.html
===================================================================
RCS file: /sources/public/html5/markup/elements/body.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- body.html 29 Jan 2010 01:34:09 -0000 1.4
+++ body.html 29 Jan 2010 02:30:51 -0000 1.5
@@ -6,13 +6,7 @@
represents the body of a document (as opposed to the
document’s metadata).</p>
</div>
- <div id="prose-model">
- <p>
- <a href="#normal-character-data">Normal character data</a>
- and
- <a href="#common.elem.flow">flow elements</a>
- </p>
- </div>
+ <div id="prose-model">Flow content</div>
<div id="tags">
<p>A <code><a href="#body">body</a></code> element's <span
title="syntax-start-tag">start tag</span> may be omitted if
Index: address.html
===================================================================
RCS file: /sources/public/html5/markup/elements/address.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- address.html 29 Jan 2010 01:18:37 -0000 1.5
+++ address.html 29 Jan 2010 02:30:51 -0000 1.6
@@ -5,13 +5,7 @@
<p>The <a href="#address" class="element">address</a>
element represents contact information.</p>
</div>
- <div id="prose-model">
- <p>
- <a href="#normal-character-data">Normal character data</a>
- and
- <a href="#common.elem.flow">flow elements</a>
- </p>
- </div>
+ <div id="prose-model">Flow content</div>
<div id="details">
<p>If an <a href="#address" class="element">address</a>
element applies to a <a href="#body">body</a> element, then
Index: button.button.html
===================================================================
RCS file: /sources/public/html5/markup/elements/button.button.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- button.button.html 29 Jan 2010 01:34:09 -0000 1.4
+++ button.button.html 29 Jan 2010 02:30:54 -0000 1.5
@@ -7,13 +7,7 @@
value is "<code>button</code>" represents a button with no
additional semantics.</p>
</div>
- <div id="prose-model">
- <p>
- <a href="#normal-character-data">Normal character data</a>
- and
- <a href="#common.elem.phrasing">phrasing elements</a>
- </p>
- </div>
+ <div id="prose-model">Phrasing content</div>
<div id="attributes">
<dl>
<dt id="button.button.attrs.type">type</dt>
Index: abbr.html
===================================================================
RCS file: /sources/public/html5/markup/elements/abbr.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- abbr.html 29 Jan 2010 01:18:37 -0000 1.6
+++ abbr.html 29 Jan 2010 02:30:51 -0000 1.7
@@ -6,13 +6,7 @@
<a href="#abbr" class="element">abbr</a>
element represents an abbreviation or acronym.</p>
</div>
- <div id="prose-model">
- <p>
- <a href="#normal-character-data">Normal character data</a>
- and
- <a href="#common.elem.phrasing">phrasing elements</a>
- </p>
- </div>
+ <div id="prose-model">Phrasing content</div>
<div id="details">
<p>The <span class="attribute">title</span> attribute on the
<a href="#abbr" class="element">abbr</a> element represents the
Index: area.html
===================================================================
RCS file: /sources/public/html5/markup/elements/area.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- area.html 29 Jan 2010 01:18:37 -0000 1.7
+++ area.html 29 Jan 2010 02:30:51 -0000 1.8
@@ -8,9 +8,7 @@
corresponding area on an image map, or a dead area on an
image map.</p>
</div>
- <div id="prose-model">
- <p>Empty</p>
- </div>
+ <div id="prose-model">Empty</div>
<div id="attributes">
<dl>
<dt id="area.attrs.href">href</dt>
Index: a.html
===================================================================
RCS file: /sources/public/html5/markup/elements/a.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- a.html 29 Jan 2010 00:44:38 -0000 1.12
+++ a.html 29 Jan 2010 02:30:51 -0000 1.13
@@ -6,9 +6,7 @@
<a class="element" href="#a">a</a>
element represents a hyperlink.</p>
</div>
- <div id="prose-model">
- <p><a href="#transparent">Transparent</a></p>
- </div>
+ <div id="prose-model">Transparent</div>
<div id="attributes">
<dl>
<dt id="a.attrs.href">href</dt>
Index: bdo.html
===================================================================
RCS file: /sources/public/html5/markup/elements/bdo.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- bdo.html 29 Jan 2010 01:34:08 -0000 1.5
+++ bdo.html 29 Jan 2010 02:30:51 -0000 1.6
@@ -6,11 +6,5 @@
a means to specify a direction override of the Unicode BiDi
algorithm.</p>
</div>
- <div id="prose-model">
- <p>
- <a href="#normal-character-data">Normal character data</a>
- and
- <a href="#common.elem.phrasing">phrasing elements</a>
- </p>
- </div>
+ <div id="prose-model">Phrasing content</div>
</div>
Index: article.html
===================================================================
RCS file: /sources/public/html5/markup/elements/article.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- article.html 29 Jan 2010 01:18:38 -0000 1.5
+++ article.html 29 Jan 2010 02:30:51 -0000 1.6
@@ -7,13 +7,7 @@
of a document or site; for example, a magazine or newspaper
article, or a blog entry.</p>
</div>
- <div id="prose-model">
- <p>
- <a href="#normal-character-data">Normal character data</a>
- and
- <a href="#common.elem.flow">flow elements</a>
- </p>
- </div>
+ <div id="prose-model">Flow content</div>
<div id="attributes">
<dl>
<dt id="article.attrs.cite">cite</dt>
Index: b.html
===================================================================
RCS file: /sources/public/html5/markup/elements/b.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- b.html 29 Jan 2010 01:34:08 -0000 1.5
+++ b.html 29 Jan 2010 02:30:51 -0000 1.6
@@ -8,11 +8,5 @@
document abstract, product names in a review, or other spans
of text whose typical typographic presentation is bold text.</p>
</div>
- <div id="prose-model">
- <p>
- <a href="#normal-character-data">Normal character data</a>
- and
- <a href="#common.elem.phrasing">phrasing elements</a>
- </p>
- </div>
+ <div id="prose-model">Phrasing content</div>
</div>
Index: br.html
===================================================================
RCS file: /sources/public/html5/markup/elements/br.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- br.html 29 Jan 2010 01:34:09 -0000 1.4
+++ br.html 29 Jan 2010 02:30:52 -0000 1.5
@@ -5,7 +5,5 @@
<p>The <a href="#br" class="element">br</a> element represents
a line break.</p>
</div>
- <div id="prose-model">
- <p>Empty</p>
- </div>
+ <div id="prose-model">Empty</div>
</div>
Index: blockquote.html
===================================================================
RCS file: /sources/public/html5/markup/elements/blockquote.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- blockquote.html 29 Jan 2010 01:34:08 -0000 1.5
+++ blockquote.html 29 Jan 2010 02:30:51 -0000 1.6
@@ -6,13 +6,7 @@
element represents a section that is quoted from another
source.</p>
</div>
- <div id="prose-model">
- <p>
- <a href="#normal-character-data">Normal character data</a>
- and
- <a href="#common.elem.flow">flow elements</a>
- </p>
- </div>
+ <div id="prose-model">Flow content</div>
<div id="attributes">
<dl>
<dt id="blockquote.attrs.cite">cite</dt>
Index: aside.html
===================================================================
RCS file: /sources/public/html5/markup/elements/aside.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- aside.html 29 Jan 2010 01:18:38 -0000 1.5
+++ aside.html 29 Jan 2010 02:30:51 -0000 1.6
@@ -6,13 +6,7 @@
represents content that is tangentially related to the content
that forms the main textual flow of a document.</p>
</div>
- <div id="prose-model">
- <p>
- <a href="#normal-character-data">Normal character data</a>
- and
- <a href="#common.elem.flow">flow elements</a>
- </p>
- </div>
+ <div id="prose-model">Flow content</div>
<div id="details">
<p>In printed documents, the type of tangential content that
the <a href="#aside">aside</a> element represents is sometimes
Index: colgroup.html
===================================================================
RCS file: /sources/public/html5/markup/elements/colgroup.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- colgroup.html 8 Jan 2009 10:19:31 -0000 1.3
+++ colgroup.html 29 Jan 2010 02:30:55 -0000 1.4
@@ -7,12 +7,18 @@
href="#table" class="element">table</a> that is its
parent.</p>
</div>
+ <div id="prose-model">
+ <p>Zero or more <a href="#col" class="element">col</a> elements</p>
<div id="attributes">
<dl>
<dt id="colgroup.attrs.span">span</dt>
<dd>The number of columns in the group.</dd>
</dl>
</div>
+ <ul id="constraints">
+ <li>A “colgroup” element that contains any “col” element
+ children must not have a “span” attribute.</li>
+ </ul>
<div id="tags">
<p>A <code><a href="#colgroup">colgroup</a></code> element's
<span title="syntax-start-tag">start tag</span> may be omitted
Index: source.html
===================================================================
RCS file: /sources/public/html5/markup/elements/source.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- source.html 16 Aug 2009 15:46:28 -0000 1.9
+++ source.html 29 Jan 2010 02:30:55 -0000 1.10
@@ -8,8 +8,9 @@
enables multiple <a href="#media-source">media sources</a> to
be specified for
<a href="#audio" class="element">audio</a>
+ and
<a href="#video" class="element">video</a>
- .</p>
+ elements.</p>
</div>
<div id="details">
<p>Each separate
Index: button.reset.html
===================================================================
RCS file: /sources/public/html5/markup/elements/button.reset.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- button.reset.html 29 Jan 2010 01:34:09 -0000 1.4
+++ button.reset.html 29 Jan 2010 02:30:54 -0000 1.5
@@ -7,13 +7,7 @@
value is "<code>reset</code>" represents a button for
resetting a form.</p>
</div>
- <div id="prose-model">
- <p>
- <a href="#normal-character-data">Normal character data</a>
- and
- <a href="#common.elem.phrasing">phrasing elements</a>
- </p>
- </div>
+ <div id="prose-model">Phrasing content</div>
<div id="attributes">
<dl>
<dt id="button.reset.attrs.type">type</dt>
Index: code.html
===================================================================
RCS file: /sources/public/html5/markup/elements/code.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- code.html 8 Jan 2009 10:19:31 -0000 1.3
+++ code.html 29 Jan 2010 02:30:54 -0000 1.4
@@ -5,4 +5,5 @@
<p>The <a href="#code" class="element">code</a> element
represents a fragment of computer code.</p>
</div>
+ <div id="prose-model">Phrasing content</div>
</div>
Index: button.submit.html
===================================================================
RCS file: /sources/public/html5/markup/elements/button.submit.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- button.submit.html 29 Jan 2010 01:34:09 -0000 1.4
+++ button.submit.html 29 Jan 2010 02:30:54 -0000 1.5
@@ -7,13 +7,7 @@
value is "<code>submit</code>" represents a button for
submitting a form.</p>
</div>
- <div id="prose-model">
- <p>
- <a href="#normal-character-data">Normal character data</a>
- and
- <a href="#common.elem.phrasing">phrasing elements</a>
- </p>
- </div>
+ <div id="prose-model">Phrasing content</div>
<div id="attributes">
<dl>
<dt id="button.submit.attrs.type">type</dt>
Index: canvas.html
===================================================================
RCS file: /sources/public/html5/markup/elements/canvas.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- canvas.html 8 Jan 2009 10:19:31 -0000 1.3
+++ canvas.html 29 Jan 2010 02:30:54 -0000 1.4
@@ -7,6 +7,7 @@
used for dynamically rendering of images such as game
graphics, graphs, or other images.</p>
</div>
+ <div id="prose-model">Transparent</div>
<div id="attributes">
<dl>
<dt id="canvas.attrs.width">width</dt>
Index: base.html
===================================================================
RCS file: /sources/public/html5/markup/elements/base.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- base.html 29 Jan 2010 01:34:08 -0000 1.6
+++ base.html 29 Jan 2010 02:30:51 -0000 1.7
@@ -8,9 +8,7 @@
<a href="#context">browsing context</a> name
for the purposes of following hyperlinks.</p>
</div>
- <div id="prose-model">
- <p>Empty</p>
- </div>
+ <div id="prose-model">Empty</div>
<div id="attributes">
<dl>
<dt id="base.attrs.href">href</dt>
Index: cite.html
===================================================================
RCS file: /sources/public/html5/markup/elements/cite.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cite.html 8 Jan 2009 10:19:31 -0000 1.3
+++ cite.html 29 Jan 2010 02:30:54 -0000 1.4
@@ -7,4 +7,5 @@
of a book mentioned within the main text flow of a
document.</p>
</div>
+ <div id="prose-model">Phrasing content</div>
</div>
Index: caption.html
===================================================================
RCS file: /sources/public/html5/markup/elements/caption.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- caption.html 8 Jan 2009 10:19:31 -0000 1.3
+++ caption.html 29 Jan 2010 02:30:54 -0000 1.4
@@ -1,6 +1,7 @@
<div xmlns="http://www.w3.org/1999/xhtml">
<h4>The caption element</h4>
<div id="shortdesc">table title</div>
+ <div id="prose-model">Flow content</div>
<div id="longdesc">
<p>The <a href="#caption" class="element">caption</a> element
represents the title of the <a href="#table"
Received on Friday, 29 January 2010 02:30:59 UTC