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

html5/markup dl.html,1.25,1.26 fieldset.html,1.26,1.27 h1.html,1.27,1.28 h2.html,1.28,1.29 h3.html,1.28,1.29 h4.html,1.28,1.29 h5.html,1.28,1.29 h6.html,1.28,1.29 head.html,1.21,1.22 spec.html,1.132,1.133

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Fri, 29 Jan 2010 04:24:15 +0000
To: public-html-commits@w3.org
Message-Id: <E1NaiP1-0006w5-93@lionel-hutz.w3.org>
Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv26509

Modified Files:
	dl.html fieldset.html h1.html h2.html h3.html h4.html h5.html 
	h6.html head.html spec.html 
Log Message:
prose model

Index: h6.html
===================================================================
RCS file: /sources/public/html5/markup/h6.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- h6.html	29 Jan 2010 04:11:58 -0000	1.28
+++ h6.html	29 Jan 2010 04:24:12 -0000	1.29
@@ -17,7 +17,9 @@
     <p>The <a href="h1.html#h1" class="element">h1</a> through <a href="h6.html#h6" class="element">h6</a> elements are headings for
     the sections with which they are associated.</p>
   </div>
-      <div class="no-number no-toc" id="h6-content-model">
+      <div class="no-number no-toc" id="h6-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#h6-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="h6-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#h6-content-model">#</a></h2><div class="content-models">
         
       <div id="h6-mdls">

Index: h4.html
===================================================================
RCS file: /sources/public/html5/markup/h4.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- h4.html	29 Jan 2010 04:11:58 -0000	1.28
+++ h4.html	29 Jan 2010 04:24:12 -0000	1.29
@@ -17,7 +17,9 @@
     <p>The <a href="h1.html#h1" class="element">h1</a> through <a href="h6.html#h6" class="element">h6</a> elements are headings for
     the sections with which they are associated.</p>
   </div>
-      <div class="no-number no-toc" id="h4-content-model">
+      <div class="no-number no-toc" id="h4-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#h4-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="h4-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#h4-content-model">#</a></h2><div class="content-models">
         
       <div id="h4-mdls">

Index: h2.html
===================================================================
RCS file: /sources/public/html5/markup/h2.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- h2.html	29 Jan 2010 04:11:58 -0000	1.28
+++ h2.html	29 Jan 2010 04:24:12 -0000	1.29
@@ -17,7 +17,9 @@
     <p>The <a href="h1.html#h1" class="element">h1</a> through <a href="h6.html#h6" class="element">h6</a> elements are headings for
     the sections with which they are associated.</p>
   </div>
-      <div class="no-number no-toc" id="h2-content-model">
+      <div class="no-number no-toc" id="h2-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#h2-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="h2-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#h2-content-model">#</a></h2><div class="content-models">
         
       <div id="h2-mdls">

Index: head.html
===================================================================
RCS file: /sources/public/html5/markup/head.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- head.html	29 Jan 2010 02:30:45 -0000	1.21
+++ head.html	29 Jan 2010 04:24:13 -0000	1.22
@@ -17,7 +17,16 @@
     <p>The <a href="head.html#head" class="element">head</a> element
     collects the document&#8217;s metadata.</p>
   </div>
-      <div class="no-number no-toc" id="head-content-model">
+      <div class="no-number no-toc" id="head-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#head-contents">#</a></h2><div class="prose-model">
+    <p>A
+    <span class="required">required</span>
+    <a href="title.html#title" class="element">title</a>
+    element, optionally followed by exactly one
+    <a href="base.html#base" class="element">base</a>
+    element, followed by any
+    <a href="common-metadata">metadata elements</a>
+    </p>
+  </div></div><div class="no-number no-toc" id="head-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#head-content-model">#</a></h2><div class="content-models">
         
       <div id="head-mdls">

Index: fieldset.html
===================================================================
RCS file: /sources/public/html5/markup/fieldset.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- fieldset.html	29 Jan 2010 04:11:58 -0000	1.26
+++ fieldset.html	29 Jan 2010 04:24:12 -0000	1.27
@@ -19,8 +19,8 @@
   </div>
       <div class="no-number no-toc" id="fieldset-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#fieldset-contents">#</a></h2><div class="prose-model">
     <p>Optionally, a
-    <a href="legend.html#legend" class="element">legend</a>,
-    followed by
+    <a href="legend.html#legend" class="element">legend</a>
+    element, followed by
     <a href="common-models.html#common.elem.flow">flow elements</a>
     and
     <a href="syntax.html#normal-character-data">normal character data</a>

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- spec.html	29 Jan 2010 04:11:58 -0000	1.132
+++ spec.html	29 Jan 2010 04:24:13 -0000	1.133
@@ -5571,7 +5571,7 @@
     <a href="#dt" class="element">dt</a>
     elements followed by one or more
     <a href="#dd" class="element">dd</a>
-    elements.</p>
+    elements</p>
   </div>
 </div>
 <div class="no-number no-toc" id="dl-content-model">
@@ -5942,8 +5942,8 @@
 </h2>
 <div class="prose-model">
     <p>Optionally, a
-    <a href="#legend" class="element">legend</a>,
-    followed by
+    <a href="#legend" class="element">legend</a>
+    element, followed by
     <a href="#common.elem.flow">flow elements</a>
     and
     <a href="#normal-character-data">normal character data</a>
@@ -6264,7 +6264,14 @@
     <p>The <a href="#h1" class="element">h1</a> through <a href="#h6" class="element">h6</a> elements are headings for
     the sections with which they are associated.</p>
   </div>
-      <div class="no-number no-toc" id="h1-content-model">
+      <div class="no-number no-toc" id="h1-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#h1-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="h1-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#h1-content-model">#</a>
 </h2>
 <div class="content-models">
@@ -6354,7 +6361,14 @@
     <p>The <a href="#h1" class="element">h1</a> through <a href="#h6" class="element">h6</a> elements are headings for
     the sections with which they are associated.</p>
   </div>
-      <div class="no-number no-toc" id="h2-content-model">
+      <div class="no-number no-toc" id="h2-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#h2-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="h2-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#h2-content-model">#</a>
 </h2>
 <div class="content-models">
@@ -6444,7 +6458,14 @@
     <p>The <a href="#h1" class="element">h1</a> through <a href="#h6" class="element">h6</a> elements are headings for
     the sections with which they are associated.</p>
   </div>
-      <div class="no-number no-toc" id="h3-content-model">
+      <div class="no-number no-toc" id="h3-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#h3-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="h3-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#h3-content-model">#</a>
 </h2>
 <div class="content-models">
@@ -6534,7 +6555,14 @@
     <p>The <a href="#h1" class="element">h1</a> through <a href="#h6" class="element">h6</a> elements are headings for
     the sections with which they are associated.</p>
   </div>
-      <div class="no-number no-toc" id="h4-content-model">
+      <div class="no-number no-toc" id="h4-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#h4-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="h4-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#h4-content-model">#</a>
 </h2>
 <div class="content-models">
@@ -6622,7 +6650,14 @@
     <p>The <a href="#h1" class="element">h1</a> through <a href="#h6" class="element">h6</a> elements are headings for
     the sections with which they are associated.</p>
   </div>
-      <div class="no-number no-toc" id="h5-content-model">
+      <div class="no-number no-toc" id="h5-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#h5-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="h5-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#h5-content-model">#</a>
 </h2>
 <div class="content-models">
@@ -6712,7 +6747,14 @@
     <p>The <a href="#h1" class="element">h1</a> through <a href="#h6" class="element">h6</a> elements are headings for
     the sections with which they are associated.</p>
   </div>
-      <div class="no-number no-toc" id="h6-content-model">
+      <div class="no-number no-toc" id="h6-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#h6-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="h6-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#h6-content-model">#</a>
 </h2>
 <div class="content-models">
@@ -6802,7 +6844,21 @@
     <p>The <a href="#head" class="element">head</a> element
     collects the document&#8217;s metadata.</p>
   </div>
-      <div class="no-number no-toc" id="head-content-model">
+      <div class="no-number no-toc" id="head-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#head-contents">#</a>
+</h2>
+<div class="prose-model">
+    <p>A
+    <span class="required">required</span>
+    <a href="#title" class="element">title</a>
+    element, optionally followed by exactly one
+    <a href="#base" class="element">base</a>
+    element, followed by any
+    <a href="common-metadata">metadata elements</a>
+    </p>
+  </div>
+</div>
+<div class="no-number no-toc" id="head-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#head-content-model">#</a>
 </h2>
 <div class="content-models">

Index: h1.html
===================================================================
RCS file: /sources/public/html5/markup/h1.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- h1.html	29 Jan 2010 02:30:45 -0000	1.27
+++ h1.html	29 Jan 2010 04:24:12 -0000	1.28
@@ -17,7 +17,9 @@
     <p>The <a href="h1.html#h1" class="element">h1</a> through <a href="h6.html#h6" class="element">h6</a> elements are headings for
     the sections with which they are associated.</p>
   </div>
-      <div class="no-number no-toc" id="h1-content-model">
+      <div class="no-number no-toc" id="h1-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#h1-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="h1-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#h1-content-model">#</a></h2><div class="content-models">
         
       <div id="h1-mdls">

Index: h3.html
===================================================================
RCS file: /sources/public/html5/markup/h3.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- h3.html	29 Jan 2010 04:11:58 -0000	1.28
+++ h3.html	29 Jan 2010 04:24:12 -0000	1.29
@@ -17,7 +17,9 @@
     <p>The <a href="h1.html#h1" class="element">h1</a> through <a href="h6.html#h6" class="element">h6</a> elements are headings for
     the sections with which they are associated.</p>
   </div>
-      <div class="no-number no-toc" id="h3-content-model">
+      <div class="no-number no-toc" id="h3-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#h3-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="h3-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#h3-content-model">#</a></h2><div class="content-models">
         
       <div id="h3-mdls">

Index: dl.html
===================================================================
RCS file: /sources/public/html5/markup/dl.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- dl.html	29 Jan 2010 04:11:58 -0000	1.25
+++ dl.html	29 Jan 2010 04:24:12 -0000	1.26
@@ -22,7 +22,7 @@
     <a href="dt.html#dt" class="element">dt</a>
     elements followed by one or more
     <a href="dd.html#dd" class="element">dd</a>
-    elements.</p>
+    elements</p>
   </div></div><div class="no-number no-toc" id="dl-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#dl-content-model">#</a></h2><div class="content-models">
         

Index: h5.html
===================================================================
RCS file: /sources/public/html5/markup/h5.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- h5.html	29 Jan 2010 04:11:58 -0000	1.28
+++ h5.html	29 Jan 2010 04:24:12 -0000	1.29
@@ -17,7 +17,9 @@
     <p>The <a href="h1.html#h1" class="element">h1</a> through <a href="h6.html#h6" class="element">h6</a> elements are headings for
     the sections with which they are associated.</p>
   </div>
-      <div class="no-number no-toc" id="h5-content-model">
+      <div class="no-number no-toc" id="h5-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#h5-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="h5-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#h5-content-model">#</a></h2><div class="content-models">
         
       <div id="h5-mdls">
Received on Friday, 29 January 2010 04:24:18 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Friday, 29 January 2010 04:24:26 GMT