hixie: Sync with DOM Core: Remove all vestiges of CDATASection objects and Entity objects; replace all mentions of 'text nodes' with explicit references to Text nodes. (whatwg r6945)

hixie: Sync with DOM Core: Remove all vestiges of CDATASection objects
and Entity objects; replace all mentions of 'text nodes' with explicit
references to Text nodes. (whatwg r6945)

http://dev.w3.org/cvsweb/html5/spec/Overview.html?r1=1.5541&r2=1.5542&f=h
http://html5.org/tools/web-apps-tracker?from=6944&to=6945

===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.5541
retrieving revision 1.5542
diff -u -d -r1.5541 -r1.5542
--- Overview.html 31 Jan 2012 01:35:09 -0000 1.5541
+++ Overview.html 31 Jan 2012 19:36:34 -0000 1.5542
@@ -1668,23 +1668,26 @@
 <input name=address maxlength='200'>
 &lt;input name=address maxlength="200"&gt;</pre><p>HTML user agents (e.g. Web browsers) then <i>parse</i> this
   markup, turning it into a DOM (Document Object Model) tree. A DOM
-  tree is an in-memory representation of a document.<p>DOM trees contain several kinds of nodes, in particular a DOCTYPE
-  node, elements, text nodes, and comment nodes.<p>The <a href="#intro-early-example">markup snippet at the top of
+  tree is an in-memory representation of a document.<p>DOM trees contain several kinds of nodes, in particular a
+  <code><a href="#documenttype">DocumentType</a></code> node, <code><a href="#element">Element</a></code> nodes,
+  <code><a href="#text">Text</a></code> nodes, <code><a href="#comment-0">Comment</a></code> nodes, and in some
+  cases <code><a href="#processinginstruction">ProcessingInstruction</a></code> nodes.<p>The <a href="#intro-early-example">markup snippet at the top of
   this section</a> would be turned into the following DOM tree:<ul class="domTree"><li class="t10">DOCTYPE: <code title="">html</code><li class="t1"><code><a href="#the-html-element">html</a></code><ul><li class="t1"><code><a href="#the-head-element">head</a></code><ul><li class="t3"><code>#text</code>: <span title="">&#9166;&#9251;&#9251;</span><li class="t1"><code><a href="#the-title-element">title</a></code><ul><li class="t3"><code>#text</code>: <span title="">Sample page</span></ul><li class="t3"><code>#text</code>: <span title="">&#9166;&#9251;</span></ul><li class="t3"><code>#text</code>: <span title="">&#9166;&#9251;</span><li class="t1"><code><a href="#the-body-element">body</a></code><ul><li class="t3"><code>#text</code>: <span title="">&#9166;&#9251;&#9251;</span><li class="t1"><code><a href="#the-h1-h2-h3-h4-h5-and-h6-elements">h1</a></code><ul><li class="t3"><code>#text</code>: <span title="">Sample page</span></ul><li class="t3"><code>#text</code>: <span title="">&#9166;&#9251;&#9251;</span><l class="t1"><code><a href="#the-p-element">p</a></code><ul><li class="t3"><code>#text</code>: <span title="">This is a </span><li class="t1"><code><a href="#the-a-element">a</a></code> <span class="t2" title=""><code class="attribute name">href</code>="<code class="attribute value">demo.html</code>"</span><ul><li class="t3"><code>#text</code>: <span title="">simple</span></ul><li class="t3"><code>#text</code>: <span title=""> sample.</span></ul><li class="t3"><code>#text</code>: <span title="">&#9166;&#9251;&#9251;</span><li class="t8"><code>#comment</code>: <span title=""> this is a comment </span><li class="t3"><code>#text</code>: <span title="">&#9166;&#9251;&#9166;</span></ul></ul></ul><p>The <a href="#root-element">root element</a> of this tree is the
   <code><a href="#the-html-element">html</a></code> element, which is the element always found at the
   root of HTML documents. It contains two elements, <code><a href="#the-head-element">head</a></code>
-  and <code><a href="#the-body-element">body</a></code>, as well as a text node between them.<p>There are many more text nodes in the DOM tree than one would
-  initially expect, because the source contains a number of spaces
-  (represented here by "&#9251;") and line breaks ("&#9166;") that
-  all end up as text nodes in the DOM. However, for historical reasons
-  not all of the spaces and line breaks in the original markup appear
-  in the DOM. In particular, all the whitespace before
-  <code><a href="#the-head-element">head</a></code> start tag ends up being dropped silently, and all
-  the whitespace after the <code><a href="#the-body-element">body</a></code> end tag ends up placed at
-  the end of the <code><a href="#the-body-element">body</a></code>.<p>The <code><a href="#the-head-element">head</a></code> element contains a <code><a href="#the-title-element">title</a></code>
-  element, which itself contains a text node with the text "Sample
-  page". Similarly, the <code><a href="#the-body-element">body</a></code> element contains an
-  <code><a href="#the-h1-h2-h3-h4-h5-and-h6-elements">h1</a></code> element, a <code><a href="#the-p-element">p</a></code> element, and a
+  and <code><a href="#the-body-element">body</a></code>, as well as a <code><a href="#text">Text</a></code> node between
+  them.<p>There are many more <code><a href="#text">Text</a></code> nodes in the DOM tree than
+  one would initially expect, because the source contains a number of
+  spaces (represented here by "&#9251;") and line breaks ("&#9166;")
+  that all end up as <code><a href="#text">Text</a></code> nodes in the DOM. However, for
+  historical reasons not all of the spaces and line breaks in the
+  original markup appear in the DOM. In particular, all the whitespace
+  before <code><a href="#the-head-element">head</a></code> start tag ends up being dropped silently,
+  and all the whitespace after the <code><a href="#the-body-element">body</a></code> end tag ends up
+  placed at the end of the <code><a href="#the-body-element">body</a></code>.<p>The <code><a href="#the-head-element">head</a></code> element contains a <code><a href="#the-title-element">title</a></code>
+  element, which itself contains a <code><a href="#text">Text</a></code> node with the
+  text "Sample page". Similarly, the <code><a href="#the-body-element">body</a></code> element
+  contains an <code><a href="#the-h1-h2-h3-h4-h5-and-h6-elements">h1</a></code> element, a <code><a href="#the-p-element">p</a></code> element, and a
   comment.<hr><p>This DOM tree can be manipulated from scripts in the
   page. Scripts (typically in JavaScript) are small programs that can
   be embedded using the <code><a href="#the-script-element">script</a></code> element or using
@@ -2685,14 +2688,12 @@
   traversal of DOM nodes involved (through the <code title="dom-Node-parentNode"><a href="#dom-node-parentnode">parentNode</a></code>/<code title="dom-Node-childNodes"><a href="#dom-node-childnodes">childNodes</a></code> relationship).<p>When it is stated that some element or attribute is <dfn id="ignore" title="ignore">ignored</dfn>, or treated as some other value, or
   handled as if it was something else, this refers only to the
   processing of the node after it is in the DOM. <span class="impl">A
-  user agent must not mutate the DOM in such situations.</span><p>The term <dfn id="text-node">text node</dfn> refers to any <code><a href="#text">Text</a></code>
-  node, including <code><a href="#cdatasection">CDATASection</a></code> nodes; specifically, any
-  <code><a href="#node">Node</a></code> with node type <code title="">TEXT_NODE</code> (3)
-  or <code title="">CDATA_SECTION_NODE</code> (4). <a href="#refsDOMCORE">[DOMCORE]</a><p>A content attribute is said to <dfn title="">change</dfn> value
+  user agent must not mutate the DOM in such situations.</span><p>A content attribute is said to <dfn title="">change</dfn> value
   only if its new value is different than its previous value; setting
   an attribute to a value it already has does not change it.<p>The term <dfn title="">empty</dfn>, when used of an attribute
-  value, text node, or string, means that the length of the text is
-  zero (i.e. not even containing spaces or control characters).<h4 id="scripting-0"><span class="secno">2.1.4 </span>Scripting</h4><p>The construction "a <code>Foo</code> object", where
+  value, <code><a href="#text">Text</a></code> node, or string, means that the length of
+  the text is zero (i.e. not even containing spaces or control
+  characters).<h4 id="scripting-0"><span class="secno">2.1.4 </span>Scripting</h4><p>The construction "a <code>Foo</code> object", where
   <code>Foo</code> is actually an interface, is sometimes used instead
   of the more accurate "an object implementing the interface
   <code>Foo</code>".<p>An IDL attribute is said to be <dfn title="">getting</dfn> when
@@ -3103,8 +3104,6 @@
   one of these two formats, although supporting both is
   encouraged.</p>
 
-
-
   <p>Some conformance requirements are phrased as requirements on
   elements, attributes, methods or objects. Such requirements fall
   into two categories: those describing content model restrictions,
@@ -3155,7 +3154,6 @@
     Core specification: <a href="#refsDOMCORE">[DOMCORE]</a></p>
 
     <ul class="brief"><li><dfn id="attr"><code>Attr</code></dfn> interface</li>
-     <li><dfn id="cdatasection"><code>CDATASection</code></dfn> interface</li>
      <li><dfn id="comment-0"><code>Comment</code></dfn> interface</li>
      <li><dfn id="domimplementation"><code>DOMImplementation</code></dfn> interface</li>
      <li><dfn id="dom-document" title="DOM Document"><code>Document</code></dfn> interface</li>
@@ -8606,10 +8604,10 @@
    on the <code>SVGDocument</code> interface. <a href="#refsSVG">[SVG]</a></li>
 
    <li><p>Otherwise, let <var title="">value</var> be a concatenation
-   of the data of all the child <a href="#text-node" title="text node">text
-   nodes</a> of <a href="#the-title-element-0">the <code>title</code> element</a>, in
-   <a href="#tree-order">tree order</a>, or the empty string if <a href="#the-title-element-0">the
-   <code>title</code> element</a> is null.</li>
+   of the data of all the child <code><a href="#text">Text</a></code> nodes of <a href="#the-title-element-0">the
+   <code>title</code> element</a>, in <a href="#tree-order">tree order</a>, or
+   the empty string if <a href="#the-title-element-0">the <code>title</code> element</a> is
+   null.</li>
 
    <li><p>Replace any sequence of one or more consecutive <a href="#space-character" title="space character">space characters</a> in <var title="">value</var> with a single U+0020 SPACE character.</li>
 
@@ -9531,7 +9529,7 @@
     <p>Find the first character in <a href="#tree-order">tree order</a> that
     matches the following criteria:</p>
 
-    <ul><li><p>The character is from a <a href="#text-node">text node</a> that is a
+    <ul><li><p>The character is from a <code><a href="#text">Text</a></code> node that is a
      descendant of the element whose <a href="#the-directionality" title="the
      directionality">directionality</a> is being
      determined.</li>
@@ -9541,8 +9539,8 @@
 
      <li>
 
-      <p>The character is not in a text node that has an ancestor
-      element that is a descendant of the element whose <a href="#the-directionality" title="the directionality">directionality</a> is being
+      <p>The character is not in a <code><a href="#text">Text</a></code> node that has an
+      ancestor element that is a descendant of the element whose <a href="#the-directionality" title="the directionality">directionality</a> is being
       determined and that is either:</p>
 
       <ul class="brief"><li>A <code><a href="#the-bdi-element">bdi</a></code> element.
@@ -9920,27 +9918,23 @@
   restriction on what text can be specified in such attributes.<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
-  equivalent to <code>Text</code> nodes</a>.<p>The <a href="#space-character" title="space character">space characters</a> are
+  requirements described in the element's content model.<p>The <a href="#space-character" title="space character">space characters</a> are
   always allowed between elements. User agents represent these
-  characters between elements in the source markup as text nodes in
-  the DOM. Empty <a href="#text-node" title="text node">text nodes</a> and <a href="#text-node" title="text node">text nodes</a> consisting of just sequences of
-  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
+  characters between elements in the source markup as
+  <code><a href="#text">Text</a></code> nodes in the DOM. Empty <code><a href="#text">Text</a></code> nodes and
+  <code><a href="#text">Text</a></code> nodes consisting of just sequences of 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's contents match the element's content model or
   not, and must be ignored when following algorithms that define
   document and element semantics.<p class="note">Thus, an element <var title="">A</var> is said to be
   <i>preceded or followed</i> 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. Similarly, a node is the <i>only child</i> of an
-  element if that element contains no other nodes other than
-  <a href="#inter-element-whitespace">inter-element whitespace</a>, comment nodes, and processing
-  instruction nodes.<p>Authors must not use <a href="#html-elements">HTML elements</a> anywhere except
+  <code><a href="#text">Text</a></code> nodes (other than <a href="#inter-element-whitespace">inter-element
+  whitespace</a>) between them. Similarly, a node is the <i>only
+  child</i> of an element if that element contains no other nodes
+  other than <a href="#inter-element-whitespace">inter-element whitespace</a>, comment nodes, and
+  processing instruction nodes.<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
@@ -10178,7 +10172,7 @@
    <li><a href="#text-content" title="text content">Text</a></li>
   </ul><p>As a general rule, elements whose content model allows any
   <a href="#phrasing-content">phrasing content</a> should have either at least one
-  descendant <a href="#text-node">text node</a> that is not <a href="#inter-element-whitespace">inter-element
+  descendant <code><a href="#text">Text</a></code> node that is not <a href="#inter-element-whitespace">inter-element
   whitespace</a>, or at least one descendant element node that is
   <a href="#embedded-content">embedded content</a>. For the purposes of this requirement,
   nodes that are descendants of <code><a href="#the-del-element">del</a></code> elements must not be
@@ -10186,11 +10180,12 @@
   element.<p class="note">Most elements that are categorized as phrasing
   content can only contain elements that are themselves categorized as
   phrasing content, not any flow content.<p><dfn id="text-content" title="text content">Text</dfn>, in the context of content
-  models, means <a href="#text-node" title="text node">text nodes</a>. <a href="#text-content" title="text content">Text</a> is sometimes used as a content
-  model on its own, but is also <a href="#phrasing-content">phrasing content</a>, and can
-  be <a href="#inter-element-whitespace">inter-element whitespace</a> (if the <a href="#text-node" title="text
-  node">text nodes</a> are empty or contain just <a href="#space-character" title="space
-  character">space characters</a>).</p><h6 id="embedded-content-0"><span class="secno">3.2.5.1.6 </span>Embedded content</h6><p><dfn id="embedded-content">Embedded content</dfn> is content that imports another
+  models, means <code><a href="#text">Text</a></code> nodes. <a href="#text-content" title="text
+  content">Text</a> is sometimes used as a content model on its
+  own, but is also <a href="#phrasing-content">phrasing content</a>, and can be
+  <a href="#inter-element-whitespace">inter-element whitespace</a> (if the <code><a href="#text">Text</a></code>
+  nodes are empty or contain just <a href="#space-character" title="space character">space
+  characters</a>).</p><h6 id="embedded-content-0"><span class="secno">3.2.5.1.6 </span>Embedded content</h6><p><dfn id="embedded-content">Embedded content</dfn> is content that imports another
   resource into the document, or content from another vocabulary that
   is inserted into the document.</p><ul class="brief category-list"><li><code><a href="#the-audio-element">audio</a></code></li>
    <li><code><a href="#the-canvas-element">canvas</a></code></li>
@@ -10615,17 +10610,16 @@
 
   </div><h4 id="requirements-relating-to-bidirectional-algorithm-formatting-characters"><span class="secno">3.2.6 </span>Requirements relating to bidirectional-algorithm formatting
   characters</h4><p><a href="#text-content">Text content</a> in <a href="#html-elements">HTML elements</a> with
-  child <a href="#text-node" title="text node">text nodes</a>, and text in
-  attributes of <a href="#html-elements">HTML elements</a> that allow free-form text,
-  may contain characters in the range U+202A to U+202E (the
-  bidirectional-algorithm formatting characters). However, the use of
-  these characters is restricted so that any embedding or overrides
-  generated by these characters do not start and end with different
-  parent elements, and so that all such embeddings and overrides are
-  explicitly terminated by a U+202C POP DIRECTIONAL FORMATTING
-  character. This helps reduce incidences of text being reused in a
-  manner that has unforeseen effects on the bidirectional
-  algorithm.<p>The aforementioned restrictions are defined by specifying that
+  child <code><a href="#text">Text</a></code> nodes, and text in attributes of <a href="#html-elements">HTML
+  elements</a> that allow free-form text, may contain characters in
+  the range U+202A to U+202E (the bidirectional-algorithm formatting
+  characters). However, the use of these characters is restricted so
+  that any embedding or overrides generated by these characters do not
+  start and end with different parent elements, and so that all such
+  embeddings and overrides are explicitly terminated by a U+202C POP
+  DIRECTIONAL FORMATTING character. This helps reduce incidences of
+  text being reused in a manner that has unforeseen effects on the
+  bidirectional algorithm.<p>The aforementioned restrictions are defined by specifying that
   certain parts of documents form <a href="#bidirectional-algorithm-formatting-character-ranges">bidirectional-algorithm
   formatting character ranges</a>, and then imposing a requirement
   on such ranges.<p>The strings resulting from applying the following algorithm to an
@@ -10645,7 +10639,7 @@
     <p>Process <var title="">node</var> according to the first
     matching step from the following list:</p>
 
-    <dl class="switch"><dt>If <var title="">node</var> is a <a href="#text-node">text node</a></dt>
+    <dl class="switch"><dt>If <var title="">node</var> is a <code><a href="#text">Text</a></code> node</dt>
 
      <dd><p>Append the text data of <var title="">node</var> to <var title="">string</var>.</dd>
 
@@ -11712,7 +11706,7 @@
    <dd>
 
     <p>Returns the contents of the element, ignoring child nodes that
-    aren't <a href="#text-node" title="text node">text nodes</a>.</p>
+    aren't <code><a href="#text">Text</a></code> nodes.</p>
 
     <p>Can be set, to replace the element's children with the given
     value.</p>
@@ -11722,11 +11716,11 @@
   </dl><div class="impl">
 
   <p>The IDL attribute <dfn id="dom-title-text" title="dom-title-text"><code>text</code></dfn> must return a
-  concatenation of the contents of all the <a href="#text-node" title="text
-  node">text nodes</a> that are children of the <code><a href="#the-title-element">title</a></code>
-  element (ignoring any other nodes such as comments or elements), in
-  tree order. On setting, it must act the same way as the
-  <code><a href="#textcontent">textContent</a></code> IDL attribute.</p>
+  concatenation of the contents of all the <code><a href="#text">Text</a></code> nodes
+  that are children of the <code><a href="#the-title-element">title</a></code> element (ignoring any
+  other nodes such as comments or elements), in tree order. On
+  setting, it must act the same way as the <code><a href="#textcontent">textContent</a></code>
+  IDL attribute.</p>
 
   </div><div class="example">
 
@@ -13056,7 +13050,7 @@
   evaluated. For styling languages that consist of pure text (as
   opposed to XML), user agents must evaluate <code><a href="#the-style-element">style</a></code>
   elements by passing the concatenation of the contents of all the
-  <a href="#text-node" title="text node">text nodes</a> that are children of the
+  <code><a href="#text">Text</a></code> nodes that are children of the
   <code><a href="#the-style-element">style</a></code> element (not any other nodes such as comments or
   elements), in <a href="#tree-order">tree order</a>, to the style system. For
   XML-based styling languages, user agents must pass all the child
@@ -13466,9 +13460,8 @@
 
     <p>If the element has no <code title="attr-script-src"><a href="#attr-script-src">src</a></code>
     attribute, and its child nodes, if any, consist only of comment
-    nodes and empty <a href="#text-node" title="text node">text nodes</a>, then
-    the user agent must abort these steps at this point. The script is
-    not executed.</p>
+    nodes and empty <code><a href="#text">Text</a></code> nodes, then the user agent must
+    abort these steps at this point. The script is not executed.</p>
 
    </li>
 
@@ -13998,7 +13991,7 @@
    <dd>
 
     <p>Returns the contents of the element, ignoring child nodes that
-    aren't <a href="#text-node" title="text node">text nodes</a>.</p>
+    aren't <code><a href="#text">Text</a></code> nodes.</p>
 
     <p>Can be set, to replace the element's children with the given
     value.</p>
@@ -14008,11 +14001,11 @@
   </dl><div class="impl">
 
   <p>The IDL attribute <dfn id="dom-script-text" title="dom-script-text"><code>text</code></dfn> must return a
-  concatenation of the contents of all the <a href="#text-node" title="text
-  node">text nodes</a> that are children of the <code><a href="#the-script-element">script</a></code>
-  element (ignoring any other nodes such as comments or elements), in
-  tree order. On setting, it must act the same way as the
-  <code><a href="#textcontent">textContent</a></code> IDL attribute.</p>
+  concatenation of the contents of all the <code><a href="#text">Text</a></code> nodes
+  that are children of the <code><a href="#the-script-element">script</a></code> element (ignoring any
+  other nodes such as comments or elements), in tree order. On
+  setting, it must act the same way as the <code><a href="#textcontent">textContent</a></code>
+  IDL attribute.</p>
 
   </div><p class="note">When inserted using the <code title="dom-document-write"><a href="#dom-document-write">document.write()</a></code> method,
   <code><a href="#the-script-element">script</a></code> elements execute (typically synchronously), but
@@ -14341,7 +14334,7 @@
        call these elements <var title="">the after children</var>.</li>
 
        <li>Let <var title="">s</var> be the concatenation of all the
-       <a href="#text-node">text node</a> children of the <code><a href="#the-noscript-element">noscript</a></code>
+       <code><a href="#text">Text</a></code> node children of the <code><a href="#the-noscript-element">noscript</a></code>
        element.</li>
 
        <li>Set the <code title="dom-innerHTML"><a href="#dom-innerhtml">innerHTML</a></code>
@@ -16703,12 +16696,12 @@
 
   <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 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 has one or more non-<a href="#inter-element-whitespace" title="inter-element whitespace">whitespace</a> <code><a href="#text">Text</a></code>
+  node 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
+  <code><a href="#text">Text</a></code> nodes 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 has one or more <code><a href="#the-dt-element">dt</a></code>
   element children but no <code><a href="#the-dd-element">dd</a></code> element children, then it
@@ -17613,7 +17606,7 @@
   <dfn id="attr-dfn-title" title="attr-dfn-title"><code>title</code></dfn> attribute, then
   the exact value of that attribute is the term being defined.
   Otherwise, if it contains exactly one element child node and no
-  child <a href="#text-node" title="text node">text nodes</a>, and that child
+  child <code><a href="#text">Text</a></code> nodes, and that child
   element is an <code><a href="#the-abbr-element">abbr</a></code> element with a <code title="attr-abbr-title"><a href="#attr-abbr-title">title</a></code> attribute, then the exact value
   of <em>that</em> attribute is the term being defined. Otherwise, it
   is the exact <code><a href="#textcontent">textContent</a></code> of the <code><a href="#the-dfn-element">dfn</a></code>
@@ -19590,9 +19583,9 @@
      <li><p>If the image is a descendant of a <code><a href="#the-figure-element">figure</a></code>
      element that has a child <code><a href="#the-figcaption-element">figcaption</a></code> element, and,
      ignoring the <code><a href="#the-figcaption-element">figcaption</a></code> element and its descendants,
-     the <code><a href="#the-figure-element">figure</a></code> element has no text node descendants
-     other than <a href="#inter-element-whitespace">inter-element whitespace</a>, and no
-     <a href="#embedded-content">embedded content</a> descendant other than the
+     the <code><a href="#the-figure-element">figure</a></code> element has no <code><a href="#text">Text</a></code> node
+     descendants other than <a href="#inter-element-whitespace">inter-element whitespace</a>, and
+     no <a href="#embedded-content">embedded content</a> descendant other than the
      <code><a href="#the-img-element">img</a></code> element, then the contents of the first such
      <code><a href="#the-figcaption-element">figcaption</a></code> element are the caption information;
      abort these steps.</li>
@@ -20367,10 +20360,10 @@
      <code><a href="#the-figcaption-element">figcaption</a></code> element that contains content other than
      <a href="#inter-element-whitespace">inter-element whitespace</a>, and, ignoring the
      <code><a href="#the-figcaption-element">figcaption</a></code> element and its descendants, the
-     <code><a href="#the-figure-element">figure</a></code> element has no text node descendants other
-     than <a href="#inter-element-whitespace">inter-element whitespace</a>, and no <a href="#embedded-content">embedded
-     content</a> descendant other than the <code><a href="#the-img-element">img</a></code>
-     element.</li>
+     <code><a href="#the-figure-element">figure</a></code> element has no <code><a href="#text">Text</a></code> node
+     descendants other than <a href="#inter-element-whitespace">inter-element whitespace</a>, and
+     no <a href="#embedded-content">embedded content</a> descendant other than the
+     <code><a href="#the-img-element">img</a></code> element.</li>
 
     </ul><p class="note">Such cases are to be kept to an absolute
     minimum. If there is even the slightest possibility of the author
@@ -39457,10 +39450,10 @@
   these must return a new <code><a href="#htmloptionelement">HTMLOptionElement</a></code> object (a new
   <code><a href="#the-option-element">option</a></code> element). If the <var title="">text</var>
   argument is present, the new object must have as its only child a
-  <code><a href="#node">Node</a></code> with node type <code title="">TEXT_NODE</code> (3)
-  whose data is the value of that argument. If the <var title="">value</var> argument is present, the new object must have a
-  <code title="attr-option-value"><a href="#attr-option-value">value</a></code> attribute set with the
-  value of the argument as its value. If the <var title="">defaultSelected</var> argument is present and true, the new
+  <code><a href="#text">Text</a></code> node whose data is the value of that argument. If
+  the <var title="">value</var> argument is present, the new object
+  must have a <code title="attr-option-value"><a href="#attr-option-value">value</a></code> attribute
+  set with the value of the argument as its value. If the <var title="">defaultSelected</var> argument is present and true, the new
   object must have a <code title="attr-option-selected"><a href="#attr-option-selected">selected</a></code> attribute set with no
   value. If the <var title="">selected</var> argument is present and
   true, the new object must have its <a href="#concept-option-selectedness" title="concept-option-selectedness">selectedness</a> set to true;
@@ -55237,13 +55230,13 @@
    <code title="attr-textarea-readonly"><a href="#attr-textarea-readonly">readonly</a></code> attribute and
    that are not <a href="#concept-fe-disabled" title="concept-fe-disabled">disabled</a>.</li>
 
-   <li>Text in <a href="#text-node" title="text node">text nodes</a> that are
+   <li>Text in <code><a href="#text">Text</a></code> nodes that are
    children of <a href="#editing-host" title="editing host">editing hosts</a> or
    <a href="#editable">editable</a> elements.</li>
 
    <li>Text in attributes of <a href="#editable">editable</a> elements.</li>
 
-  </ul><p>For text that is part of a <a href="#text-node">text node</a>, the element
+  </ul><p>For text that is part of a <code><a href="#text">Text</a></code> node, the element
   with which the text is associated is the element that is the
   immediate parent of the first character of the word, sentence, or
   other piece of text. For text in attributes, it is the attribute's
@@ -56356,12 +56349,13 @@
     follows:</p>
 
     <p>If it is a selection that is being dragged, then the
-    <a href="#source-node">source node</a> is the text node that the user started
-    the drag on (typically the text node that the user originally
-    clicked). If the user did not specify a particular node, for
-    example if the user just told the user agent to begin a drag of
-    "the selection", then the <a href="#source-node">source node</a> is the first
-    text node containing a part of the selection.</p>
+    <a href="#source-node">source node</a> is the <code><a href="#text">Text</a></code> node that the
+    user started the drag on (typically the <code><a href="#text">Text</a></code> node
+    that the user originally clicked). If the user did not specify a
+    particular node, for example if the user just told the user agent
+    to begin a drag of "the selection", then the <a href="#source-node">source
+    node</a> is the first <code><a href="#text">Text</a></code> node containing a part
+    of the selection.</p>
 
     <p>Otherwise, if it is an element that is being dragged, then the
     <a href="#source-node">source node</a> is the element that is being dragged.</p>
@@ -61421,32 +61415,32 @@
   <div class="example">
 
    <p>Here are some sample inputs to the parser and the corresponding
-   number of text nodes that they result in, assuming a user agent
+   number of <code><a href="#text">Text</a></code> nodes that they result in, assuming a user agent
    that executes scripts.</p>
 
-   <table><thead><tr><th>Input <th>Number of text nodes
+   <table><thead><tr><th>Input <th>Number of <code><a href="#text">Text</a></code> nodes
     <tbody><tr><td><pre>A&lt;script&gt;
 var&nbsp;script&nbsp;=&nbsp;document.getElementsByTagName('script')[0];
 document.body.removeChild(script);
 &lt;/script&gt;B</pre>
-      <td>One text node in the document, containing "AB".
+      <td>One <code><a href="#text">Text</a></code> node in the document, containing "AB".
      <tr><td><pre>A&lt;script&gt;
 var&nbsp;text&nbsp;=&nbsp;document.createTextNode('B');
 document.body.appendChild(text);
 &lt;/script&gt;C</pre>
-      <td>Three text nodes; "A" before the script, the script's contents, and "BC" after the script (the parser appends to the text node created by the script).
+      <td>Three <code><a href="#text">Text</a></code> nodes; "A" before the script, the script's contents, and "BC" after the script (the parser appends to the <code><a href="#text">Text</a></code> node created by the script).
      <tr><td><pre>A&lt;script&gt;
 var&nbsp;text&nbsp;=&nbsp;document.getElementsByTagName('script')[0].firstChild;
 text.data&nbsp;=&nbsp;'B';
 document.body.appendChild(text);
 &lt;/script&gt;C</pre>
-      <td>Two adjacent text nodes in the document, containing "A" and "BC".
+      <td>Two adjacent <code><a href="#text">Text</a></code> nodes in the document, containing "A" and "BC".
      <tr><td><pre>A&lt;table&gt;B&lt;tr&gt;C&lt;/tr&gt;D&lt;/table&gt;</pre>
-      <td>One text node before the table, containing "ABCD". (This is caused by <a href="#foster-parent" title="foster parent">foster parenting</a>.)
+      <td>One <code><a href="#text">Text</a></code> node before the table, containing "ABCD". (This is caused by <a href="#foster-parent" title="foster parent">foster parenting</a>.)
      <tr><td><pre>A&lt;table&gt;&lt;tr&gt;&nbsp;B&lt;/tr&gt;&nbsp;C&lt;/table&gt;</pre>
-      <td>One text node before the table, containing "A&nbsp;B&nbsp;C" (A-space-B-space-C). (This is caused by <a href="#foster-parent" title="foster parent">foster parenting</a>.)
+      <td>One <code><a href="#text">Text</a></code> node before the table, containing "A&nbsp;B&nbsp;C" (A-space-B-space-C). (This is caused by <a href="#foster-parent" title="foster parent">foster parenting</a>.)
      <tr><td><pre>A&lt;table&gt;&lt;tr&gt;&nbsp;B&lt;/tr&gt;&nbsp;&lt;/em&gt;C&lt;/table&gt;</pre>
-      <td>One text node before the table, containing "A&nbsp;BC" (A-space-B-C), and one text node inside the table (as a child of a <code><a href="#the-tbody-element">tbody</a></code>) with a single space character. (Space characters separated from non-space characters by non-character tokens are not affected by <a href="#foster-parent" title="foster parent">foster parenting</a>, even if those other tokens then get ignored.)
+      <td>One <code><a href="#text">Text</a></code> node before the table, containing "A&nbsp;BC" (A-space-B-C), and one <code><a href="#text">Text</a></code> node inside the table (as a child of a <code><a href="#the-tbody-element">tbody</a></code>) with a single space character. (Space characters separated from non-space characters by non-character tokens are not affected by <a href="#foster-parent" title="foster parent">foster parenting</a>, even if those other tokens then get ignored.)
    </table></div>
 
   <p id="mutation-during-parsing">DOM mutation events must not fire
@@ -61461,7 +61455,7 @@
 
   <p class="note">The algorithm described below places no limit on the
   depth of the DOM tree generated, or on the length of tag names,
-  attribute names, attribute values, text nodes, etc. While
+  attribute names, attribute values, <code><a href="#text">Text</a></code> nodes, etc. While
   implementors are encouraged to avoid arbitrary limits, it is
   recognized that <a href="#hardwareLimitations">practical
   concerns</a> will likely force user agents to impose nesting depth
@@ -65253,9 +65247,9 @@
   <p>The next token is a character ("4"), triggers the <a href="#reconstruct-the-active-formatting-elements" title="reconstruct the active formatting elements">reconstruction of
   the active formatting elements</a>, in this case just the
   <code><a href="#the-i-element">i</a></code> element. A new <code><a href="#the-i-element">i</a></code> element is thus created
-  for the "4" text node. After the end tag token for the "i" is also
-  received, and the "5" text node is inserted, the DOM looks as
-  follows:</p>
+  for the "4" <code><a href="#text">Text</a></code> node. After the end tag token for the
+  "i" is also received, and the "5" <code><a href="#text">Text</a></code> node is
+  inserted, the DOM looks as follows:</p>
 
   <ul class="domTree"><li class="t1"><code><a href="#the-html-element">html</a></code><ul><li class="t1"><code><a href="#the-head-element">head</a></code><li class="t1"><code><a href="#the-body-element">body</a></code><ul><li class="t1"><code><a href="#the-p-element">p</a></code><ul><li class="t3"><code>#text</code>: <span title="">1</span><li class="t1"><code><a href="#the-b-element">b</a></code><ul><li class="t3"><code>#text</code>: <span title="">2</span><li class="t1"><code><a href="#the-i-element">i</a></code><ul><li class="t3"><code>#text</code>: <span title="">3</span></ul></ul><li class="t1"><code><a href="#the-i-element">i</a></code><ul><li class="t3"><code>#text</code>: <span title="">4</span></ul><li class="t3"><code>#text</code>: <span title="">5</span></ul></ul></ul></ul><h5 id="misnested-tags:-b-p-b-p"><span class="secno">8.2.8.2 </span>Misnested tags: &lt;b&gt;&lt;p&gt;&lt;/b&gt;&lt;/p&gt;</h5>
 
@@ -65354,8 +65348,7 @@
   mode</a>).</p>
 
   <ul class="domTree"><li class="t1"><code><a href="#the-html-element">html</a></code><ul><li class="t1"><code><a href="#the-head-element">head</a></code><li class="t1"><code><a href="#the-body-element">body</a></code><ul><li class="t1"><code><a href="#the-b-element">b</a></code><li class="t1"><code><a href="#the-table-element">table</a></code><ul><li class="t1"><code><a href="#the-tbody-element">tbody</a></code><ul><li class="t1"><code><a href="#the-tr-element">tr</a></code><ul><li class="t1"><code><a href="#the-td-element">td</a></code></ul></ul></ul></ul></ul></ul><p>The marker means that when the "aaa" character tokens are seen,
-  no <code><a href="#the-b-element">b</a></code> element is created to hold the resulting text
-  node:</p>
+  no <code><a href="#the-b-element">b</a></code> element is created to hold the resulting <code><a href="#text">Text</a></code> node:</p>
 
   <ul class="domTree"><li class="t1"><code><a href="#the-html-element">html</a></code><ul><li class="t1"><code><a href="#the-head-element">head</a></code><li class="t1"><code><a href="#the-body-element">body</a></code><ul><li class="t1"><code><a href="#the-b-element">b</a></code><li class="t1"><code><a href="#the-table-element">table</a></code><ul><li class="t1"><code><a href="#the-tbody-element">tbody</a></code><ul><li class="t1"><code><a href="#the-tr-element">tr</a></code><ul><li class="t1"><code><a href="#the-td-element">td</a></code><ul><li class="t3"><code>#text</code>: <span title="">aaa</span></ul></ul></ul></ul></ul></ul></ul><p>The end tags are handled in a straight-forward manner; after
   handling them, the <a href="#stack-of-open-elements">stack of open elements</a> has on it the
@@ -65381,8 +65374,8 @@
   <p>When <a href="#reconstruct-the-active-formatting-elements" title="reconstruct the active formatting elements">the
   active formatting elements are reconstructed</a>, a
   <code><a href="#the-b-element">b</a></code> element is created and <a href="#foster-parent" title="foster
-  parent">foster parented</a>, and then the "bbb" text node is
-  appended to it:</p>
+  parent">foster parented</a>, and then the "bbb" <code><a href="#text">Text</a></code>
+  node is appended to it:</p>
 
   <ul class="domTree"><li class="t1"><code><a href="#the-html-element">html</a></code><ul><li class="t1"><code><a href="#the-head-element">head</a></code><li class="t1"><code><a href="#the-body-element">body</a></code><ul><li class="t1"><code><a href="#the-b-element">b</a></code><li class="t1"><code><a href="#the-b-element">b</a></code><ul><li class="t3"><code>#text</code>: <span title="">bbb</span></ul><li class="t1"><code><a href="#the-table-element">table</a></code><ul><li class="t1"><code><a href="#the-tbody-element">tbody</a></code><ul><li class="t1"><code><a href="#the-tr-element">tr</a></code><ul><li class="t1"><code><a href="#the-td-element">td</a></code><ul><li class="t3"><code>#text</code>: <span title="">aaa</span></ul></ul></ul></ul></ul></ul></ul><p>The <a href="#stack-of-open-elements">stack of open elements</a> has on it the elements
   <code><a href="#the-html-element">html</a></code>, <code><a href="#the-body-element">body</a></code>, <code><a href="#the-table-element">table</a></code>,
@@ -65625,10 +65618,10 @@
 
         <p>If <var title="">current node</var> is a <code><a href="#the-pre-element">pre</a></code>,
         <code><a href="#the-textarea-element">textarea</a></code>, or <code><a href="#listing">listing</a></code> element, and
-        the first child node of the element, if any, is a <a href="#text-node">text
-        node</a> whose character data has as its first character a
-        U+000A LINE FEED (LF) character, then append a U+000A LINE
-        FEED (LF) character.</p>
+        the first child node of the element, if any, is a
+        <code><a href="#text">Text</a></code> node whose character data has as its first
+        character a U+000A LINE FEED (LF) character, then append a
+        U+000A LINE FEED (LF) character.</p>
 
         <p>Append the value of running the <a href="#html-fragment-serialization-algorithm">HTML fragment
         serialization algorithm</a> on the <var title="">current
@@ -65640,8 +65633,7 @@
        </dd>
 
 
-       <dt>If <var title="">current node</var> is a <code title="">Text</code> or <code title="">CDATASection</code>
-       node</dt>
+       <dt>If <var title="">current node</var> is a <code title="">Text</code> node</dt>
 
        <dd>
 
@@ -65732,7 +65724,7 @@
    of serializing the element is parsed, the comment will be truncated
    at that point and the rest of the comment will be interpreted as
    markup. More examples would be making a <code><a href="#the-script-element">script</a></code> element
-   contain a text node with the text string
+   contain a <code><a href="#text">Text</a></code> node with the text string
    "<code>&lt;/script&gt;</code>", or having a <code><a href="#the-p-element">p</a></code> element
    that contains a <code><a href="#the-ul-element">ul</a></code> element (as the <code><a href="#the-ul-element">ul</a></code>
    element's <a href="#syntax-start-tag" title="syntax-start-tag">start tag</a> would
@@ -66106,10 +66098,8 @@
   may adjust prefixes and namespace declarations in the serialization
   (and indeed might be forced to do so in some cases to obtain
   namespace-well-formed XML). User agents may use a combination of
-  regular text, character references, and CDATA sections to represent
-  <a href="#text-node" title="text node">text nodes</a> in the DOM (and indeed
-  might be forced to use representations that don't match the DOM's,
-  e.g. if a <code><a href="#cdatasection">CDATASection</a></code> node contains the string "<code title="">]]&gt;</code>").</p>
+  regular text and character references to represent
+  <code><a href="#text">Text</a></code> nodes in the DOM.</p>
 
   <p>For <code><a href="#element">Element</a></code>s, if any of the elements in the
   serialization are in no namespace, the default namespace in scope
@@ -66152,11 +66142,9 @@
    the same local name and namespace.</li>
 
    <li>An <code><a href="#attr">Attr</a></code> node, <code><a href="#text">Text</a></code> node,
-   <code><a href="#cdatasection">CDATASection</a></code> node, <code><a href="#comment-0">Comment</a></code> node, or
-   <code><a href="#processinginstruction">ProcessingInstruction</a></code> node whose data contains
-   characters that are not matched by the XML <code title="">Char</code> production. <a href="#refsXML">[XML]</a></li>
-
-   
+   <code><a href="#comment-0">Comment</a></code> node, or <code><a href="#processinginstruction">ProcessingInstruction</a></code>
+   node whose data contains characters that are not matched by the XML
+   <code title="">Char</code> production. <a href="#refsXML">[XML]</a></li>
 
    <li>A <code><a href="#comment-0">Comment</a></code> node whose data contains two adjacent
    U+002D HYPHEN-MINUS characters (-) or ends with such a

Received on Tuesday, 31 January 2012 19:37:05 UTC