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

html5/markup datalist.html,1.26,1.27 spec.html,1.129,1.130

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Fri, 29 Jan 2010 03:06:20 +0000
To: public-html-commits@w3.org
Message-Id: <E1NahBc-0004tF-6L@lionel-hutz.w3.org>
Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv18633

Modified Files:
	datalist.html spec.html 
Log Message:
prose model

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- spec.html	29 Jan 2010 02:56:21 -0000	1.129
+++ spec.html	29 Jan 2010 03:06:18 -0000	1.130
@@ -5141,7 +5141,22 @@
     set of <a href="#option" class="element">option</a> elements
     that represent predefined options for other controls.</p>
   </div>
-      <div class="no-number no-toc" id="datalist-content-model">
+      <div class="no-number no-toc" id="datalist-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#datalist-contents">#</a>
+</h2>
+<div class="prose-model">
+    <p>One of the following two choices:</p>
+    <ul>
+<li>
+<a href="#normal-character-data">Normal character data</a>
+      and
+      <a href="#common.elem.phrasing">phrasing elements</a>
+      </li>
+      <li>or, zero or more <a href="#option">option</a> elements</li>
+    </ul>
+</div>
+</div>
+<div class="no-number no-toc" id="datalist-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#datalist-content-model">#</a>
 </h2>
 <div class="content-models">

Index: datalist.html
===================================================================
RCS file: /sources/public/html5/markup/datalist.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- datalist.html	29 Jan 2010 02:30:44 -0000	1.26
+++ datalist.html	29 Jan 2010 03:06:17 -0000	1.27
@@ -19,7 +19,16 @@
     set of <a href="option.html#option" class="element">option</a> elements
     that represent predefined options for other controls.</p>
   </div>
-      <div class="no-number no-toc" id="datalist-content-model">
+      <div class="no-number no-toc" id="datalist-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#datalist-contents">#</a></h2><div class="prose-model">
+    <p>One of the following two choices:</p>
+    <ul>
+      <li><a href="syntax.html#normal-character-data">Normal character data</a>
+      and
+      <a href="common-models.html#common.elem.phrasing">phrasing elements</a>
+      </li>
+      <li>or, zero or more <a href="option.html#option">option</a> elements</li>
+    </ul>
+  </div></div><div class="no-number no-toc" id="datalist-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#datalist-content-model">#</a></h2><div class="content-models">
         
       <div id="datalist-mdls">
Received on Friday, 29 January 2010 03:06:21 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Friday, 29 January 2010 03:06:21 GMT