mike: prose model from poot on 2010-01-29 (public-html-diffs@w3.org from January 2010)

From: poot <cvsmail@w3.org>
Date: Fri, 29 Jan 2010 14:07:02 +0900 (JST)
To: public-html-diffs@w3.org
Message-Id: <20100129050702.978762BC13@toro.w3.mag.keio.ac.jp>
mike: prose model

http://dev.w3.org/cvsweb/html5/markup/spec.html?r1=1.134&r2=1.135&f=h

===================================================================
RCS file: /sources/public/html5/markup/iframe.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- iframe.html 29 Jan 2010 02:30:45 -0000 1.33
+++ iframe.html 29 Jan 2010 05:06:46 -0000 1.34
@@ -17,12 +17,19 @@
     <p>The <a href="iframe.html#iframe" class="element">iframe</a> element
     introduces a new nested browsing context.</p>
   </div>
-      <div class="no-number no-toc" id="iframe-content-model">
+      <div class="no-number no-toc" id="iframe-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#iframe-contents">#</a></h2><div class="prose-model">
+    <p>In
+      <a href="documents.html#syntax-document-html">documents in the HTML syntax</a>,
+      <a href="syntax.html#normal-character-data">normal character data</a>.</p>
+    <p>In
+      <a href="documents.html#syntax-document-xml">documents in the XML syntax</a>,
+      empty.</p>
+  </div></div><div class="no-number no-toc" id="iframe-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#iframe-content-model">#</a></h2><div class="content-models">
         
       <div id="iframe-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="iframe-mdl" href="iframe.html#iframe-mdl" class="element">iframe</a> = </span><span>
-      normal character data
+      <a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="iframe.html#iframe.attrs">iframe.attrs</a>
     </span></p>
         </div>

Index: option.html
===================================================================
RCS file: /sources/public/html5/markup/option.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- option.html 29 Jan 2010 02:30:47 -0000 1.27
+++ option.html 29 Jan 2010 05:06:46 -0000 1.28
@@ -24,7 +24,7 @@
         
       <div id="option-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="option-mdl" href="option.html#option-mdl" class="element">option</a> = </span><span>
-      normal character data
+      <a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="option.html#option.attrs">option.attrs</a>
     </span></p>
         </div>

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- spec.html 29 Jan 2010 04:31:09 -0000 1.134
+++ spec.html 29 Jan 2010 05:06:46 -0000 1.135
@@ -7027,8 +7027,26 @@
       <h2 class="element-head">
 <span class="element">hgroup</span> &#8211; <span class="shortdesc">heading group</span> <a class="hash" href="#hgroup">#</a> <a class="toc-bak" href="#hgroup-toc">T</a>
 </h2>
-      <div id="hgroup-longdesc" class="longdesc"><p><i class="TK">(element description to come)</i></p></div>
-      <div class="no-number no-toc" id="hgroup-content-model">
+      <div id="hgroup-longdesc" class="longdesc">
+    <p>The <a href="#hgroup" class="element">hgroup</a> element
+    represents a group of headings.</p>
+  </div>
+      <div class="no-number no-toc" id="hgroup-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#hgroup-contents">#</a>
+</h2>
+<div class="prose-model">
+    <p>One or more
+    <a href="#h1" class="element">h1</a>,
+    <a href="#h2" class="element">h2</a>,
+    <a href="#h3" class="element">h3</a>,
+    <a href="#h4" class="element">h4</a>,
+    <a href="#h5" class="element">h5</a>,
+    and/or
+    <a href="#h6" class="element">h6</a>
+    elements.</p>
+  </div>
+</div>
+<div class="no-number no-toc" id="hgroup-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#hgroup-content-model">#</a>
 </h2>
 <div class="content-models">
@@ -7069,7 +7087,17 @@
 </h2>
         <ul><li class="context-mdl"><a href="#common.elem.flow">common.elem.flow</a></li></ul>
 </div>
-      </div>
+      
+        <div class="no-number no-toc" id="hgroup-details">
+        <h2 class="element-subhead">Details <a class="hash" href="#hgroup-details">#</a>
+</h2>
+<div class="details">
+    <p>The hgroup element is typically used to group a
+    set of one or more <a href="#h1" class="element">h1</a>-<a href="#h6" class="element">h6</a> elements &#8212; to group, for
+    example, a section title and an accompanying subtitle.</p>
+  </div>
+</div>
+</div>
 <div id="hr" class="section">
       <h2 class="element-head">
 <span class="element">hr</span> &#8211; <span class="shortdesc">thematic break</span> <a class="hash" href="#hr">#</a> <a class="toc-bak" href="#hr-toc">T</a>
@@ -7349,14 +7377,26 @@
     <p>The <a href="#iframe" class="element">iframe</a> element
     introduces a new nested browsing context.</p>
   </div>
-      <div class="no-number no-toc" id="iframe-content-model">
+      <div class="no-number no-toc" id="iframe-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#iframe-contents">#</a>
+</h2>
+<div class="prose-model">
+    <p>In
+      <a href="#syntax-document-html">documents in the HTML syntax</a>,
+      <a href="#normal-character-data">normal character data</a>.</p>
+    <p>In
+      <a href="#syntax-document-xml">documents in the XML syntax</a>,
+      empty.</p>
+  </div>
+</div>
+<div class="no-number no-toc" id="iframe-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#iframe-content-model">#</a>
 </h2>
 <div class="content-models">
         
       <div id="iframe-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="iframe-mdl" href="#iframe-mdl" class="element">iframe</a> = </span><span>
-      normal character data
+      <a class="ref" href="#normal-character-data">normal-character-data</a>
       <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#iframe.attrs">iframe.attrs</a>
     </span></p>
         </div>
@@ -12548,7 +12588,7 @@
         
       <div id="option-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="option-mdl" href="#option-mdl" class="element">option</a> = </span><span>
-      normal character data
+      <a class="ref" href="#normal-character-data">normal-character-data</a>
       <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#option.attrs">option.attrs</a>
     </span></p>
         </div>

Index: hgroup.html
===================================================================
RCS file: /sources/public/html5/markup/hgroup.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- hgroup.html 29 Jan 2010 04:31:09 -0000 1.21
+++ hgroup.html 29 Jan 2010 05:06:46 -0000 1.22
@@ -13,8 +13,21 @@
 </div>
 <div id="hgroup" class="section">
       <h2 class="element-head"><span class="element">hgroup</span> &#8211; <span class="shortdesc">heading group</span> <a class="hash" href="#hgroup">#</a> <a class="toc-bak" href="Overview.html#hgroup-toc">T</a></h2>
-      <div id="hgroup-longdesc" class="longdesc"><p><i class="TK">(element description to come)</i></p></div>
-      <div class="no-number no-toc" id="hgroup-content-model">
+      <div id="hgroup-longdesc" class="longdesc">
+    <p>The <a href="hgroup.html#hgroup" class="element">hgroup</a> element
+    represents a group of headings.</p>
+  </div>
+      <div class="no-number no-toc" id="hgroup-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#hgroup-contents">#</a></h2><div class="prose-model">
+    <p>One or more
+    <a href="h1.html#h1" class="element">h1</a>,
+    <a href="h2.html#h2" class="element">h2</a>,
+    <a href="h3.html#h3" class="element">h3</a>,
+    <a href="h4.html#h4" class="element">h4</a>,
+    <a href="h5.html#h5" class="element">h5</a>,
+    and/or
+    <a href="h6.html#h6" class="element">h6</a>
+    elements.</p>
+  </div></div><div class="no-number no-toc" id="hgroup-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#hgroup-content-model">#</a></h2><div class="content-models">
         
       <div id="hgroup-mdls">
@@ -47,7 +60,13 @@
         <ul>
         <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
       </div>
-      </div>
+      
+        <div class="no-number no-toc" id="hgroup-details">
+        <h2 class="element-subhead">Details <a class="hash" href="#hgroup-details">#</a></h2><div class="details">
+    <p>The hgroup element is typically used to group a
+    set of one or more <a href="h1.html#h1" class="element">h1</a>-<a href="h6.html#h6" class="element">h6</a> elements &#8212; to group, for
+    example, a section title and an accompanying subtitle.</p>
+  </div></div></div>
 <hr class="footerbreak"></hr>
 <div class="nav">
 <span class="nav-prev"><a href="header.html">&#171; header</a></span>
Received on Friday, 29 January 2010 05:07:32 UTC