[e] (0) Tidy up the content models section.

Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=7519 git-svn-id: http://svn.whatwg.org/webapps@3958 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Sep 22, 2009 · e76dbe3 · e76dbe3
1 parent 61fe884
commit e76dbe3
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 36 deletions.
diff --git a/index b/index
@@ -1739,9 +1739,9 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
   <p id=html-namespace>To ease migration from HTML to XHTML, UAs
   conforming to this specification will place elements in HTML in the
   <code>http://www.w3.org/1999/xhtml</code> namespace, at least for
-  the purposes of the DOM and CSS. The term "<dfn id=elements-in-the-html-namespace>elements in the HTML
-  namespace</dfn>", or "<dfn id=html-elements>HTML elements</dfn>" for short, when used
-  in this specification, thus refers to both HTML and XHTML
+  the purposes of the DOM and CSS. The term "<dfn id=html-elements>HTML
+  elements</dfn>", when used in this specification, refers to any
+  element in that namespace, and thus refers to both HTML and XHTML
   elements.</p>
 
   <p>Unless otherwise stated, all elements defined or mentioned in
@@ -8294,10 +8294,10 @@ background: transparent"&gt;blue&lt;/span&gt;.&lt;/p&gt;</pre>
 
   <h4 id=content-models><span class=secno>3.2.5 </span><dfn>Content models</dfn></h4>
 
-  <p>All the elements in this specification have a defined content
-  model, which describes what nodes are allowed inside the elements,
-  and thus what the structure of an HTML document or fragment must
-  look like.</p>
+  <p>Each element defined in this specification has a content model: a
+  description of the element's expected contents. An <a href=#html-elements title="HTML
+  elements">HTML element</a> must have contents that match the
+  requirements described in the element's content model.</p>
 
   <p class=note>As noted in the conformance and terminology
   sections, for the purposes of determining if an element matches its
@@ -8316,21 +8316,21 @@ background: transparent"&gt;blue&lt;/span&gt;.&lt;/p&gt;</pre>
 
   <p><a href=#inter-element-whitespace>Inter-element whitespace</a>, comment nodes, and
   processing instruction nodes must be ignored when establishing
-  whether an element matches its content model or not, and must be
-  ignored when following algorithms that define document and element
-  semantics.</p>
+  whether an element's contents match the element's content model or
+  not, and must be ignored when following algorithms that define
+  document and element semantics.</p>
 
   <p>An element <var title="">A</var> is said to be <dfn id=preceded-or-followed>preceded or
   followed</dfn> by a second element <var title="">B</var> if <var title="">A</var> and <var title="">B</var> have the same parent node
   and there are no other element nodes or text nodes (other than
   <a href=#inter-element-whitespace>inter-element whitespace</a>) between them.</p>
 
-  <p>Authors must not use <a href=#elements-in-the-html-namespace>elements in the HTML namespace</a>
-  anywhere except where they are explicitly allowed, as defined for
-  each element, or as explicitly required by other specifications. For
-  XML compound documents, these contexts could be inside elements from
-  other namespaces, if those elements are defined as providing the
-  relevant contexts.</p>
+  <p>Authors must not use <a href=#html-elements>HTML elements</a> anywhere except
+  where they are explicitly allowed, as defined for each element, or
+  as explicitly required by other specifications. For XML compound
+  documents, these contexts could be inside elements from other
+  namespaces, if those elements are defined as providing the relevant
+  contexts.</p>
 
   <div class=example>
    <p>The Atom specification defines the Atom <code title="">content</code> element, when its <code title="">type</code> attribute has the value <code title="">xhtml</code>, as requiring that it contains a single HTML
@@ -8339,8 +8339,8 @@ background: transparent"&gt;blue&lt;/span&gt;.&lt;/p&gt;</pre>
    normatively stated by this specification. <a href=#refsATOM>[ATOM]</a></p>
   </div>
 
-  <p>In addition, <a href=#elements-in-the-html-namespace>elements in the HTML namespace</a> may be
-  orphan nodes (i.e. without a parent node).</p>
+  <p>In addition, <a href=#html-elements>HTML elements</a> may be orphan nodes
+  (i.e. without a parent node).</p>
 
   <div class=example>
 

diff --git a/source b/source
@@ -734,9 +734,9 @@ a.setAttribute('href', 'http://example.com/'); // change the content attribute d
   <p id="html-namespace">To ease migration from HTML to XHTML, UAs
   conforming to this specification will place elements in HTML in the
   <code>http://www.w3.org/1999/xhtml</code> namespace, at least for
-  the purposes of the DOM and CSS. The term "<dfn>elements in the HTML
-  namespace</dfn>", or "<dfn>HTML elements</dfn>" for short, when used
-  in this specification, thus refers to both HTML and XHTML
+  the purposes of the DOM and CSS. The term "<dfn>HTML
+  elements</dfn>", when used in this specification, refers to any
+  element in that namespace, and thus refers to both HTML and XHTML
   elements.</p>
 
   <p>Unless otherwise stated, all elements defined or mentioned in
@@ -8438,10 +8438,10 @@ background: transparent">blue&lt;/span>.&lt;/p></pre>
 
   <h4><dfn>Content models</dfn></h4>
 
-  <p>All the elements in this specification have a defined content
-  model, which describes what nodes are allowed inside the elements,
-  and thus what the structure of an HTML document or fragment must
-  look like.</p>
+  <p>Each element defined in this specification has a content model: a
+  description of the element's expected contents. An <span title="HTML
+  elements">HTML element</span> must have contents that match the
+  requirements described in the element's content model.</p>
 
   <p class="note">As noted in the conformance and terminology
   sections, for the purposes of determining if an element matches its
@@ -8462,22 +8462,22 @@ background: transparent">blue&lt;/span>.&lt;/p></pre>
 
   <p><span>Inter-element whitespace</span>, comment nodes, and
   processing instruction nodes must be ignored when establishing
-  whether an element matches its content model or not, and must be
-  ignored when following algorithms that define document and element
-  semantics.</p>
+  whether an element's contents match the element's content model or
+  not, and must be ignored when following algorithms that define
+  document and element semantics.</p>
 
   <p>An element <var title="">A</var> is said to be <dfn>preceded or
   followed</dfn> by a second element <var title="">B</var> if <var
   title="">A</var> and <var title="">B</var> have the same parent node
   and there are no other element nodes or text nodes (other than
   <span>inter-element whitespace</span>) between them.</p>
 
-  <p>Authors must not use <span>elements in the HTML namespace</span>
-  anywhere except where they are explicitly allowed, as defined for
-  each element, or as explicitly required by other specifications. For
-  XML compound documents, these contexts could be inside elements from
-  other namespaces, if those elements are defined as providing the
-  relevant contexts.</p>
+  <p>Authors must not use <span>HTML elements</span> anywhere except
+  where they are explicitly allowed, as defined for each element, or
+  as explicitly required by other specifications. For XML compound
+  documents, these contexts could be inside elements from other
+  namespaces, if those elements are defined as providing the relevant
+  contexts.</p>
 
   <div class="example">
    <p>The Atom specification defines the Atom <code
@@ -8490,8 +8490,8 @@ background: transparent">blue&lt;/span>.&lt;/p></pre>
    href="#refsATOM">[ATOM]</a></p>
   </div>
 
-  <p>In addition, <span>elements in the HTML namespace</span> may be
-  orphan nodes (i.e. without a parent node).</p>
+  <p>In addition, <span>HTML elements</span> may be orphan nodes
+  (i.e. without a parent node).</p>
 
   <div class="example">