[e] (0) wording tweaks to avoid 'contains' which can be interpreted a…

…s referencing descendents rather than children Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=12656 git-svn-id: http://svn.whatwg.org/webapps@6444 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Aug 13, 2011 · 8f03326 · 8f03326
1 parent eb2bec8
commit 8f03326
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 49 deletions.
diff --git a/complete.html b/complete.html
@@ -19118,27 +19118,28 @@ <h4 id=the-dl-element><span class=secno>4.5.8 </span>The <dfn><code>dl</code></d
 
   <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>

diff --git a/index b/index
@@ -18982,27 +18982,28 @@ I first lived there):&lt;/p&gt;
 
   <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>

diff --git a/source b/source
@@ -20388,28 +20388,30 @@ I first lived there):&lt;/p>
 
   <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>