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

html5/markup b.html,1.22,1.23 base.html,1.23,1.24 bdo.html,1.24,1.25 blockquote.html,1.24,1.25 body.html,1.26,1.27 br.html,1.19,1.20 button.button.html,1.29,1.30 button.reset.html,1.29,1.30 button.submit.html,1.29,1.30 spec.html,1.123,1.124 style.css,1.81,1.82

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Fri, 29 Jan 2010 01:34:10 +0000
To: public-html-commits@w3.org
Message-Id: <E1NafkQ-0002T5-RL@lionel-hutz.w3.org>
Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv9394

Modified Files:
	b.html base.html bdo.html blockquote.html body.html br.html 
	button.button.html button.reset.html button.submit.html 
	spec.html style.css 
Log Message:
prose model

Index: body.html
===================================================================
RCS file: /sources/public/html5/markup/body.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- body.html	29 Jan 2010 00:40:37 -0000	1.26
+++ body.html	29 Jan 2010 01:34:08 -0000	1.27
@@ -18,7 +18,13 @@
     represents the body of a document (as opposed to the
     document&#8217;s metadata).</p>
   </div>
-      <div class="no-number no-toc" id="body-content-model">
+      <div class="no-number no-toc" id="body-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#body-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.flow">flow elements</a>
+    </p>
+  </div></div><div class="no-number no-toc" id="body-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#body-content-model">#</a></h2><div class="content-models">
         
       <div id="body-mdls">

Index: br.html
===================================================================
RCS file: /sources/public/html5/markup/br.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- br.html	29 Jan 2010 00:40:37 -0000	1.19
+++ br.html	29 Jan 2010 01:34:08 -0000	1.20
@@ -17,7 +17,9 @@
     <p>The <a href="br.html#br" class="element">br</a> element represents
     a line break.</p>
   </div>
-      <div class="no-number no-toc" id="br-content-model">
+      <div class="no-number no-toc" id="br-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#br-contents">#</a></h2><div class="prose-model">
+    <p>Empty</p>
+  </div></div><div class="no-number no-toc" id="br-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#br-content-model">#</a></h2><div class="content-models">
         
       <div id="br-mdls">

Index: b.html
===================================================================
RCS file: /sources/public/html5/markup/b.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- b.html	29 Jan 2010 00:40:37 -0000	1.22
+++ b.html	29 Jan 2010 01:34:08 -0000	1.23
@@ -20,7 +20,13 @@
     document abstract, product names in a review, or other spans
     of text whose typical typographic presentation is bold text.</p>
   </div>
-      <div class="no-number no-toc" id="b-content-model">
+      <div class="no-number no-toc" id="b-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#b-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="b-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#b-content-model">#</a></h2><div class="content-models">
         
       <div id="b-mdls">

Index: bdo.html
===================================================================
RCS file: /sources/public/html5/markup/bdo.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- bdo.html	29 Jan 2010 00:40:37 -0000	1.24
+++ bdo.html	29 Jan 2010 01:34:08 -0000	1.25
@@ -18,7 +18,13 @@
     a means to specify a direction override of the Unicode BiDi
     algorithm.</p>
   </div>
-      <div class="no-number no-toc" id="bdo-content-model">
+      <div class="no-number no-toc" id="bdo-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#bdo-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="bdo-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#bdo-content-model">#</a></h2><div class="content-models">
         
       <div id="bdo-mdls">

Index: blockquote.html
===================================================================
RCS file: /sources/public/html5/markup/blockquote.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- blockquote.html	29 Jan 2010 00:40:37 -0000	1.24
+++ blockquote.html	29 Jan 2010 01:34:08 -0000	1.25
@@ -18,7 +18,13 @@
     element represents a section that is quoted from another
     source.</p>
   </div>
-      <div class="no-number no-toc" id="blockquote-content-model">
+      <div class="no-number no-toc" id="blockquote-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#blockquote-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.flow">flow elements</a>
+    </p>
+  </div></div><div class="no-number no-toc" id="blockquote-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#blockquote-content-model">#</a></h2><div class="content-models">
         
       <div id="blockquote-mdls">

Index: style.css
===================================================================
RCS file: /sources/public/html5/markup/style.css,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- style.css	29 Jan 2010 00:51:11 -0000	1.81
+++ style.css	29 Jan 2010 01:34:08 -0000	1.82
@@ -539,5 +539,6 @@
 
 .prose-model p {
   margin-top: 6px;
+  margin-bottom: 6px;
   padding-left: 1em;
 }

Index: base.html
===================================================================
RCS file: /sources/public/html5/markup/base.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- base.html	29 Jan 2010 00:40:37 -0000	1.23
+++ base.html	29 Jan 2010 01:34:08 -0000	1.24
@@ -20,7 +20,9 @@
     <a href="terminology.html#context">browsing context</a> name
     for the purposes of following hyperlinks.</p>
   </div>
-      <div class="no-number no-toc" id="base-content-model">
+      <div class="no-number no-toc" id="base-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#base-contents">#</a></h2><div class="prose-model">
+    <p>Empty</p>
+  </div></div><div class="no-number no-toc" id="base-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#base-content-model">#</a></h2><div class="content-models">
         
       <div id="base-mdls">

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- spec.html	29 Jan 2010 01:18:37 -0000	1.123
+++ spec.html	29 Jan 2010 01:34:08 -0000	1.124
@@ -3454,7 +3454,18 @@
     document abstract, product names in a review, or other spans
     of text whose typical typographic presentation is bold text.</p>
   </div>
-      <div class="no-number no-toc" id="b-content-model">
+      <div class="no-number no-toc" id="b-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#b-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="b-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#b-content-model">#</a>
 </h2>
 <div class="content-models">
@@ -3516,7 +3527,14 @@
     <a href="#context">browsing context</a> name
     for the purposes of following hyperlinks.</p>
   </div>
-      <div class="no-number no-toc" id="base-content-model">
+      <div class="no-number no-toc" id="base-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#base-contents">#</a>
+</h2>
+<div class="prose-model">
+    <p>Empty</p>
+  </div>
+</div>
+<div class="no-number no-toc" id="base-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#base-content-model">#</a>
 </h2>
 <div class="content-models">
@@ -3586,7 +3604,18 @@
     a means to specify a direction override of the Unicode BiDi
     algorithm.</p>
   </div>
-      <div class="no-number no-toc" id="bdo-content-model">
+      <div class="no-number no-toc" id="bdo-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#bdo-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="bdo-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#bdo-content-model">#</a>
 </h2>
 <div class="content-models">
@@ -3644,7 +3673,18 @@
     element represents a section that is quoted from another
     source.</p>
   </div>
-      <div class="no-number no-toc" id="blockquote-content-model">
+      <div class="no-number no-toc" id="blockquote-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#blockquote-contents">#</a>
+</h2>
+<div class="prose-model">
+    <p>
+    <a href="#normal-character-data">Normal character data</a>
+    and
+    <a href="#common.elem.flow">flow elements</a>
+    </p>
+  </div>
+</div>
+<div class="no-number no-toc" id="blockquote-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#blockquote-content-model">#</a>
 </h2>
 <div class="content-models">
@@ -3720,7 +3760,18 @@
     represents the body of a document (as opposed to the
     document&#8217;s metadata).</p>
   </div>
-      <div class="no-number no-toc" id="body-content-model">
+      <div class="no-number no-toc" id="body-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#body-contents">#</a>
+</h2>
+<div class="prose-model">
+    <p>
+    <a href="#normal-character-data">Normal character data</a>
+    and
+    <a href="#common.elem.flow">flow elements</a>
+    </p>
+  </div>
+</div>
+<div class="no-number no-toc" id="body-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#body-content-model">#</a>
 </h2>
 <div class="content-models">
@@ -3897,7 +3948,14 @@
     <p>The <a href="#br" class="element">br</a> element represents
     a line break.</p>
   </div>
-      <div class="no-number no-toc" id="br-content-model">
+      <div class="no-number no-toc" id="br-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#br-contents">#</a>
+</h2>
+<div class="prose-model">
+    <p>Empty</p>
+  </div>
+</div>
+<div class="no-number no-toc" id="br-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#br-content-model">#</a>
 </h2>
 <div class="content-models">
@@ -3974,7 +4032,18 @@
     value is "<code>submit</code>" represents a button for
     submitting a form.</p>
   </div>
-      <div class="no-number no-toc" id="button.submit-content-model">
+      <div class="no-number no-toc" id="button.submit-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#button.submit-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="button.submit-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#button.submit-content-model">#</a>
 </h2>
 <div class="content-models">
@@ -4068,7 +4137,18 @@
     value is "<code>reset</code>" represents a button for
     resetting a form.</p>
   </div>
-      <div class="no-number no-toc" id="button.reset-content-model">
+      <div class="no-number no-toc" id="button.reset-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#button.reset-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="button.reset-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#button.reset-content-model">#</a>
 </h2>
 <div class="content-models">
@@ -4157,7 +4237,18 @@
     value is "<code>button</code>" represents a button with no
     additional semantics.</p>
   </div>
-      <div class="no-number no-toc" id="button.button-content-model">
+      <div class="no-number no-toc" id="button.button-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#button.button-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="button.button-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#button.button-content-model">#</a>
 </h2>
 <div class="content-models">

Index: button.button.html
===================================================================
RCS file: /sources/public/html5/markup/button.button.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- button.button.html	29 Jan 2010 00:40:37 -0000	1.29
+++ button.button.html	29 Jan 2010 01:34:08 -0000	1.30
@@ -19,7 +19,13 @@
     value is "<code>button</code>" represents a button with no
     additional semantics.</p>
   </div>
-      <div class="no-number no-toc" id="button.button-content-model">
+      <div class="no-number no-toc" id="button.button-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#button.button-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="button.button-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#button.button-content-model">#</a></h2><div class="content-models">
         
       <div id="button.button-mdls">

Index: button.reset.html
===================================================================
RCS file: /sources/public/html5/markup/button.reset.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- button.reset.html	29 Jan 2010 00:40:37 -0000	1.29
+++ button.reset.html	29 Jan 2010 01:34:08 -0000	1.30
@@ -19,7 +19,13 @@
     value is "<code>reset</code>" represents a button for
     resetting a form.</p>
   </div>
-      <div class="no-number no-toc" id="button.reset-content-model">
+      <div class="no-number no-toc" id="button.reset-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#button.reset-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="button.reset-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#button.reset-content-model">#</a></h2><div class="content-models">
         
       <div id="button.reset-mdls">

Index: button.submit.html
===================================================================
RCS file: /sources/public/html5/markup/button.submit.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- button.submit.html	29 Jan 2010 00:40:37 -0000	1.29
+++ button.submit.html	29 Jan 2010 01:34:08 -0000	1.30
@@ -19,7 +19,13 @@
     value is "<code>submit</code>" represents a button for
     submitting a form.</p>
   </div>
-      <div class="no-number no-toc" id="button.submit-content-model">
+      <div class="no-number no-toc" id="button.submit-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#button.submit-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="button.submit-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#button.submit-content-model">#</a></h2><div class="content-models">
         
       <div id="button.submit-mdls">
Received on Friday, 29 January 2010 01:34:13 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Friday, 29 January 2010 01:34:13 GMT