html5/spec Overview.html,1.5144,1.5145

Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv18371

Modified Files:
	Overview.html 
Log Message:
wording tweaks to avoid 'contains' which can be interpreted as referencing descendents rather than children (whatwg r6444)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.5144
retrieving revision 1.5145
diff -u -d -r1.5144 -r1.5145
--- Overview.html	12 Aug 2011 23:32:10 -0000	1.5144
+++ Overview.html	13 Aug 2011 05:38:34 -0000	1.5145
@@ -320,7 +320,7 @@
 
    <h1>HTML5</h1>
    <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-   <h2 class="no-num no-toc" id="editor-s-draft-12-august-2011">Editor's Draft 12 August 2011</h2>
+   <h2 class="no-num no-toc" id="editor-s-draft-13-august-2011">Editor's Draft 13 August 2011</h2>
    <dl><dt>Latest Published Version:</dt>
     <dd><a href="http://www.w3.org/TR/html5/">http://www.w3.org/TR/html5/</a></dd>
     <dt>Latest Editor's Draft:</dt>
@@ -466,7 +466,7 @@
   Group</a> is the W3C working group responsible for this
   specification's progress along the W3C Recommendation
   track.
-  This specification is the 12 August 2011 Editor's Draft.
+  This specification is the 13 August 2011 Editor's Draft.
   </p><!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><p>Work on this specification is also done at the <a href="http://www.whatwg.org/">WHATWG</a>. The W3C HTML working group
   actively pursues convergence with the WHATWG, as required by the <a href="http://www.w3.org/2007/03/HTML-WG-charter">W3C HTML working
   group charter</a>.</p><!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><p>This document was produced by a group operating under the <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5
@@ -15954,27 +15954,28 @@
 
   <p>If a <code><a href="#the-dl-element">dl</a></code> element is empty, it contains no groups.</p>
 
-  <p>If a <code><a href="#the-dl-element">dl</a></code> element contains non-<a href="#inter-element-whitespace" title="inter-element whitespace">whitespace</a> <a href="#text-node" title="text
-  node">text nodes</a>, or elements other than <code><a href="#the-dt-element">dt</a></code> and
-  <code><a href="#the-dd-element">dd</a></code>, then those elements or <a href="#text-node" title="text node">text
-  nodes</a> do not form part of any groups in that
+  <p>If a <code><a href="#the-dl-element">dl</a></code> element has one or more non-<a href="#inter-element-whitespace" title="inter-element whitespace">whitespace</a> <a href="#text-node">text
+  node</a> children, or has child elements that are neither
+  <code><a href="#the-dt-element">dt</a></code> nor <code><a href="#the-dd-element">dd</a></code> elements, all such <a href="#text-node" title="text node">text nodes</a> and elements, as well as their
+  descendants (including any <code><a href="#the-dt-element">dt</a></code> or <code><a href="#the-dd-element">dd</a></code>
+  elements), do not form part of any groups in that
   <code><a href="#the-dl-element">dl</a></code>.</p>
 
-  <p>If a <code><a href="#the-dl-element">dl</a></code> element contains only <code><a href="#the-dt-element">dt</a></code>
-  elements, then it consists of one group with names but no
-  values.</p>
+  <p>If a <code><a href="#the-dl-element">dl</a></code> element has one or more <code><a href="#the-dt-element">dt</a></code>
+  element chlidren but no <code><a href="#the-dd-element">dd</a></code> element children, then it
+  consists of one group with names but no values.</p>
 
-  <p>If a <code><a href="#the-dl-element">dl</a></code> element contains only <code><a href="#the-dd-element">dd</a></code>
-  elements, then it consists of one group with values but no
-  names.</p>
+  <p>If a <code><a href="#the-dl-element">dl</a></code> element has one or more <code><a href="#the-dd-element">dd</a></code>
+  element children but no <code><a href="#the-dt-element">dt</a></code> element children, then it
+  consists of one group with values but no names.</p>
 
-  <p>If a <code><a href="#the-dl-element">dl</a></code> element starts with one or more
-  <code><a href="#the-dd-element">dd</a></code> elements, then the first group has no associated
-  name.</p>
+  <p>If a <code><a href="#the-dl-element">dl</a></code> element's first <code><a href="#the-dt-element">dt</a></code> or
+  <code><a href="#the-dd-element">dd</a></code> element child is a <code><a href="#the-dd-element">dd</a></code> element, then the
+  first group has no associated name.</p>
 
-  <p>If a <code><a href="#the-dl-element">dl</a></code> element ends with one or more
-  <code><a href="#the-dt-element">dt</a></code> elements, then the last group has no associated
-  value.</p>
+  <p>If a <code><a href="#the-dl-element">dl</a></code> element's last <code><a href="#the-dt-element">dt</a></code> or
+  <code><a href="#the-dd-element">dd</a></code> element child is a <code><a href="#the-dt-element">dt</a></code> element, then the
+  last group has no associated value.</p>
 
   <p class="note">When a <code><a href="#the-dl-element">dl</a></code> element doesn't match its
   content model, it is often due to accidentally using <code><a href="#the-dd-element">dd</a></code>

Received on Saturday, 13 August 2011 05:38:44 UTC