html5/spec Overview.html,1.3119,1.3120

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

Modified Files:
	Overview.html 
Log Message:
Tidy up the content models section. (whatwg r3958)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.3119
retrieving revision 1.3120
diff -u -d -r1.3119 -r1.3120
--- Overview.html	22 Sep 2009 09:28:16 -0000	1.3119
+++ Overview.html	22 Sep 2009 09:51:40 -0000	1.3120
@@ -1629,9 +1629,9 @@
   Types" of RFC 2616. <a href="#refsHTTP">[HTTP]</a><h4 id="xml"><span class="secno">2.1.2 </span>XML</h4><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i><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>Unless otherwise stated, all elements defined or mentioned in
   this specification are in the
   <code>http://www.w3.org/1999/xhtml</code> namespace, and all
@@ -7405,10 +7405,10 @@
   </dl><p>This is then followed by a description of what the element
   <a href="#represents">represents</a>, along with any additional normative
   conformance criteria that may apply to authors<span class="impl" title=""> and implementations</span>. Examples are sometimes
-  also included.<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 class="note">As noted in the conformance and terminology
+  also included.<h4 id="content-models"><span class="secno">3.2.5 </span><dfn>Content models</dfn></h4><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 class="note">As noted in the conformance and terminology
   sections, for the purposes of determining if an element matches its
   content model or not, <a href="#text-node" title="text
   node"><code>CDATASection</code> nodes in the DOM are treated as
@@ -7421,23 +7421,23 @@
   those characters are considered <dfn id="inter-element-whitespace">inter-element
   whitespace</dfn>.<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>An element <var title="">A</var> is said to be <dfn id="preceded-or-followed">preceded or
+  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>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>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.<div class="example">
+  <a href="#inter-element-whitespace">inter-element whitespace</a>) between them.<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.<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
    <code><a href="#the-div-element">div</a></code> element. Thus, a <code><a href="#the-div-element">div</a></code> element is
    allowed in that context, even though this is not explicitly
    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).<div class="example">
+  </div><p>In addition, <a href="#html-elements">HTML elements</a> may be orphan nodes
+  (i.e. without a parent node).<div class="example">
 
    <p>For example, creating a <code><a href="#the-td-element">td</a></code> element and storing it
    in a global variable in a script is conforming, even though

Received on Tuesday, 22 September 2009 09:51:53 UTC