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 13:31:28 +0900 (JST)
To: public-html-diffs@w3.org
Message-Id: <20100129043128.ECE332BC13@toro.w3.mag.keio.ac.jp>
mike: prose model

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

===================================================================
RCS file: /sources/public/html5/markup/header.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- header.html 29 Jan 2010 02:30:45 -0000 1.26
+++ header.html 29 Jan 2010 04:31:09 -0000 1.27
@@ -17,7 +17,9 @@
     <p>The <a href="header.html#header" class="element">header</a> element
     represents the header of a section.</p>
   </div>
-      <div class="no-number no-toc" id="header-content-model">
+      <div class="no-number no-toc" id="header-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#header-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">flow elements</a></p></div></div><div class="no-number no-toc" id="header-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#header-content-model">#</a></h2><div class="content-models">
         
       <div id="header-mdls">

Index: hr.html
===================================================================
RCS file: /sources/public/html5/markup/hr.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- hr.html 29 Jan 2010 02:30:45 -0000 1.23
+++ hr.html 29 Jan 2010 04:31:09 -0000 1.24
@@ -17,7 +17,7 @@
     <p>The <a href="hr.html#hr" class="element">hr</a> element represents
     a paragraph-level thematic break.</p>
   </div>
-      <div class="no-number no-toc" id="hr-content-model">
+      <div class="no-number no-toc" id="hr-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#hr-contents">#</a></h2><div class="prose-model"><p>Empty</p></div></div><div class="no-number no-toc" id="hr-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#hr-content-model">#</a></h2><div class="content-models">
         
       <div id="hr-mdls">

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- spec.html 29 Jan 2010 04:24:13 -0000 1.133
+++ spec.html 29 Jan 2010 04:31:09 -0000 1.134
@@ -6938,7 +6938,14 @@
     <p>The <a href="#header" class="element">header</a> element
     represents the header of a section.</p>
   </div>
-      <div class="no-number no-toc" id="header-content-model">
+      <div class="no-number no-toc" id="header-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#header-contents">#</a>
+</h2>
+<div class="prose-model"><p><a href="#normal-character-data">Normal character data</a>
+                and
+                <a href="#common.elem.phrasing">flow elements</a></p></div>
+</div>
+<div class="no-number no-toc" id="header-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#header-content-model">#</a>
 </h2>
 <div class="content-models">
@@ -7020,10 +7027,7 @@
       <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>The <a href="#hgroup" class="element">hgroup</a> element
-    represents a group of headings.</p>
-  </div>
+      <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">
         <h2 class="element-subhead">Content model <a class="hash" href="#hgroup-content-model">#</a>
 </h2>
@@ -7065,17 +7069,7 @@
 </h2>
         <ul><li class="context-mdl"><a href="#common.elem.flow">common.elem.flow</a></li></ul>
 </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>
 <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>
@@ -7084,7 +7078,12 @@
     <p>The <a href="#hr" class="element">hr</a> element represents
     a paragraph-level thematic break.</p>
   </div>
-      <div class="no-number no-toc" id="hr-content-model">
+      <div class="no-number no-toc" id="hr-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#hr-contents">#</a>
+</h2>
+<div class="prose-model"><p>Empty</p></div>
+</div>
+<div class="no-number no-toc" id="hr-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#hr-content-model">#</a>
 </h2>
 <div class="content-models">

Index: hgroup.html
===================================================================
RCS file: /sources/public/html5/markup/hgroup.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- hgroup.html 29 Jan 2010 02:30:45 -0000 1.20
+++ hgroup.html 29 Jan 2010 04:31:09 -0000 1.21
@@ -13,10 +13,7 @@
 </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>The <a href="hgroup.html#hgroup" class="element">hgroup</a> element
-    represents a group of headings.</p>
-  </div>
+      <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">
         <h2 class="element-subhead">Content model <a class="hash" href="#hgroup-content-model">#</a></h2><div class="content-models">
         
@@ -50,13 +47,7 @@
         <ul>
         <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
       </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>
+      </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 04:31:57 UTC