html5/markup colgroup.html,1.22,1.23 spec.html,1.126,1.127 from Michael Smith via cvs-syncmail on 2010-01-29 (public-html-commits@w3.org from January 2010)

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Fri, 29 Jan 2010 02:35:44 +0000
To: public-html-commits@w3.org
Message-Id: <E1Nagi0-00046c-Ux@lionel-hutz.w3.org>
Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv15524

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

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- spec.html	29 Jan 2010 02:30:50 -0000	1.126
+++ spec.html	29 Jan 2010 02:35:42 -0000	1.127
@@ -4667,8 +4667,19 @@
       <h2 class="element-head">
 <span class="element">colgroup</span> &#8211; <span class="shortdesc">table column group</span> <a class="hash" href="#colgroup">#</a> <a class="toc-bak" href="#colgroup-toc">T</a>
 </h2>
-      <div id="colgroup-longdesc" class="longdesc"><p><i class="TK">(element description to come)</i></p></div>
-      <div class="no-number no-toc" id="colgroup-content-model">
+      <div id="colgroup-longdesc" class="longdesc">
+    <p>The <a href="#colgroup" class="element">colgroup</a>
+    element represents a group of one or more columns in the <a href="#table" class="element">table</a> that is its
+    parent.</p>
+  </div>
+      <div class="no-number no-toc" id="colgroup-contents">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#colgroup-contents">#</a>
+</h2>
+<div class="prose-model">
+    <p>Zero or more <a href="#col" class="element">col</a> elements</p>
+  </div>
+</div>
+<div class="no-number no-toc" id="colgroup-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#colgroup-content-model">#</a>
 </h2>
 <div class="content-models">
@@ -4702,7 +4713,7 @@
 <a class="attribute-name" id="colgroup.attrs.span" title="colgroup.attrs.span" href="#colgroup.attrs.span">span</a> = <span class="attr-values">
       <a class="ref" href="#common.data.integer.positive" title="common.data.integer.positive">integer.positive</a>
     </span> </dt>
-            <dd><i class="TK">(detailed attribute description to come)</i></dd>
+            <dd>The number of columns in the group.</dd>
           
         </dl>
 </div>
@@ -4732,11 +4743,16 @@
       <div class="no-number no-toc" id="colgroup-tags">
         <h2 class="element-subhead">Tag omission <a class="hash" href="#colgroup-tags">#</a>
 </h2>
-        <p>A <a href="#colgroup">colgroup</a>
-            element must have both a
-            <span title="syntax-start-tag">start tag</span>
-            and an
-            <span title="syntax-end-tag">end tag</span>.</p>
+        
+    <p>A <code><a href="#colgroup">colgroup</a></code> element's
+    <span title="syntax-start-tag">start tag</span> may be omitted
+    if the first thing inside the <code><a href="#colgroup">colgroup</a></code> element is a <code><a href="#col">col</a></code> element, and if the element is not
+    immediately preceded by another <code><a href="#colgroup">colgroup</a></code> element whose <span title="syntax-end-tag">end tag</span> has been omitted.</p> <p>A
+    <code><a href="#colgroup">colgroup</a></code> element's <span title="syntax-end-tag">end tag</span> may be omitted if the
+    <code><a href="#colgroup">colgroup</a></code> element is not
+    immediately followed by a <a href="#space">space character</a> or
+    a <a href="#comments" title="syntax-comments">comment</a>.</p>
+  
       </div>
       <div class="no-number no-toc" id="colgroup-context">
         <h2 class="element-subhead">Permitted contexts <a class="hash" href="#colgroup-context">#</a>

Index: colgroup.html
===================================================================
RCS file: /sources/public/html5/markup/colgroup.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- colgroup.html	29 Jan 2010 02:30:44 -0000	1.22
+++ colgroup.html	29 Jan 2010 02:35:42 -0000	1.23
@@ -13,8 +13,14 @@
 </div>
 <div id="colgroup" class="section">
       <h2 class="element-head"><span class="element">colgroup</span> &#8211; <span class="shortdesc">table column group</span> <a class="hash" href="#colgroup">#</a> <a class="toc-bak" href="Overview.html#colgroup-toc">T</a></h2>
-      <div id="colgroup-longdesc" class="longdesc"><p><i class="TK">(element description to come)</i></p></div>
-      <div class="no-number no-toc" id="colgroup-content-model">
+      <div id="colgroup-longdesc" class="longdesc">
+    <p>The <a href="colgroup.html#colgroup" class="element">colgroup</a>
+    element represents a group of one or more columns in the <a href="table.html#table" class="element">table</a> that is its
+    parent.</p>
+  </div>
+      <div class="no-number no-toc" id="colgroup-contents"><h2 class="element-subhead">Permitted contents <a class="hash" href="#colgroup-contents">#</a></h2><div class="prose-model">
+    <p>Zero or more <a href="col.html#col" class="element">col</a> elements</p>
+  </div></div><div class="no-number no-toc" id="colgroup-content-model">
         <h2 class="element-subhead">Content model <a class="hash" href="#colgroup-content-model">#</a></h2><div class="content-models">
         
       <div id="colgroup-mdls">
@@ -33,7 +39,7 @@
             <dt><a class="attribute-name" id="colgroup.attrs.span" title="colgroup.attrs.span" href="colgroup.html#colgroup.attrs.span">span</a> = <span class="attr-values">
       <a class="ref" href="datatypes.html#common.data.integer.positive" title="common.data.integer.positive">integer.positive</a>
     </span> </dt>
-            <dd><i class="TK">(detailed attribute description to come)</i></dd>
+            <dd>The number of columns in the group.</dd>
           
         </dl></div>
       
@@ -58,11 +64,16 @@
       </div>
       <div class="no-number no-toc" id="colgroup-tags">
         <h2 class="element-subhead">Tag omission <a class="hash" href="#colgroup-tags">#</a></h2>
-        <p>A <a href="colgroup.html#colgroup">colgroup</a>
-            element must have both a
-            <span title="syntax-start-tag">start tag</span>
-            and an
-            <span title="syntax-end-tag">end tag</span>.</p>
+        
+    <p>A <code><a href="colgroup.html#colgroup">colgroup</a></code> element's
+    <span title="syntax-start-tag">start tag</span> may be omitted
+    if the first thing inside the <code><a href="colgroup.html#colgroup">colgroup</a></code> element is a <code><a href="col.html#col">col</a></code> element, and if the element is not
+    immediately preceded by another <code><a href="colgroup.html#colgroup">colgroup</a></code> element whose <span title="syntax-end-tag">end tag</span> has been omitted.</p> <p>A
+    <code><a href="colgroup.html#colgroup">colgroup</a></code> element's <span title="syntax-end-tag">end tag</span> may be omitted if the
+    <code><a href="colgroup.html#colgroup">colgroup</a></code> element is not
+    immediately followed by a <a href="terminology.html#space">space character</a> or
+    a <a href="syntax.html#comments" title="syntax-comments">comment</a>.</p>
+  
       </div>
       <div class="no-number no-toc" id="colgroup-context">
         <h2 class="element-subhead">Permitted contexts <a class="hash" href="#colgroup-context">#</a></h2>
Received on Friday, 29 January 2010 02:35:46 UTC