[html5] r6444 - [e] (0) wording tweaks to avoid 'contains' which can be interpreted as referenci [...]

[whatwg at whatwg.org]

Author: ianh
Date: 2011-08-12 22:38:16 -0700 (Fri, 12 Aug 2011)
New Revision: 6444

Modified:
   complete.html
   index
   source
Log:
[e] (0) wording tweaks to avoid 'contains' which can be interpreted as referencing descendents rather than children
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=12656

Modified: complete.html
===================================================================
--- complete.html	2011-08-13 02:56:05 UTC (rev 6443)
+++ complete.html	2011-08-13 05:38:16 UTC (rev 6444)
@@ -19118,27 +19118,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>

Modified: index
===================================================================
--- index	2011-08-13 02:56:05 UTC (rev 6443)
+++ index	2011-08-13 05:38:16 UTC (rev 6444)
@@ -18982,27 +18982,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>

Modified: source
===================================================================
--- source	2011-08-13 02:56:05 UTC (rev 6443)
+++ source	2011-08-13 05:38:16 UTC (rev 6444)
@@ -20388,28 +20388,30 @@
 
   <p>If a <code>dl</code> element is empty, it contains no groups.</p>
 
-  <p>If a <code>dl</code> element contains non-<span
-  title="inter-element whitespace">whitespace</span> <span title="text
-  node">text nodes</span>, or elements other than <code>dt</code> and
-  <code>dd</code>, then those elements or <span title="text node">text
-  nodes</span> do not form part of any groups in that
+  <p>If a <code>dl</code> element has one or more non-<span
+  title="inter-element whitespace">whitespace</span> <span>text
+  node</span> children, or has child elements that are neither
+  <code>dt</code> nor <code>dd</code> elements, all such <span
+  title="text node">text nodes</span> and elements, as well as their
+  descendants (including any <code>dt</code> or <code>dd</code>
+  elements), do not form part of any groups in that
   <code>dl</code>.</p>
 
-  <p>If a <code>dl</code> element contains only <code>dt</code>
-  elements, then it consists of one group with names but no
-  values.</p>
+  <p>If a <code>dl</code> element has one or more <code>dt</code>
+  element chlidren but no <code>dd</code> element children, then it
+  consists of one group with names but no values.</p>
 
-  <p>If a <code>dl</code> element contains only <code>dd</code>
-  elements, then it consists of one group with values but no
-  names.</p>
+  <p>If a <code>dl</code> element has one or more <code>dd</code>
+  element children but no <code>dt</code> element children, then it
+  consists of one group with values but no names.</p>
 
-  <p>If a <code>dl</code> element starts with one or more
-  <code>dd</code> elements, then the first group has no associated
-  name.</p>
+  <p>If a <code>dl</code> element's first <code>dt</code> or
+  <code>dd</code> element child is a <code>dd</code> element, then the
+  first group has no associated name.</p>
 
-  <p>If a <code>dl</code> element ends with one or more
-  <code>dt</code> elements, then the last group has no associated
-  value.</p>
+  <p>If a <code>dl</code> element's last <code>dt</code> or
+  <code>dd</code> element child is a <code>dt</code> element, then the
+  last group has no associated value.</p>
 
   <p class="note">When a <code>dl</code> element doesn't match its
   content model, it is often due to accidentally using <code>dd</code>