W3C home > Mailing lists > Public > public-html-commits@w3.org > January 2010

html5/markup/elements input.hidden.html,1.2,1.3 input.image.html,1.2,1.3 input.month.html,1.2,1.3 input.number.html,1.3,1.4 input.password.html,1.2,1.3 input.radio.html,1.2,1.3 input.range.html,1.2,1.3 input.reset.html,1.2,1.3 input.search.html,1.2,1.3 input.submit.html,1.2,1.3 input.tel.html,1.1,1.2 input.text.html,1.2,1.3 input.time.html,1.2,1.3 input.url.html,1.2,1.3 input.week.html,1.2,1.3 ins.html,1.4,1.5 kbd.html,1.4,1.5 keygen.html,1.1,1.2 label.html,1.5,1.6 legend.html,1.3,1.4 li.html,1.4,1.5 link.html,1.6,1.7 map.html,1.4,1.5 mark.html,1.3,1.4 menu.html,1.4,1.5 meta.charset.html,1.3,1.4 meta.http-equiv.content-language.html,1.1,1.2 meta.http-equiv.content-type.html,1.3,1.4 meta.http-equiv.default-style.html,1.4,1.5 meta.http-equiv.refresh.html,1.2,1.3 meta.name.html,1.3,1.4 meter.html,1.6,1.7 nav.html,1.5,1.6 noscript.html,1.4,1.5 object.html,1.9,1.10 ol.html,1.5,1.6 optgroup.html,1.4,1.5 option.html,1.4,1.5 output.html,1.3,1.4 p.html,1.7,1.8 param.html,1.3,1.4 pre.html,1.3,1.4 progress.htm

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Sun, 31 Jan 2010 06:11:07 +0000
To: Message-Id: <E1NbT1X-0007UJ-Fa@lionel-hutz.w3.org>
Update of /sources/public/html5/markup/elements
In directory hutz:/tmp/cvs-serv28551/elements

Modified Files:
	input.hidden.html input.image.html input.month.html 
	input.number.html input.password.html input.radio.html 
	input.range.html input.reset.html input.search.html 
	input.submit.html input.tel.html input.text.html 
	input.time.html input.url.html input.week.html ins.html 
	kbd.html keygen.html label.html legend.html li.html link.html 
	map.html mark.html menu.html meta.charset.html 
	meta.http-equiv.content-language.html 
	meta.http-equiv.content-type.html 
	meta.http-equiv.default-style.html 
	meta.http-equiv.refresh.html meta.name.html meter.html 
	nav.html noscript.html object.html ol.html optgroup.html 
	option.html output.html p.html param.html pre.html 
	progress.html q.html rp.html rt.html ruby.html samp.html 
	script.html section.html select.html small.html source.html 
	span.html strong.html style.html sub.html sup.html table.html 
	tbody.html td.html textarea.html tfoot.html th.html thead.html 
	time.html title.html tr.html ul.html var.html video.html 
Log Message:
checkpointing

Index: optgroup.html
===================================================================
RCS file: /sources/public/html5/markup/elements/optgroup.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- optgroup.html	15 Feb 2009 02:07:27 -0000	1.4
+++ optgroup.html	31 Jan 2010 06:11:04 -0000	1.5
@@ -6,6 +6,11 @@
     element represents a group of <a href="#option"
     class="element">option</a> elements with a common label.</p>
   </div>
+  <div id="prose-model">
+    <p>Zero or more
+    <a href="#option" class="element">option</a>
+    elements</p>
+  </div>
   <div id="attributes">
     <dl>
       <dt id="optgroup.attrs.label">label</dt>

Index: option.html
===================================================================
RCS file: /sources/public/html5/markup/elements/option.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- option.html	15 Feb 2009 02:07:27 -0000	1.4
+++ option.html	31 Jan 2010 06:11:04 -0000	1.5
@@ -10,6 +10,11 @@
     among the list of suggestions in a <a href="#datalist"
     class="element">datalist</a>.</p>
   </div>
+  <div id="prose-model">
+    <p>
+    <a href="#normal-character-data">Normal character data</a>
+    </p>
+  </div>
   <div id="attributes">
     <dl>
       <dt id="option.attrs.label">label</dt>

Index: link.html
===================================================================
RCS file: /sources/public/html5/markup/elements/link.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- link.html	2 Aug 2009 07:07:46 -0000	1.6
+++ link.html	31 Jan 2010 06:11:03 -0000	1.7
@@ -7,6 +7,7 @@
     element represents metadata that expresses inter-document
     relationships.</p>
   </div>
+  <div id="prose-model">Empty</div>
   <div id="attributes">
     <dl>
       <dt id="link.attrs.href">href</dt>

Index: input.range.html
===================================================================
RCS file: /sources/public/html5/markup/elements/input.range.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- input.range.html	13 Feb 2009 12:07:30 -0000	1.2
+++ input.range.html	31 Jan 2010 06:11:02 -0000	1.3
@@ -8,6 +8,7 @@
     an imprecise control for setting the element’s value to a
     string representing a number.</p>
   </div>
+  <div id="prose-model">Empty</div>
   <div id="attributes">
     <dl>
       <dt id="input.range.attrs.type">type</dt>

Index: meta.http-equiv.refresh.html
===================================================================
RCS file: /sources/public/html5/markup/elements/meta.http-equiv.refresh.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- meta.http-equiv.refresh.html	13 Feb 2009 12:07:30 -0000	1.2
+++ meta.http-equiv.refresh.html	31 Jan 2010 06:11:03 -0000	1.3
@@ -11,6 +11,7 @@
     place of the current page, and the URL for the replacement
     page.</p>
   </div>
+  <div id="prose-model">Empty</div>
   <div id="attributes">
     <dl>
       <dt id="meta.http-equiv.attrs.http-equiv.refresh">http-equiv</dt>

Index: map.html
===================================================================
RCS file: /sources/public/html5/markup/elements/map.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- map.html	4 Aug 2009 15:46:34 -0000	1.4
+++ map.html	31 Jan 2010 06:11:03 -0000	1.5
@@ -6,6 +6,7 @@
     conjunction with any <a href="#area" class="element">area</a>
     element descendants, defines an image map.</p>
   </div>
+  <div id="prose-model">Transparent</div>
   <div id="attributes">
     <dl>
       <dt id="map.attrs.name">name</dt>

Index: small.html
===================================================================
RCS file: /sources/public/html5/markup/elements/small.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- small.html	25 Feb 2009 08:07:57 -0000	1.4
+++ small.html	31 Jan 2010 06:11:04 -0000	1.5
@@ -6,4 +6,5 @@
     represents so-called “small print” such as legal disclaimers
     and caveats.</p>
   </div>
+  <div id="prose-model">Phrasing content</div>
 </div>

Index: rp.html
===================================================================
RCS file: /sources/public/html5/markup/elements/rp.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rp.html	25 Feb 2009 08:07:57 -0000	1.4
+++ rp.html	31 Jan 2010 06:11:04 -0000	1.5
@@ -7,6 +7,7 @@
     ruby annotation, to be shown by UAs that don’t support
     ruby annotations.</p>
   </div>
+  <div id="prose-model">Phrasing content</div>
   <div id="tags">
     <p>An <code><a href="#rp">rp</a></code> element must have a
     <span title="syntax-start-tag">start tag</span>.</p>

Index: input.week.html
===================================================================
RCS file: /sources/public/html5/markup/elements/input.week.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- input.week.html	13 Feb 2009 12:07:30 -0000	1.2
+++ input.week.html	31 Jan 2010 06:11:03 -0000	1.3
@@ -8,6 +8,7 @@
     a control for setting the element’s value to a string
     representing a week.</p>
   </div>
+  <div id="prose-model">Empty</div>
   <div id="attributes">
     <dl>
       <dt id="input.week.attrs.type">type</dt>

Index: input.text.html
===================================================================
RCS file: /sources/public/html5/markup/elements/input.text.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- input.text.html	13 Feb 2009 12:07:30 -0000	1.2
+++ input.text.html	31 Jan 2010 06:11:02 -0000	1.3
@@ -9,6 +9,7 @@
       class="element">input</a> element’s <a
     href="#input.text.attrs.value">value</a>.</p>
   </div>
+  <div id="prose-model">Empty</div>
   <div id="attributes">
     <dl>
       <dt id="input.text.attrs.type">type</dt>

Index: input.radio.html
===================================================================
RCS file: /sources/public/html5/markup/elements/input.radio.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- input.radio.html	13 Feb 2009 12:07:30 -0000	1.2
+++ input.radio.html	31 Jan 2010 06:11:02 -0000	1.3
@@ -8,6 +8,7 @@
     a selection of one item from a list of items (a radio
     button).</p>
   </div>
+  <div id="prose-model">Empty</div>
   <div id="attributes">
     <dl>
       <dt id="input.radio.attrs.type">type</dt>

Index: samp.html
===================================================================
RCS file: /sources/public/html5/markup/elements/samp.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- samp.html	15 Feb 2009 18:31:39 -0000	1.3
+++ samp.html	31 Jan 2010 06:11:04 -0000	1.4
@@ -6,4 +6,5 @@
     represents (sample) output from a program or computing
     system.</p>
   </div>
+  <div id="prose-model">Phrasing content</div>
 </div>

Index: nav.html
===================================================================
RCS file: /sources/public/html5/markup/elements/nav.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- nav.html	29 Jul 2009 07:19:25 -0000	1.5
+++ nav.html	31 Jan 2010 06:11:04 -0000	1.6
@@ -7,6 +7,7 @@
     documents or to parts within the document itself; that is, a
     section of navigation links.</p>
   </div>
+  <div id="prose-model">Flow content</div>
   <div id="details">
     <p>Not all groups of links on a page need to be in a <a
       href="#nav" class="element">nav</a> element &#x2014; only

Index: mark.html
===================================================================
RCS file: /sources/public/html5/markup/elements/mark.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mark.html	13 Feb 2009 12:07:30 -0000	1.3
+++ mark.html	31 Jan 2010 06:11:03 -0000	1.4
@@ -7,4 +7,5 @@
     for reference purposes, due to its relevance in another
     context.</p>
   </div>
+  <div id="prose-model">Phrasing content</div>
 </div>

Index: param.html
===================================================================
RCS file: /sources/public/html5/markup/elements/param.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- param.html	15 Feb 2009 02:07:27 -0000	1.3
+++ param.html	31 Jan 2010 06:11:04 -0000	1.4
@@ -6,6 +6,7 @@
     defines parameters for plugins invoked by <a href="#object"
     class="element">object</a> elements.</p>
   </div>
+  <div id="prose-model">Empty</div>
   <div id="attributes">
     <dl>
       <dt id="param.attrs.name">name</dt>

Index: legend.html
===================================================================
RCS file: /sources/public/html5/markup/elements/legend.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- legend.html	13 Feb 2009 12:07:30 -0000	1.3
+++ legend.html	31 Jan 2010 06:11:03 -0000	1.4
@@ -7,4 +7,5 @@
     contents of the <a href="#legend" class="element">legend</a>
     element’s parent element.</p>
   </div>
+  <div id="prose-model">Phrasing content</div>
 </div>

Index: span.html
===================================================================
RCS file: /sources/public/html5/markup/elements/span.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- span.html	29 Jul 2009 11:23:47 -0000	1.5
+++ span.html	31 Jan 2010 06:11:04 -0000	1.6
@@ -6,6 +6,7 @@
     generic wrapper for phrasing content that by itself does not
     represent anything.</p>
   </div>
+  <div id="prose-model">Phrasing content</div>
   <div id="details">
     <p>The <a href="#span" class="element">span</a> element is a
     can be used with attributes such as

Index: object.html
===================================================================
RCS file: /sources/public/html5/markup/elements/object.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- object.html	16 Aug 2009 10:53:45 -0000	1.9
+++ object.html	31 Jan 2010 06:11:04 -0000	1.10
@@ -12,6 +12,13 @@
     nested browsing context, or as external content to be
     processed by a plugin.</p>
   </div>
+  <div id="prose-model">
+    <p>Zero or more
+    <a href="#param" class="element">param</a>
+    elements, then,
+    <a href="#transparent">transparent</a>
+    </p>
+  </div>
   <div id="attributes">
     <dl>
       <dt id="object.attrs.data">data</dt>

Index: input.reset.html
===================================================================
RCS file: /sources/public/html5/markup/elements/input.reset.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- input.reset.html	13 Feb 2009 12:07:30 -0000	1.2
+++ input.reset.html	31 Jan 2010 06:11:02 -0000	1.3
@@ -7,6 +7,7 @@
     value is "<code>reset</code>" represents a button for
     resetting a form.</p>
   </div>
+  <div id="prose-model">Empty</div>
   <div id="attributes">
     <dl>
       <dt id="input.reset.attrs.type">type</dt>

Index: ol.html
===================================================================
RCS file: /sources/public/html5/markup/elements/ol.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ol.html	16 Jun 2009 06:49:01 -0000	1.5
+++ ol.html	31 Jan 2010 06:11:04 -0000	1.6
@@ -7,6 +7,11 @@
     items are intentionally ordered, such that changing the order
     would change the meaning of the list.</p>
   </div>
+  <div id="prose-model">
+    <p>Zero or more
+    <a href="#li" class="element">li</a>
+    elements</p>
+  </div>
   <div id="attributes">
     <dl>
       <dt id="ol.attrs.reversed">reversed</dt>

Index: input.tel.html
===================================================================
RCS file: /sources/public/html5/markup/elements/input.tel.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- input.tel.html	5 Jun 2009 08:58:36 -0000	1.1
+++ input.tel.html	31 Jan 2010 06:11:02 -0000	1.2
@@ -7,6 +7,7 @@
     value is "<code>tel</code>" represents a one-line plain-text
     edit control for entering a telephone number.</p>
   </div>
+  <div id="prose-model">Empty</div>
   <div id="attributes">
     <dl>
       <dt id="input.tel.attrs.type">type</dt>

Index: kbd.html
===================================================================
RCS file: /sources/public/html5/markup/elements/kbd.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kbd.html	29 Jul 2009 11:23:47 -0000	1.4
+++ kbd.html	31 Jan 2010 06:11:03 -0000	1.5
@@ -5,6 +5,7 @@
     <p>The <a href="#kbd" class="element">kbd</a> element
     represents user input.</p>
   </div>
+  <div id="prose-model">Phrasing content</div>
   <div id="details">
     <p>The <a href="#kbd" class="element">kbd</a> element
     typically represents keyboard input, though it may also

Index: tr.html
===================================================================
RCS file: /sources/public/html5/markup/elements/tr.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tr.html	15 Feb 2009 19:00:43 -0000	1.3
+++ tr.html	31 Jan 2010 06:11:04 -0000	1.4
@@ -5,6 +5,20 @@
     <p>The <a href="#tr" class="element">tr</a> element represents
     a row of cells in a table.</p>
   </div>
+  <div id="prose-model">
+    <p>When the parent node is a
+    <a href="#thead" class="element">thead</a>
+    element, zero or more
+    <a href="#th" class="element">th</a>
+    elements</p>
+    <p>When the parent node is not a
+    <a href="#thead" class="element">thead</a>
+    element, zero or more
+    <a href="#th" class="element">th</a>
+    or
+    <a href="#td" class="element">td</a>
+    elements</p>
+  </div>
   <div id="tags">
     <p>A <code><a href="#tr">tr</a></code> element must have a
     <span title="syntax-start-tag">start tag</span>.</p>

Index: input.month.html
===================================================================
RCS file: /sources/public/html5/markup/elements/input.month.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- input.month.html	13 Feb 2009 12:07:30 -0000	1.2
+++ input.month.html	31 Jan 2010 06:11:02 -0000	1.3
@@ -8,6 +8,7 @@
     a control for setting the element’s value to a string
     representing a month.</p>
   </div>
+  <div id="prose-model">Empty</div>
   <div id="attributes">
     <dl>
       <dt id="input.month.attrs.type">type</dt>

Index: pre.html
===================================================================
RCS file: /sources/public/html5/markup/elements/pre.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pre.html	15 Feb 2009 02:07:27 -0000	1.3
+++ pre.html	31 Jan 2010 06:11:04 -0000	1.4
@@ -7,4 +7,5 @@
     represented by typographic conventions rather than by
     elements.</p>
   </div>
+  <div id="prose-model">Phrasing content</div>
 </div>

Index: q.html
===================================================================
RCS file: /sources/public/html5/markup/elements/q.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- q.html	15 Feb 2009 18:31:39 -0000	1.3
+++ q.html	31 Jan 2010 06:11:04 -0000	1.4
@@ -5,6 +5,7 @@
     <p>The <a href="#q" class="element">q</a> element represents
     phrasing content quoted from another source.</p>
   </div>
+  <div id="prose-model">Phrasing content</div>
   <div id="attributes">
     <dl>
       <dt id="q.attrs.cite">cite</dt>

Index: ins.html
===================================================================
RCS file: /sources/public/html5/markup/elements/ins.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ins.html	30 May 2009 12:05:46 -0000	1.4
+++ ins.html	31 Jan 2010 06:11:03 -0000	1.5
@@ -6,6 +6,7 @@
     represents a range of text that has been inserted (added) to
     a document.</p>
   </div>
+  <div id="prose-model">Transparent</div>
   <div id="attributes">
     <dl>
       <dt id="ins.attrs.cite">cite</dt>

Index: p.html
===================================================================
RCS file: /sources/public/html5/markup/elements/p.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- p.html	28 Jan 2010 17:11:53 -0000	1.7
+++ p.html	31 Jan 2010 06:11:04 -0000	1.8
@@ -5,6 +5,7 @@
     <p>The <a href="#p" class="element">p</a> element represents a
     paragraph.</p>
   </div>
+  <div id="prose-model">Phrasing content</div>
   <div id="tags">
     <p>A <code><a href="#p">p</a></code> element must have a <span title="syntax-start-tag">start tag</span>.</p>
     <p>A <code><a href="#p">p</a></code> element's <span title="syntax-end-tag">end tag</span> may be omitted if the

Index: label.html
===================================================================
RCS file: /sources/public/html5/markup/elements/label.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- label.html	21 Aug 2009 13:10:59 -0000	1.5
+++ label.html	31 Jan 2010 06:11:03 -0000	1.6
@@ -5,6 +5,7 @@
     <p>The <a href="#label" class="element">label</a> element
     represents a caption for a form control.</p>
   </div>
+  <div id="prose-model">Phrasing content</div>
   <div id="attributes">
     <dl>
       <dt id="label.attrs.for">for</dt>

Index: select.html
===================================================================
RCS file: /sources/public/html5/markup/elements/select.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- select.html	16 Jun 2009 06:49:01 -0000	1.3
+++ select.html	31 Jan 2010 06:11:04 -0000	1.4
@@ -6,6 +6,13 @@
     represents a control for selecting among a list of
     options.</p>
   </div>
+  <div id="prose-model">
+    <p>Zero or more
+    <a href="#option" class="element">option</a>
+    or
+    <a href="#optgroup" class="element">optgroup</a>
+    elements.</p>
+  </div>
   <div class="attributes">
     <dl>
       <dt id="select.attrs.multiple">multiple</dt>

Index: keygen.html
===================================================================
RCS file: /sources/public/html5/markup/elements/keygen.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- keygen.html	5 Jun 2009 09:23:17 -0000	1.1
+++ keygen.html	31 Jan 2010 06:11:03 -0000	1.2
@@ -6,6 +6,7 @@
     represents a control for generating a public-private key
     pair and for submitting the public key from that key pair.</p>
   </div>
+  <div id="prose-model">Empty</div>
   <div class="attributes">
     <dl>
       <dt id="keygen.attrs.challenge">challenge</dt>

Index: input.number.html
===================================================================
RCS file: /sources/public/html5/markup/elements/input.number.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- input.number.html	13 Feb 2009 12:07:30 -0000	1.3
+++ input.number.html	31 Jan 2010 06:11:02 -0000	1.4
@@ -8,6 +8,7 @@
     a precise control for setting the element’s value to a
     string representing a number.</p>
   </div>
+  <div id="prose-model">Empty</div>
   <div id="attributes">
     <dl>
       <dt id="input.number.attrs.type">type</dt>

Index: noscript.html
===================================================================
RCS file: /sources/public/html5/markup/elements/noscript.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- noscript.html	29 Jul 2009 11:23:47 -0000	1.4
+++ noscript.html	31 Jan 2010 06:11:04 -0000	1.5
@@ -7,9 +7,18 @@
     that don’t support scripting, by affecting how the document is
     parsed.</p>
   </div>
-  <div id="constraints">
-    <p>The <code><a href="#noscript">noscript</a></code> element
-    must not be used in a <a href="#syntax-document-xml"
-      >document in the XML syntax</a>.</p>
+  <div id="prose-model">
+    <p>In a
+    <a href="#head" class="element">head</a>
+    element</p>
+    <p>
+    <a href="#normal-character-data">Normal character data</a>
+    <a href="#common.elem.phrasing">phrasing elements</a>
+    </p>
   </div>
+  <ul id="constraints">
+    <li>The <code><a href="#noscript">noscript</a></code> element
+    must not be used in a <a href="#syntax-document-xml"
+      >document in the XML syntax</a>.</li>
+  </ul>
 </div>

Index: table.html
===================================================================
RCS file: /sources/public/html5/markup/elements/table.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- table.html	21 Jul 2009 07:45:08 -0000	1.5
+++ table.html	31 Jan 2010 06:11:04 -0000	1.6
@@ -6,6 +6,31 @@
     represents a table; that is, data with more than one
     dimension.</p>
   </div>
+  <div id="prose-model">
+    <p>In this order: optionally a
+    <a href="#caption" class="element">caption</a>
+    element, followed by zero or more
+    <a href="#colgroup" class="element">colgroup</a>
+    elements, optionally followed by a
+    <a href="#thead" class="element">colgroup</a>
+    element, followed by one of the following:</p>
+    <ul>
+      <li>a
+      <a href="#tfoot" class="element">tfoot</a>
+      element, followed by either zero or more
+      <a href="#tbody" class="element">tbody</a>
+      elements or one or more
+      <a href="#tr" class="element">tr</a>
+      </li>
+      <li>or, either zero or more
+      <a href="#tbody" class="element">tbody</a>
+      elements or one or more
+      <a href="#tr" class="element">tr</a>
+      elements, optionally followed by a
+      <a href="#tfoot" class="element">tfoot</a>
+      element</li>
+    </ul>
+  </div>
   <div class="attributes">
     <dl>
       <dt id="table.attrs.summary">summary</dt>

Index: thead.html
===================================================================
RCS file: /sources/public/html5/markup/elements/thead.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- thead.html	16 Aug 2009 10:53:45 -0000	1.5
+++ thead.html	31 Jan 2010 06:11:04 -0000	1.6
@@ -8,6 +8,11 @@
     <a href="#table" class="element">table</a>
     element.</p>
   </div>
+  <div id="prose-model">
+    <p>Zero or more
+    <a href="#tr" class="element">tr</a>
+    elements</p>
+  </div>
   <div id="tags">
     <p>A <code><a href="#thead">thead</a></code> element must have
     a <span title="syntax-start-tag">start tag</span>.</p>

Index: tbody.html
===================================================================
RCS file: /sources/public/html5/markup/elements/tbody.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tbody.html	19 Feb 2009 03:00:11 -0000	1.4
+++ tbody.html	31 Jan 2010 06:11:04 -0000	1.5
@@ -7,6 +7,11 @@
     its parent <a href="#table" class="element">table</a>
     element.</p>
   </div>
+  <div id="prose-model">
+    <p>Zero or more
+    <a href="#tr" class="element">tr</a>
+    elements</p>
+  </div>
   <div id="tags">
     <p>A <code><a href="#tbody">tbody</a></code> element's <span
       title="syntax-start-tag">start tag</span> may be omitted if

Index: td.html
===================================================================
RCS file: /sources/public/html5/markup/elements/td.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- td.html	21 Aug 2009 13:10:59 -0000	1.5
+++ td.html	31 Jan 2010 06:11:04 -0000	1.6
@@ -5,6 +5,7 @@
     <p>The <a href="#td" class="element">td</a> element represents
     a data cell in a table.</p>
   </div>
+  <div id="prose-model">Flow content</div>
   <div id="attributes">
     <dl>
       <dt id="td.attrs.headers">headers</dt>

Index: video.html
===================================================================
RCS file: /sources/public/html5/markup/elements/video.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- video.html	15 Jun 2009 20:27:02 -0000	1.5
+++ video.html	31 Jan 2010 06:11:05 -0000	1.6
@@ -5,6 +5,18 @@
     <p>The <a href="#video" class="element">video</a> element
     represents a video or movie.</p>
   </div>
+  <div id="prose-model">
+    <p>If the element does not have a
+    <a href="#video.attrs.src" class="attribute">src</a>
+    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="#video.attrs.src" class="attribute">src</a>
+    attribute,
+    <a href="#transparent">transparent</a>.</p>
+  </div>
   <div id="attributes">
     <dl>
       <dt id="video.attrs.poster">poster</dt>

Index: input.time.html
===================================================================
RCS file: /sources/public/html5/markup/elements/input.time.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- input.time.html	13 Feb 2009 12:07:30 -0000	1.2
+++ input.time.html	31 Jan 2010 06:11:02 -0000	1.3
@@ -8,6 +8,7 @@
     a control for setting the element’s value to a string
     representing a time (with no timezone information).</p>
   </div>
+  <div id="prose-model">Empty</div>
   <div id="attributes">
     <dl>
       <dt id="input.time.attrs.type">type</dt>

Index: source.html
===================================================================
RCS file: /sources/public/html5/markup/elements/source.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- source.html	29 Jan 2010 02:30:55 -0000	1.10
+++ source.html	31 Jan 2010 06:11:04 -0000	1.11
@@ -12,6 +12,7 @@
     <a href="#video" class="element">video</a>
     elements.</p>
   </div>
+  <div id="prose-model">Empty</div>
   <div id="details">
     <p>Each separate
     <dfn

Index: meta.http-equiv.content-type.html
===================================================================
RCS file: /sources/public/html5/markup/elements/meta.http-equiv.content-type.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- meta.http-equiv.content-type.html	29 Jul 2009 11:23:47 -0000	1.3
+++ meta.http-equiv.content-type.html	31 Jan 2010 06:11:03 -0000	1.4
@@ -12,6 +12,7 @@
       href="#encoding-declaration">character encoding
       declaration</a>.</p>
   </div>
+  <div id="prose-model">Empty</div>
   <div id="details">
     <p>A <a href="#meta" class="element">meta</a> element with a
     <span class="attribute">http-equiv</span> attribute whose

Index: meta.charset.html
===================================================================
RCS file: /sources/public/html5/markup/elements/meta.charset.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- meta.charset.html	16 Jun 2009 06:49:01 -0000	1.3
+++ meta.charset.html	31 Jan 2010 06:11:03 -0000	1.4
@@ -8,6 +8,7 @@
       href="#encoding-declaration">character encoding
       declaration</a>.</p>
   </div>
+  <div id="prose-model">Empty</div>
   <div id="attributes">
     <dl>
       <dt id="meta.charset.attrs.charset">charset</dt>

Index: input.password.html
===================================================================
RCS file: /sources/public/html5/markup/elements/input.password.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- input.password.html	13 Feb 2009 12:07:30 -0000	1.2
+++ input.password.html	31 Jan 2010 06:11:02 -0000	1.3
@@ -7,6 +7,7 @@
     value is "<code>password</code>" represents
     a one-line plain-text edit control for entering a password.</p>
   </div>
+  <div id="prose-model">Empty</div>
   <div id="attributes">
     <dl>
       <dt id="input.password.attrs.type">type</dt>

Index: input.hidden.html
===================================================================
RCS file: /sources/public/html5/markup/elements/input.hidden.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- input.hidden.html	13 Feb 2009 12:07:29 -0000	1.2
+++ input.hidden.html	31 Jan 2010 06:11:01 -0000	1.3
@@ -8,6 +8,7 @@
     represents a value that is not intended to be examined or
     manipulated by the user.</p>
   </div>
+  <div id="prose-model">Empty</div>
   <div id="attributes">
     <dl>
       <dt id="input.hidden.attrs.type">type</dt>

Index: output.html
===================================================================
RCS file: /sources/public/html5/markup/elements/output.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- output.html	21 Aug 2009 13:10:59 -0000	1.3
+++ output.html	31 Jan 2010 06:11:04 -0000	1.4
@@ -5,6 +5,7 @@
     <p>The <a href="#output" class="element">output</a> element
     represents the result of a calculation.</p>
   </div>
+  <div id="prose-model">Phrasing content</div>
   <div class="attributes">
     <dl>
       <dt id="output.attrs.for">for</dt>

Index: input.image.html
===================================================================
RCS file: /sources/public/html5/markup/elements/input.image.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- input.image.html	13 Feb 2009 12:07:29 -0000	1.2
+++ input.image.html	31 Jan 2010 06:11:01 -0000	1.3
@@ -10,6 +10,7 @@
     form, or alternatively a button from which the user can submit
     the form.</p>
   </div>
+  <div id="prose-model">Empty</div>
   <div id="attributes">
     <dl>
       <dt id="input.image.attrs.type">type</dt>

Index: meta.http-equiv.content-language.html
===================================================================
RCS file: /sources/public/html5/markup/elements/meta.http-equiv.content-language.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- meta.http-equiv.content-language.html	21 Jul 2009 08:27:45 -0000	1.1
+++ meta.http-equiv.content-language.html	31 Jan 2010 06:11:03 -0000	1.2
@@ -7,6 +7,7 @@
     whose value is "<code>content-language</code>" represents a pragma
     directive that specifies a document-wide default language.</p>
   </div>
+  <div id="prose-model">Empty</div>
   <div id="attributes">
     <dl>
       <dt id="meta.http-equiv.attrs.http-equiv.content-language"

Index: progress.html
===================================================================
RCS file: /sources/public/html5/markup/elements/progress.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- progress.html	29 Jul 2009 07:42:42 -0000	1.6
+++ progress.html	31 Jan 2010 06:11:04 -0000	1.7
@@ -5,6 +5,7 @@
     <p>The <a href="#progress" class="element">progress</a>
     element represents the completion progress of a task.</p>
   </div>
+  <div id="prose-model">Phrasing content</div>
   <div id="attributes">
     <dl>
       <dt id="progress.attrs.value">value</dt>

Index: script.html
===================================================================
RCS file: /sources/public/html5/markup/elements/script.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- script.html	16 Aug 2009 15:46:28 -0000	1.9
+++ script.html	31 Jan 2010 06:11:04 -0000	1.10
@@ -5,6 +5,11 @@
     <p>The <a href="#script" class="element">script</a> element
     dynamic script and data blocks to be included in documents.</p>
   </div>
+  <div id="prose-model">
+    <p>
+    <a href="#non-replaceable-character-data">Non-replaceable character data</a>
+    </p>
+  </div>
   <div id="attributes">
     <dl>
       <dt id="script.attrs.type">type</dt>

Index: input.submit.html
===================================================================
RCS file: /sources/public/html5/markup/elements/input.submit.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- input.submit.html	13 Feb 2009 12:07:30 -0000	1.2
+++ input.submit.html	31 Jan 2010 06:11:02 -0000	1.3
@@ -7,6 +7,7 @@
     value is "<code>submit</code>" represents a button for
     submitting a form.</p>
   </div>
+  <div id="prose-model">Empty</div>
   <div id="attributes">
     <dl>
       <dt id="input.submit.attrs.type">type</dt>

Index: ul.html
===================================================================
RCS file: /sources/public/html5/markup/elements/ul.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ul.html	19 Feb 2009 03:00:12 -0000	1.4
+++ ul.html	31 Jan 2010 06:11:05 -0000	1.5
@@ -7,4 +7,9 @@
     the order of the items would not change the meaning of
     list.</p>
   </div>
+  <div id="prose-model">
+    <p>Zero or more
+    <a href="#li" class="element">li</a>
+    elements.</p>
+  </div>
 </div>

Index: time.html
===================================================================
RCS file: /sources/public/html5/markup/elements/time.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- time.html	28 Jan 2010 17:11:53 -0000	1.6
+++ time.html	31 Jan 2010 06:11:04 -0000	1.7
@@ -5,6 +5,7 @@
     <p>The <a href="#time" class="element">time</a> element
     represents a date and/or time.</p>
   </div>
+  <div id="prose-model">Phrasing content</div>
   <div id="attributes">
     <dl>
       <dt id="time.attrs.datetime">datetime</dt>

Index: meta.http-equiv.default-style.html
===================================================================
RCS file: /sources/public/html5/markup/elements/meta.http-equiv.default-style.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- meta.http-equiv.default-style.html	29 Jul 2009 12:16:40 -0000	1.4
+++ meta.http-equiv.default-style.html	31 Jan 2010 06:11:03 -0000	1.5
@@ -7,6 +7,7 @@
     whose value is "<code>default-style</code>" represents a pragma
     directive that specifies the document’s preferred stylesheet.</p>
   </div>
+  <div id="prose-model">Empty</div>
   <div id="attributes">
     <dl>
       <dt id="meta.http-equiv.attrs.http-equiv.default-style">http-equiv</dt>

Index: meta.name.html
===================================================================
RCS file: /sources/public/html5/markup/elements/meta.name.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- meta.name.html	16 Aug 2009 15:46:28 -0000	1.3
+++ meta.name.html	31 Jan 2010 06:11:03 -0000	1.4
@@ -6,6 +6,7 @@
     with a <span class="attribute">name</span> attribute
     sets document metadata in the form of name/value pairs.</p>
   </div>
+  <div id="prose-model">Empty</div>
   <div id="attributes">
     <dl>
       <dt id="meta.name.attrs.name">name</dt>

Index: var.html
===================================================================
RCS file: /sources/public/html5/markup/elements/var.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- var.html	19 Feb 2009 03:00:12 -0000	1.4
+++ var.html	31 Jan 2010 06:11:05 -0000	1.5
@@ -7,4 +7,5 @@
     programming context, or placeholder text that the reader is
     meant to mentally replace with some other literal value.</p>
   </div>
+  <div id="prose-model">Phrasing content</div>
 </div>

Index: sub.html
===================================================================
RCS file: /sources/public/html5/markup/elements/sub.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sub.html	19 Feb 2009 03:00:11 -0000	1.4
+++ sub.html	31 Jan 2010 06:11:04 -0000	1.5
@@ -5,4 +5,5 @@
     <p>The <a href="#sub" class="element">sub</a> element
     represents subscript.</p>
   </div>
+  <div id="prose-model">Phrasing content</div>
 </div>

Index: title.html
===================================================================
RCS file: /sources/public/html5/markup/elements/title.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- title.html	19 Feb 2009 03:00:11 -0000	1.4
+++ title.html	31 Jan 2010 06:11:04 -0000	1.5
@@ -5,4 +5,9 @@
     <p>The <a href="#title" class="element">title</a> element
     represents the document’s title or name.</p>
   </div>
+  <div id="prose-model">
+    <p>
+      <a href="#replaceable-character-data">Replaceable character data</a>
+    </p>
+  </div>
 </div>

Index: input.search.html
===================================================================
RCS file: /sources/public/html5/markup/elements/input.search.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- input.search.html	13 Feb 2009 12:07:30 -0000	1.2
+++ input.search.html	31 Jan 2010 06:11:02 -0000	1.3
@@ -8,6 +8,7 @@
     a one-line plain-text edit control for entering one or more
     search terms.</p>
   </div>
+  <div id="prose-model">Empty</div>
   <div id="attributes">
     <dl>
       <dt id="input.search.attrs.type">type</dt>

Index: tfoot.html
===================================================================
RCS file: /sources/public/html5/markup/elements/tfoot.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tfoot.html	19 Feb 2009 03:00:11 -0000	1.4
+++ tfoot.html	31 Jan 2010 06:11:04 -0000	1.5
@@ -7,6 +7,11 @@
     summaries (footers) for its parent <a href="#table"
       class="element">table</a> element.</p>
   </div>
+  <div id="prose-model">
+    <p>Zero or more
+    <a href="#tr" class="element">tr</a>
+    elements</p>
+  </div>
   <div id="tags">
     <p>A <code><a href="#tfoot">tfoot</a></code> element must have
     a <span title="syntax-start-tag">start tag</span>.</p>

Index: rt.html
===================================================================
RCS file: /sources/public/html5/markup/elements/rt.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rt.html	15 Feb 2009 18:31:39 -0000	1.3
+++ rt.html	31 Jan 2010 06:11:04 -0000	1.4
@@ -5,6 +5,7 @@
     <p>The <a href="#rt" class="element">rt</a> element marks the
     ruby text component of a ruby annotation.</p>
   </div>
+  <div id="prose-model">Phrasing content</div>
   <div id="tags">
     <p>An <code><a href="#rt">rt</a></code> element must have a
     <span title="syntax-start-tag">start tag</span>.</p>

Index: strong.html
===================================================================
RCS file: /sources/public/html5/markup/elements/strong.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- strong.html	20 Jan 2009 18:42:29 -0000	1.3
+++ strong.html	31 Jan 2010 06:11:04 -0000	1.4
@@ -5,4 +5,5 @@
     <p>The <a href="#strong" class="element">strong</a> element
     represents a span of text with strong importance.</p>
   </div>
+  <div id="prose-model">Phrasing content</div>
 </div>

Index: ruby.html
===================================================================
RCS file: /sources/public/html5/markup/elements/ruby.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ruby.html	29 Jul 2009 11:23:47 -0000	1.4
+++ ruby.html	31 Jan 2010 06:11:04 -0000	1.5
@@ -5,4 +5,23 @@
     <p>The <a href="#ruby" class="element">ruby</a> element allows
     spans of phrasing content to be marked with ruby annotations.</p>
   </div>
+  <div id="prose-model">
+    <p>One or more groups of the following:
+    <a href="#common.elem.phrasing">phrasing elements</a>
+    and
+    <a href="#normal-character-data">normal character data</a>
+    followed by either:</p>
+    <ul>
+      <li>a single
+      <a href="#rt" class="element">rt</a>
+      element</li>
+      <li>or, an
+      <a href="#rp" class="element">rp</a>
+      element, followed by an
+      <a href="#rt" class="element">rt</a>
+      element, followed by another
+      <a href="#rp" class="element">rp</a>
+      </li>
+    </ul>
+  </div>
 </div>

Index: textarea.html
===================================================================
RCS file: /sources/public/html5/markup/elements/textarea.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- textarea.html	29 Jul 2009 11:23:47 -0000	1.5
+++ textarea.html	31 Jan 2010 06:11:04 -0000	1.6
@@ -6,6 +6,11 @@
     element represents a multi-line plain-text edit control for
     the element’s raw value.</p>
   </div>
+  <div id="prose-model">
+    <p>
+      <a href="#replaceable-character-data">Replaceable character data</a>
+    </p>
+  </div>
   <div id="details">
     <p>The 
     <a href="#contents">contents</a>

Index: sup.html
===================================================================
RCS file: /sources/public/html5/markup/elements/sup.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sup.html	19 Feb 2009 03:00:11 -0000	1.4
+++ sup.html	31 Jan 2010 06:11:04 -0000	1.5
@@ -5,4 +5,5 @@
     <p>The <a href="#sup" class="element">sup</a> element
     represents superscript.</p>
   </div>
+  <div id="prose-model">Phrasing content</div>
 </div>

Index: meter.html
===================================================================
RCS file: /sources/public/html5/markup/elements/meter.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- meter.html	29 Jul 2009 07:42:42 -0000	1.6
+++ meter.html	31 Jan 2010 06:11:03 -0000	1.7
@@ -6,6 +6,7 @@
     represents a scalar gauge providing a measurement within a
     known range, or a fractional value.</p>
   </div>
+  <div id="prose-model">Phrasing content</div>
   <div id="attributes">
     <dl>
       <dt id="meter.attrs.min">min</dt>

Index: li.html
===================================================================
RCS file: /sources/public/html5/markup/elements/li.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- li.html	15 Jun 2009 17:16:11 -0000	1.4
+++ li.html	31 Jan 2010 06:11:03 -0000	1.5
@@ -5,6 +5,7 @@
     <p>The <a href="#li" class="element">li</a> element represents
     a list item.</p>
   </div>
+  <div id="prose-model">Flow content</div>
   <div id="attributes">
     <dl>
       <dt id="oli.attrs.value">value</dt>

Index: input.url.html
===================================================================
RCS file: /sources/public/html5/markup/elements/input.url.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- input.url.html	13 Feb 2009 12:07:30 -0000	1.2
+++ input.url.html	31 Jan 2010 06:11:03 -0000	1.3
@@ -8,6 +8,7 @@
     a control for editing an absolute URL given in the element’s
     value.</p>
   </div>
+  <div id="prose-model">Empty</div>
   <div id="attributes">
     <dl>
       <dt id="input.url.attrs.type">type</dt>

Index: th.html
===================================================================
RCS file: /sources/public/html5/markup/elements/th.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- th.html	21 Aug 2009 13:10:59 -0000	1.5
+++ th.html	31 Jan 2010 06:11:04 -0000	1.6
@@ -5,6 +5,7 @@
     <p>The <a href="#th" class="element">th</a> element represents
     a header cell in a table.</p>
   </div>
+  <div id="prose-model">Phrasing content</div>
   <div id="attributes">
     <dl>
       <dt id="th.attrs.scope">scope</dt>

Index: style.html
===================================================================
RCS file: /sources/public/html5/markup/elements/style.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- style.html	16 Aug 2009 15:46:28 -0000	1.6
+++ style.html	31 Jan 2010 06:11:04 -0000	1.7
@@ -7,6 +7,11 @@
     element
     allows style information to be embedded in documents.</p>
   </div>
+  <div id="prose-model">
+    <p>
+    <a href="#non-replaceable-character-data">Non-replaceable character data</a>
+    </p>
+  </div>
   <div id="attributes">
     <dl>
       <dt id="style.attrs.type">type</dt>

Index: menu.html
===================================================================
RCS file: /sources/public/html5/markup/elements/menu.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- menu.html	21 Jul 2009 07:45:08 -0000	1.4
+++ menu.html	31 Jan 2010 06:11:03 -0000	1.5
@@ -5,6 +5,17 @@
     <p>The <a href="#menu" class="element">menu</a> element
     represents a list of commands.</p>
   </div>
+  <div id="prose-model">
+    <p>Exactly one of the following two choices:</p>
+    <ul>
+      <li>One or more <a href="#li" class="element">li</a> elements</li>
+      <li>Or, 
+      <a href="#common.elem.flow">flow elements</a>
+      and
+      <a href="#normal-character-data">normal character data</a>
+      </li>
+    </ul>
+  </div>
   <div id="attributes">
     <dl>
       <dt id="menu.attrs.type">type</dt>

Index: section.html
===================================================================
RCS file: /sources/public/html5/markup/elements/section.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- section.html	15 Jun 2009 05:57:15 -0000	1.5
+++ section.html	31 Jan 2010 06:11:04 -0000	1.6
@@ -6,6 +6,7 @@
     represents a section of a document, typically with a title or
     heading.</p>
   </div>
+  <div id="prose-model">Flow content</div>
   <div id="attributes">
     <dl>
       <dt id="section.attrs.cite">cite</dt>
Received on Sunday, 31 January 2010 06:11:09 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Sunday, 31 January 2010 06:11:13 GMT