[html5] r6945 - [e] (0) Sync with DOM Core: Remove all vestiges of CDATASection objects and Enti [...]

[whatwg at whatwg.org]

Author: ianh
Date: 2012-01-31 11:36:27 -0800 (Tue, 31 Jan 2012)
New Revision: 6945

Modified:
   complete.html
   index
   source
Log:
[e] (0) 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.
Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=14859
Affected topics: DOM APIs, HTML, HTML Syntax and Parsing, Video Text Tracks

Modified: complete.html
===================================================================
--- complete.html	2012-01-31 19:22:14 UTC (rev 6944)
+++ complete.html	2012-01-31 19:36:27 UTC (rev 6945)
@@ -2062,8 +2062,10 @@
   markup, turning it into a DOM (Document Object Model) tree. A DOM
   tree is an in-memory representation of a document.</p>
 
-  <p>DOM trees contain several kinds of nodes, in particular a DOCTYPE
-  node, elements, text nodes, and comment nodes.</p>
+  <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>
 
   <p>The <a href=#intro-early-example>markup snippet at the top of
   this section</a> would be turned into the following DOM tree:</p>
@@ -2071,22 +2073,23 @@
   <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="">⏎␣␣</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="">⏎␣</span></ul><li class=t3><code>#text</code>: <span title="">⏎␣</span><li class=t1><code><a href=#the-body-element>body</a></code><ul><li class=t3><code>#text</code>: <span title="">⏎␣␣</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="">⏎␣␣</span><li class=t1><code><a href=#the-p-element>p</a></code><ul><li cl
 ass=t3><code>#text</code>: <span title="">This is a <!--grammar-check-override--></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="">⏎␣␣</span><li class=t8><code>#comment</code>: <span title=""> this is a comment </span><li class=t3><code>#text</code>: <span title="">⏎␣⏎</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>
+  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>
 
-  <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 "␣") and line breaks ("⏎") 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>
+  <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 "␣") and line breaks ("⏎")
+  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>
 
   <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
+  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.</p>
 
   <hr><p>This DOM tree can be manipulated from scripts in the
@@ -3247,18 +3250,14 @@
   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>
 
-  <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>
-
   <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>
 
   <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).</p>
+  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).</p>
 
 
   <h4 id=scripting-0><span class=secno>2.1.4 </span>Scripting</h4>
@@ -3745,20 +3744,6 @@
   one of these two formats, although supporting both is
   encouraged.</p>
 
-<!--(DOM Core doesn't have entity references
-  <p id="entity-references">The language in this specification assumes
-  that the user agent expands all entity references, and therefore
-  does not include entity reference nodes in the DOM. If user agents
-  do include entity reference nodes in the DOM, then user agents must
-  handle them as if they were fully expanded when implementing this
-  specification. For example, if a requirement talks about an
-  element's child text nodes, then any text nodes that are children of
-  an entity reference that is a child of that element would be used as
-  well. Entity references to unknown entities must be treated as if
-  they contained just an empty text node for the purposes of the
-  algorithms defined in this specification.</p>
---><!--ENTITY-->
-
   <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,
@@ -3812,7 +3797,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>
@@ -10180,10 +10164,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>
 
@@ -11416,7 +11400,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>
@@ -11426,8 +11410,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.
@@ -11912,21 +11896,13 @@
   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
-  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><!--, and <a
-  href="#entity-references">entity reference nodes are treated as if
-  they were expanded in place</a>--><!--ENTITY-->.</p>
-
   <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.<!-- not a conf criteria since the parser now requires this
-  --> 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>
+  characters between elements in the source markup as
+  <code><a href=#text>Text</a></code> nodes in the DOM.<!-- not a conf criteria since
+  the parser now requires this --> 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>
 
   <p><a href=#inter-element-whitespace>Inter-element whitespace</a>, comment nodes, and
   processing instruction nodes must be ignored when establishing
@@ -11937,11 +11913,11 @@
   <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>
+  <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>
 
   <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
@@ -12258,7 +12234,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
@@ -12270,14 +12246,15 @@
   phrasing content, not any flow content.</p>
 
   <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>
+  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>
 
-  <!--<p><span title="text node">Text nodes</span> and attribute
-  values may begin with an <i>isolated combining character</i>. <a
+  <!--<p><code>Text</code> nodes and attribute values may begin with
+  an <i>isolated combining character</i>. <a
   href="#refsUNICODE">[UNICODE]</a></p>--> <!-- commented out since
   nothing disallows it currently, so it's implicit; however, if we
   ever make charmod a normative reference, this will be needed to
@@ -12832,17 +12809,16 @@
   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>
+  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>
 
   <p>The aforementioned restrictions are defined by specifying that
   certain parts of documents form <a href=#bidirectional-algorithm-formatting-character-ranges>bidirectional-algorithm
@@ -12868,7 +12844,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>
 
@@ -14080,7 +14056,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>
@@ -14090,11 +14066,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>
 <!--TOPIC:HTML-->
@@ -15747,7 +15723,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
@@ -16235,9 +16211,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>
 
@@ -16792,7 +16767,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>
@@ -16802,11 +16777,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>
 <!--TOPIC:HTML-->
@@ -17190,7 +17165,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>
@@ -19903,12 +19878,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
@@ -21058,7 +21033,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>
@@ -23585,9 +23560,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>
@@ -24541,10 +24516,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
@@ -49253,12 +49228,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<!-- we mention TEXT_NODE
-  and all that explicitly here because we redefine "text node" in this
-  spec to also include CDATA sections -->. 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;
@@ -71632,13 +71605,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
@@ -73065,12 +73038,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>
@@ -84471,32 +84445,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<script>
 var script = document.getElementsByTagName('script')[0];
 document.body.removeChild(script);
 </script>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<script>
 var text = document.createTextNode('B');
 document.body.appendChild(text);
 </script>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<script>
 var text = document.getElementsByTagName('script')[0].firstChild;
 text.data = 'B';
 document.body.appendChild(text);
 </script>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<table>B<tr>C</tr>D</table></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<table><tr> B</tr> C</table></pre>
-      <td>One text node before the table, containing "A B 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 B C" (A-space-B-space-C). (This is caused by <a href=#foster-parent title="foster parent">foster parenting</a>.)
      <tr><td><pre>A<table><tr> B</tr> </em>C</table></pre>
-      <td>One text node before the table, containing "A 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 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
@@ -84511,7 +84485,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
@@ -88417,9 +88391,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>12.2.8.2 </span>Misnested tags: <b><p></b></p></h5>
 
@@ -88518,8 +88492,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
@@ -88545,8 +88518,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>,
@@ -88791,10 +88764,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
@@ -88806,8 +88779,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>
 
@@ -88883,11 +88855,7 @@
 
    <li><p>The result of the algorithm is the string <var title="">s</var>.</li>
 
-  </ol><!--
-  <p class="note">Entity reference nodes are <a
-  href="#entity-references">assumed to be expanded</a> by the user
-  agent, and are therefore not covered in the algorithm above.</p>
---><!--ENTITY--><p class=warning>It is possible that the output of this algorithm, if
+  </ol><p class=warning>It is possible that the output of this algorithm, if
   parsed with an <a href=#html-parser>HTML parser</a>, will not return the
   original tree structure.</p>
 
@@ -88902,7 +88870,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></script></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
@@ -89312,10 +89280,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="">]]></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
@@ -89361,13 +89327,10 @@
    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>CDATASection</code> node whose data contains the
-   string "<code title="">]]></code>".</li> (these can be split)-->
-
    <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
    character.</li>

Modified: index
===================================================================
--- index	2012-01-31 19:22:14 UTC (rev 6944)
+++ index	2012-01-31 19:36:27 UTC (rev 6945)
@@ -2062,8 +2062,10 @@
   markup, turning it into a DOM (Document Object Model) tree. A DOM
   tree is an in-memory representation of a document.</p>
 
-  <p>DOM trees contain several kinds of nodes, in particular a DOCTYPE
-  node, elements, text nodes, and comment nodes.</p>
+  <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>
 
   <p>The <a href=#intro-early-example>markup snippet at the top of
   this section</a> would be turned into the following DOM tree:</p>
@@ -2071,22 +2073,23 @@
   <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="">⏎␣␣</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="">⏎␣</span></ul><li class=t3><code>#text</code>: <span title="">⏎␣</span><li class=t1><code><a href=#the-body-element>body</a></code><ul><li class=t3><code>#text</code>: <span title="">⏎␣␣</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="">⏎␣␣</span><li class=t1><code><a href=#the-p-element>p</a></code><ul><li cl
 ass=t3><code>#text</code>: <span title="">This is a <!--grammar-check-override--></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="">⏎␣␣</span><li class=t8><code>#comment</code>: <span title=""> this is a comment </span><li class=t3><code>#text</code>: <span title="">⏎␣⏎</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>
+  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>
 
-  <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 "␣") and line breaks ("⏎") 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>
+  <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 "␣") and line breaks ("⏎")
+  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>
 
   <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
+  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.</p>
 
   <hr><p>This DOM tree can be manipulated from scripts in the
@@ -3247,18 +3250,14 @@
   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>
 
-  <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>
-
   <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>
 
   <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).</p>
+  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).</p>
 
 
   <h4 id=scripting-0><span class=secno>2.1.4 </span>Scripting</h4>
@@ -3745,20 +3744,6 @@
   one of these two formats, although supporting both is
   encouraged.</p>
 
-<!--(DOM Core doesn't have entity references
-  <p id="entity-references">The language in this specification assumes
-  that the user agent expands all entity references, and therefore
-  does not include entity reference nodes in the DOM. If user agents
-  do include entity reference nodes in the DOM, then user agents must
-  handle them as if they were fully expanded when implementing this
-  specification. For example, if a requirement talks about an
-  element's child text nodes, then any text nodes that are children of
-  an entity reference that is a child of that element would be used as
-  well. Entity references to unknown entities must be treated as if
-  they contained just an empty text node for the purposes of the
-  algorithms defined in this specification.</p>
---><!--ENTITY-->
-
   <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,
@@ -3812,7 +3797,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>
@@ -10180,10 +10164,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>
 
@@ -11416,7 +11400,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>
@@ -11426,8 +11410,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.
@@ -11912,21 +11896,13 @@
   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
-  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><!--, and <a
-  href="#entity-references">entity reference nodes are treated as if
-  they were expanded in place</a>--><!--ENTITY-->.</p>
-
   <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.<!-- not a conf criteria since the parser now requires this
-  --> 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>
+  characters between elements in the source markup as
+  <code><a href=#text>Text</a></code> nodes in the DOM.<!-- not a conf criteria since
+  the parser now requires this --> 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>
 
   <p><a href=#inter-element-whitespace>Inter-element whitespace</a>, comment nodes, and
   processing instruction nodes must be ignored when establishing
@@ -11937,11 +11913,11 @@
   <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>
+  <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>
 
   <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
@@ -12258,7 +12234,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
@@ -12270,14 +12246,15 @@
   phrasing content, not any flow content.</p>
 
   <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>
+  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>
 
-  <!--<p><span title="text node">Text nodes</span> and attribute
-  values may begin with an <i>isolated combining character</i>. <a
+  <!--<p><code>Text</code> nodes and attribute values may begin with
+  an <i>isolated combining character</i>. <a
   href="#refsUNICODE">[UNICODE]</a></p>--> <!-- commented out since
   nothing disallows it currently, so it's implicit; however, if we
   ever make charmod a normative reference, this will be needed to
@@ -12832,17 +12809,16 @@
   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>
+  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>
 
   <p>The aforementioned restrictions are defined by specifying that
   certain parts of documents form <a href=#bidirectional-algorithm-formatting-character-ranges>bidirectional-algorithm
@@ -12868,7 +12844,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>
 
@@ -14080,7 +14056,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>
@@ -14090,11 +14066,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>
 <!--TOPIC:HTML-->
@@ -15747,7 +15723,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
@@ -16235,9 +16211,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>
 
@@ -16792,7 +16767,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>
@@ -16802,11 +16777,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>
 <!--TOPIC:HTML-->
@@ -17190,7 +17165,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>
@@ -19903,12 +19878,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
@@ -21058,7 +21033,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>
@@ -23585,9 +23560,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>
@@ -24541,10 +24516,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
@@ -49253,12 +49228,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<!-- we mention TEXT_NODE
-  and all that explicitly here because we redefine "text node" in this
-  spec to also include CDATA sections -->. 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;
@@ -71632,13 +71605,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
@@ -73065,12 +73038,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>
@@ -84471,32 +84445,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<script>
 var script = document.getElementsByTagName('script')[0];
 document.body.removeChild(script);
 </script>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<script>
 var text = document.createTextNode('B');
 document.body.appendChild(text);
 </script>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<script>
 var text = document.getElementsByTagName('script')[0].firstChild;
 text.data = 'B';
 document.body.appendChild(text);
 </script>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<table>B<tr>C</tr>D</table></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<table><tr> B</tr> C</table></pre>
-      <td>One text node before the table, containing "A B 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 B C" (A-space-B-space-C). (This is caused by <a href=#foster-parent title="foster parent">foster parenting</a>.)
      <tr><td><pre>A<table><tr> B</tr> </em>C</table></pre>
-      <td>One text node before the table, containing "A 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 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
@@ -84511,7 +84485,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
@@ -88417,9 +88391,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>12.2.8.2 </span>Misnested tags: <b><p></b></p></h5>
 
@@ -88518,8 +88492,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
@@ -88545,8 +88518,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>,
@@ -88791,10 +88764,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
@@ -88806,8 +88779,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>
 
@@ -88883,11 +88855,7 @@
 
    <li><p>The result of the algorithm is the string <var title="">s</var>.</li>
 
-  </ol><!--
-  <p class="note">Entity reference nodes are <a
-  href="#entity-references">assumed to be expanded</a> by the user
-  agent, and are therefore not covered in the algorithm above.</p>
---><!--ENTITY--><p class=warning>It is possible that the output of this algorithm, if
+  </ol><p class=warning>It is possible that the output of this algorithm, if
   parsed with an <a href=#html-parser>HTML parser</a>, will not return the
   original tree structure.</p>
 
@@ -88902,7 +88870,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></script></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
@@ -89312,10 +89280,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="">]]></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
@@ -89361,13 +89327,10 @@
    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>CDATASection</code> node whose data contains the
-   string "<code title="">]]></code>".</li> (these can be split)-->
-
    <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
    character.</li>

Modified: source
===================================================================
--- source	2012-01-31 19:22:14 UTC (rev 6944)
+++ source	2012-01-31 19:36:27 UTC (rev 6945)
@@ -877,8 +877,10 @@
   markup, turning it into a DOM (Document Object Model) tree. A DOM
   tree is an in-memory representation of a document.</p>
 
-  <p>DOM trees contain several kinds of nodes, in particular a DOCTYPE
-  node, elements, text nodes, and comment nodes.</p>
+  <p>DOM trees contain several kinds of nodes, in particular a
+  <code>DocumentType</code> node, <code>Element</code> nodes,
+  <code>Text</code> nodes, <code>Comment</code> nodes, and in some
+  cases <code>ProcessingInstruction</code> nodes.</p>
 
   <p>The <a href="#intro-early-example">markup snippet at the top of
   this section</a> would be turned into the following DOM tree:</p>
@@ -888,22 +890,23 @@
   <p>The <span>root element</span> of this tree is the
   <code>html</code> element, which is the element always found at the
   root of HTML documents. It contains two elements, <code>head</code>
-  and <code>body</code>, as well as a text node between them.</p>
+  and <code>body</code>, as well as a <code>Text</code> node between
+  them.</p>
 
-  <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 "&#x2423;") and line breaks ("&#x23CE;") 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>head</code> start tag ends up being dropped silently, and all
-  the whitespace after the <code>body</code> end tag ends up placed at
-  the end of the <code>body</code>.</p>
+  <p>There are many more <code>Text</code> nodes in the DOM tree than
+  one would initially expect, because the source contains a number of
+  spaces (represented here by "&#x2423;") and line breaks ("&#x23CE;")
+  that all end up as <code>Text</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>head</code> start tag ends up being dropped silently,
+  and all the whitespace after the <code>body</code> end tag ends up
+  placed at the end of the <code>body</code>.</p>
 
   <p>The <code>head</code> element contains a <code>title</code>
-  element, which itself contains a text node with the text "Sample
-  page". Similarly, the <code>body</code> element contains an
-  <code>h1</code> element, a <code>p</code> element, and a
+  element, which itself contains a <code>Text</code> node with the
+  text "Sample page". Similarly, the <code>body</code> element
+  contains an <code>h1</code> element, a <code>p</code> element, and a
   comment.</p>
 
   <hr>
@@ -2143,19 +2146,14 @@
   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>
 
-  <p>The term <dfn>text node</dfn> refers to any <code>Text</code>
-  node, including <code>CDATASection</code> nodes; specifically, any
-  <code>Node</code> with node type <code title="">TEXT_NODE</code> (3)
-  or <code title="">CDATA_SECTION_NODE</code> (4). <a
-  href="#refsDOMCORE">[DOMCORE]</a></p>
-
   <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>
 
   <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).</p>
+  value, <code>Text</code> node, or string, means that the length of
+  the text is zero (i.e. not even containing spaces or control
+  characters).</p>
 
 
   <h4>Scripting</h4>
@@ -2685,20 +2683,6 @@
   one of these two formats, although supporting both is
   encouraged.</p>
 
-<!--(DOM Core doesn't have entity references
-  <p id="entity-references">The language in this specification assumes
-  that the user agent expands all entity references, and therefore
-  does not include entity reference nodes in the DOM. If user agents
-  do include entity reference nodes in the DOM, then user agents must
-  handle them as if they were fully expanded when implementing this
-  specification. For example, if a requirement talks about an
-  element's child text nodes, then any text nodes that are children of
-  an entity reference that is a child of that element would be used as
-  well. Entity references to unknown entities must be treated as if
-  they contained just an empty text node for the purposes of the
-  algorithms defined in this specification.</p>
---><!--ENTITY-->
-
   <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,
@@ -2758,7 +2742,6 @@
     <ul class="brief">
 
      <li><dfn><code>Attr</code></dfn> interface</li>
-     <li><dfn><code>CDATASection</code></dfn> interface</li>
      <li><dfn><code>Comment</code></dfn> interface</li>
      <li><dfn><code>DOMImplementation</code></dfn> interface</li>
      <li><dfn title="DOM Document"><code>Document</code></dfn> interface</li>
@@ -10430,10 +10413,10 @@
    href="#refsSVG">[SVG]</a></p></li>
 
    <li><p>Otherwise, let <var title="">value</var> be a concatenation
-   of the data of all the child <span title="text node">text
-   nodes</span> of <span>the <code>title</code> element</span>, in
-   <span>tree order</span>, or the empty string if <span>the
-   <code>title</code> element</span> is null.</p></li>
+   of the data of all the child <code>Text</code> nodes of <span>the
+   <code>title</code> element</span>, in <span>tree order</span>, or
+   the empty string if <span>the <code>title</code> element</span> is
+   null.</p></li>
 
    <li><p>Replace any sequence of one or more consecutive <span
    title="space character">space characters</span> in <var
@@ -11852,7 +11835,7 @@
 
     <ul>
 
-     <li><p>The character is from a <span>text node</span> that is a
+     <li><p>The character is from a <code>Text</code> node that is a
      descendant of the element whose <span title="the
      directionality">directionality</span> is being
      determined.</p></li>
@@ -11862,8 +11845,8 @@
 
      <li>
 
-      <p>The character is not in a text node that has an ancestor
-      element that is a descendant of the element whose <span
+      <p>The character is not in a <code>Text</code> node that has an
+      ancestor element that is a descendant of the element whose <span
       title="the directionality">directionality</span> is being
       determined and that is either:</p>
 
@@ -12420,22 +12403,13 @@
   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
-  content model or not, <span title="text
-  node"><code>CDATASection</code> nodes in the DOM are treated as
-  equivalent to <code>Text</code> nodes</span><!--, and <a
-  href="#entity-references">entity reference nodes are treated as if
-  they were expanded in place</a>--><!--ENTITY-->.</p>
-
   <p>The <span title="space character">space characters</span> are
   always allowed between elements. User agents represent these
-  characters between elements in the source markup as text nodes in
-  the DOM.<!-- not a conf criteria since the parser now requires this
-  --> Empty <span title="text node">text nodes</span> and <span
-  title="text node">text nodes</span> consisting of just sequences of
-  those characters are considered <dfn>inter-element
-  whitespace</dfn>.</p>
+  characters between elements in the source markup as
+  <code>Text</code> nodes in the DOM.<!-- not a conf criteria since
+  the parser now requires this --> Empty <code>Text</code> nodes and
+  <code>Text</code> nodes consisting of just sequences of those
+  characters are considered <dfn>inter-element whitespace</dfn>.</p>
 
   <p><span>Inter-element whitespace</span>, comment nodes, and
   processing instruction nodes must be ignored when establishing
@@ -12447,11 +12421,11 @@
   <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 <span>inter-element whitespace</span>)
-  between them. Similarly, a node is the <i>only child</i> of an
-  element if that element contains no other nodes other than
-  <span>inter-element whitespace</span>, comment nodes, and processing
-  instruction nodes.</p>
+  <code>Text</code> nodes (other than <span>inter-element
+  whitespace</span>) between them. Similarly, a node is the <i>only
+  child</i> of an element if that element contains no other nodes
+  other than <span>inter-element whitespace</span>, comment nodes, and
+  processing instruction nodes.</p>
 
   <p>Authors must not use <span>HTML elements</span> anywhere except
   where they are explicitly allowed, as defined for each element, or
@@ -12795,7 +12769,7 @@
 
   <p>As a general rule, elements whose content model allows any
   <span>phrasing content</span> should have either at least one
-  descendant <span>text node</span> that is not <span>inter-element
+  descendant <code>Text</code> node that is not <span>inter-element
   whitespace</span>, or at least one descendant element node that is
   <span>embedded content</span>. For the purposes of this requirement,
   nodes that are descendants of <code>del</code> elements must not be
@@ -12807,15 +12781,15 @@
   phrasing content, not any flow content.</p>
 
   <p><dfn title="text content">Text</dfn>, in the context of content
-  models, means <span title="text node">text nodes</span>. <span
-  title="text content">Text</span> is sometimes used as a content
-  model on its own, but is also <span>phrasing content</span>, and can
-  be <span>inter-element whitespace</span> (if the <span title="text
-  node">text nodes</span> are empty or contain just <span title="space
-  character">space characters</span>).</p>
+  models, means <code>Text</code> nodes. <span title="text
+  content">Text</span> is sometimes used as a content model on its
+  own, but is also <span>phrasing content</span>, and can be
+  <span>inter-element whitespace</span> (if the <code>Text</code>
+  nodes are empty or contain just <span title="space character">space
+  characters</span>).</p>
 
-  <!--<p><span title="text node">Text nodes</span> and attribute
-  values may begin with an <i>isolated combining character</i>. <a
+  <!--<p><code>Text</code> nodes and attribute values may begin with
+  an <i>isolated combining character</i>. <a
   href="#refsUNICODE">[UNICODE]</a></p>--> <!-- commented out since
   nothing disallows it currently, so it's implicit; however, if we
   ever make charmod a normative reference, this will be needed to
@@ -13403,17 +13377,16 @@
   characters</h4>
 
   <p><span>Text content</span> in <span>HTML elements</span> with
-  child <span title="text node">text nodes</span>, and text in
-  attributes of <span>HTML elements</span> 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>
+  child <code>Text</code> nodes, and text in attributes of <span>HTML
+  elements</span> 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>
 
   <p>The aforementioned restrictions are defined by specifying that
   certain parts of documents form <span>bidirectional-algorithm
@@ -13445,7 +13418,7 @@
 
     <dl class="switch">
 
-     <dt>If <var title="">node</var> is a <span>text node</span></dt>
+     <dt>If <var title="">node</var> is a <code>Text</code> node</dt>
 
      <dd><p>Append the text data of <var title="">node</var> to <var title="">string</var>.</p></dd>
 
@@ -14875,7 +14848,7 @@
    <dd>
 
     <p>Returns the contents of the element, ignoring child nodes that
-    aren't <span title="text node">text nodes</span>.</p>
+    aren't <code>Text</code> nodes.</p>
 
     <p>Can be set, to replace the element's children with the given
     value.</p>
@@ -14888,11 +14861,11 @@
 
   <p>The IDL attribute <dfn
   title="dom-title-text"><code>text</code></dfn> must return a
-  concatenation of the contents of all the <span title="text
-  node">text nodes</span> that are children of the <code>title</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>textContent</code> IDL attribute.</p>
+  concatenation of the contents of all the <code>Text</code> nodes
+  that are children of the <code>title</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>textContent</code>
+  IDL attribute.</p>
 
   </div>
 <!--TOPIC:HTML-->
@@ -16806,7 +16779,7 @@
   evaluated. For styling languages that consist of pure text (as
   opposed to XML), user agents must evaluate <code>style</code>
   elements by passing the concatenation of the contents of all the
-  <span title="text node">text nodes</span> that are children of the
+  <code>Text</code> nodes that are children of the
   <code>style</code> element (not any other nodes such as comments or
   elements), in <span>tree order</span>, to the style system. For
   XML-based styling languages, user agents must pass all the child
@@ -17352,9 +17325,8 @@
 
     <p>If the element has no <code title="attr-script-src">src</code>
     attribute, and its child nodes, if any, consist only of comment
-    nodes and empty <span title="text node">text nodes</span>, then
-    the user agent must abort these steps at this point. The script is
-    not executed.</p>
+    nodes and empty <code>Text</code> nodes, then the user agent must
+    abort these steps at this point. The script is not executed.</p>
 
    </li>
 
@@ -18006,7 +17978,7 @@
    <dd>
 
     <p>Returns the contents of the element, ignoring child nodes that
-    aren't <span title="text node">text nodes</span>.</p>
+    aren't <code>Text</code> nodes.</p>
 
     <p>Can be set, to replace the element's children with the given
     value.</p>
@@ -18019,11 +17991,11 @@
 
   <p>The IDL attribute <dfn
   title="dom-script-text"><code>text</code></dfn> must return a
-  concatenation of the contents of all the <span title="text
-  node">text nodes</span> that are children of the <code>script</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>textContent</code> IDL attribute.</p>
+  concatenation of the contents of all the <code>Text</code> nodes
+  that are children of the <code>script</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>textContent</code>
+  IDL attribute.</p>
 
   </div>
 <!--TOPIC:HTML-->
@@ -18449,7 +18421,7 @@
        call these elements <var title="">the after children</var>.</li>
 
        <li>Let <var title="">s</var> be the concatenation of all the
-       <span>text node</span> children of the <code>noscript</code>
+       <code>Text</code> node children of the <code>noscript</code>
        element.</li>
 
        <li>Set the <code title="dom-innerHTML">innerHTML</code>
@@ -21339,13 +21311,12 @@
   <p>If a <code>dl</code> element is empty, it contains no groups.</p>
 
   <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>
+  title="inter-element whitespace">whitespace</span> <code>Text</code>
+  node children, or has child elements that are neither
+  <code>dt</code> nor <code>dd</code> elements, all such
+  <code>Text</code> nodes 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 has one or more <code>dt</code>
   element children but no <code>dd</code> element children, then it
@@ -22583,7 +22554,7 @@
   <dfn 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 <span title="text node">text nodes</span>, and that child
+  child <code>Text</code> nodes, and that child
   element is an <code>abbr</code> element with a <code
   title="attr-abbr-title">title</code> attribute, then the exact value
   of <em>that</em> attribute is the term being defined. Otherwise, it
@@ -25327,9 +25298,9 @@
      <li><p>If the image is a descendant of a <code>figure</code>
      element that has a child <code>figcaption</code> element, and,
      ignoring the <code>figcaption</code> element and its descendants,
-     the <code>figure</code> element has no text node descendants
-     other than <span>inter-element whitespace</span>, and no
-     <span>embedded content</span> descendant other than the
+     the <code>figure</code> element has no <code>Text</code> node
+     descendants other than <span>inter-element whitespace</span>, and
+     no <span>embedded content</span> descendant other than the
      <code>img</code> element, then the contents of the first such
      <code>figcaption</code> element are the caption information;
      abort these steps.</p></li>
@@ -26349,10 +26320,10 @@
      <code>figcaption</code> element that contains content other than
      <span>inter-element whitespace</span>, and, ignoring the
      <code>figcaption</code> element and its descendants, the
-     <code>figure</code> element has no text node descendants other
-     than <span>inter-element whitespace</span>, and no <span>embedded
-     content</span> descendant other than the <code>img</code>
-     element.</li>
+     <code>figure</code> element has no <code>Text</code> node
+     descendants other than <span>inter-element whitespace</span>, and
+     no <span>embedded content</span> descendant other than the
+     <code>img</code> element.</li>
 
     </ul>
 
@@ -57387,13 +57358,10 @@
   these must return a new <code>HTMLOptionElement</code> object (a new
   <code>option</code> element). If the <var title="">text</var>
   argument is present, the new object must have as its only child a
-  <code>Node</code> with node type <code title="">TEXT_NODE</code> (3)
-  whose data is the value of that argument<!-- we mention TEXT_NODE
-  and all that explicitly here because we redefine "text node" in this
-  spec to also include CDATA sections -->. If the <var
-  title="">value</var> argument is present, the new object must have a
-  <code title="attr-option-value">value</code> attribute set with the
-  value of the argument as its value. If the <var
+  <code>Text</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">value</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">selected</code> attribute set with no
@@ -83705,7 +83673,7 @@
    that are not <span
    title="concept-fe-disabled">disabled</span>.</li>
 
-   <li>Text in <span title="text node">text nodes</span> that are
+   <li>Text in <code>Text</code> nodes that are
    children of <span title="editing host">editing hosts</span> or
    <span>editable</span> elements.</li>
 
@@ -83713,7 +83681,7 @@
 
   </ul>
 
-  <p>For text that is part of a <span>text node</span>, the element
+  <p>For text that is part of a <code>Text</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
@@ -85385,12 +85353,13 @@
     follows:</p>
 
     <p>If it is a selection that is being dragged, then the
-    <span>source node</span> 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 <span>source node</span> is the first
-    text node containing a part of the selection.</p>
+    <span>source node</span> is the <code>Text</code> node that the
+    user started the drag on (typically the <code>Text</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 <span>source
+    node</span> is the first <code>Text</code> node containing a part
+    of the selection.</p>
 
     <p>Otherwise, if it is an element that is being dragged, then the
     <span>source node</span> is the element that is being dragged.</p>
@@ -97941,42 +97910,42 @@
   <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>Text</code> nodes that they result in, assuming a user agent
    that executes scripts.</p>
 
    <table>
     <thead>
      <tr>
-      <th>Input <th>Number of text nodes
+      <th>Input <th>Number of <code>Text</code> nodes
     <tbody>
      <tr>
       <td><pre>A<script>
 var script = document.getElementsByTagName('script')[0];
 document.body.removeChild(script);
 </script>B</pre>
-      <td>One text node in the document, containing "AB".
+      <td>One <code>Text</code> node in the document, containing "AB".
      <tr>
       <td><pre>A<script>
 var text = document.createTextNode('B');
 document.body.appendChild(text);
 </script>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>Text</code> nodes; "A" before the script, the script's contents, and "BC" after the script (the parser appends to the <code>Text</code> node created by the script).
      <tr>
       <td><pre>A<script>
 var text = document.getElementsByTagName('script')[0].firstChild;
 text.data = 'B';
 document.body.appendChild(text);
 </script>C</pre>
-      <td>Two adjacent text nodes in the document, containing "A" and "BC".
+      <td>Two adjacent <code>Text</code> nodes in the document, containing "A" and "BC".
      <tr>
       <td><pre>A<table>B<tr>C</tr>D</table></pre>
-      <td>One text node before the table, containing "ABCD". (This is caused by <span title="foster parent">foster parenting</span>.)
+      <td>One <code>Text</code> node before the table, containing "ABCD". (This is caused by <span title="foster parent">foster parenting</span>.)
      <tr>
       <td><pre>A<table><tr> B</tr> C</table></pre>
-      <td>One text node before the table, containing "A B C" (A-space-B-space-C). (This is caused by <span title="foster parent">foster parenting</span>.)
+      <td>One <code>Text</code> node before the table, containing "A B C" (A-space-B-space-C). (This is caused by <span title="foster parent">foster parenting</span>.)
      <tr>
       <td><pre>A<table><tr> B</tr> </em>C</table></pre>
-      <td>One text node before the table, containing "A BC" (A-space-B-C), and one text node inside the table (as a child of a <code>tbody</code>) with a single space character. (Space characters separated from non-space characters by non-character tokens are not affected by <span title="foster parent">foster parenting</span>, even if those other tokens then get ignored.)
+      <td>One <code>Text</code> node before the table, containing "A BC" (A-space-B-C), and one <code>Text</code> node inside the table (as a child of a <code>tbody</code>) with a single space character. (Space characters separated from non-space characters by non-character tokens are not affected by <span title="foster parent">foster parenting</span>, even if those other tokens then get ignored.)
    </table>
 
   </div>
@@ -97996,7 +97965,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>Text</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
@@ -102293,9 +102262,9 @@
   title="reconstruct the active formatting elements">reconstruction of
   the active formatting elements</span>, in this case just the
   <code>i</code> element. A new <code>i</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>Text</code> node. After the end tag token for the
+  "i" is also received, and the "5" <code>Text</code> node is
+  inserted, the DOM looks as follows:</p>
 
   <ul class="domTree"><li class="t1"><code>html</code><ul><li class="t1"><code>head</code></li><li class="t1"><code>body</code><ul><li class="t1"><code>p</code><ul><li class="t3"><code>#text</code>: <span title="">1</span></li><li class="t1"><code>b</code><ul><li class="t3"><code>#text</code>: <span title="">2</span></li><li class="t1"><code>i</code><ul><li class="t3"><code>#text</code>: <span title="">3</span></li></ul></li></ul></li><li class="t1"><code>i</code><ul><li class="t3"><code>#text</code>: <span title="">4</span></li></ul></li><li class="t3"><code>#text</code>: <span title="">5</span></li></ul></li></ul></li></ul></li></ul>
 
@@ -102421,8 +102390,7 @@
   <ul class="domTree"><li class="t1"><code>html</code><ul><li class="t1"><code>head</code></li><li class="t1"><code>body</code><ul><li class="t1"><code>b</code></li><li class="t1"><code>table</code><ul><li class="t1"><code>tbody</code><ul><li class="t1"><code>tr</code><ul><li class="t1"><code>td</code></li></ul></li></ul></li></ul></li></ul></li></ul></li></ul>
 
   <p>The marker means that when the "aaa" character tokens are seen,
-  no <code>b</code> element is created to hold the resulting text
-  node:</p>
+  no <code>b</code> element is created to hold the resulting <code>Text</code> node:</p>
 
   <ul class="domTree"><li class="t1"><code>html</code><ul><li class="t1"><code>head</code></li><li class="t1"><code>body</code><ul><li class="t1"><code>b</code></li><li class="t1"><code>table</code><ul><li class="t1"><code>tbody</code><ul><li class="t1"><code>tr</code><ul><li class="t1"><code>td</code><ul><li class="t3"><code>#text</code>: <span title="">aaa</span></li></ul></li></ul></li></ul></li></ul></li></ul></li></ul></li></ul>
 
@@ -102451,8 +102419,8 @@
   <p>When <span title="reconstruct the active formatting elements">the
   active formatting elements are reconstructed</span>, a
   <code>b</code> element is created and <span title="foster
-  parent">foster parented</span>, and then the "bbb" text node is
-  appended to it:</p>
+  parent">foster parented</span>, and then the "bbb" <code>Text</code>
+  node is appended to it:</p>
 
   <ul class="domTree"><li class="t1"><code>html</code><ul><li class="t1"><code>head</code></li><li class="t1"><code>body</code><ul><li class="t1"><code>b</code></li><li class="t1"><code>b</code><ul><li class="t3"><code>#text</code>: <span title="">bbb</span></li></ul></li><li class="t1"><code>table</code><ul><li class="t1"><code>tbody</code><ul><li class="t1"><code>tr</code><ul><li class="t1"><code>td</code><ul><li class="t3"><code>#text</code>: <span title="">aaa</span></li></ul></li></ul></li></ul></li></ul></li></ul></li></ul></li></ul>
 
@@ -102732,10 +102700,10 @@
 
         <p>If <var title="">current node</var> is a <code>pre</code>,
         <code>textarea</code>, or <code>listing</code> element, and
-        the first child node of the element, if any, is a <span>text
-        node</span> 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>Text</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 <span>HTML fragment
         serialization algorithm</span> on the <var title="">current
@@ -102749,8 +102717,7 @@
 
 
        <dt>If <var title="">current node</var> is a <code
-       title="">Text</code> or <code title="">CDATASection</code>
-       node</dt>
+       title="">Text</code> node</dt>
 
        <dd>
 
@@ -102840,11 +102807,6 @@
    title="">s</var>.</p></li>
 
   </ol>
-<!--
-  <p class="note">Entity reference nodes are <a
-  href="#entity-references">assumed to be expanded</a> by the user
-  agent, and are therefore not covered in the algorithm above.</p>
---><!--ENTITY-->
 
   <p class="warning">It is possible that the output of this algorithm, if
   parsed with an <span>HTML parser</span>, will not return the
@@ -102861,7 +102823,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>script</code> element
-   contain a text node with the text string
+   contain a <code>Text</code> node with the text string
    "<code></script></code>", or having a <code>p</code> element
    that contains a <code>ul</code> element (as the <code>ul</code>
    element's <span title="syntax-start-tag">start tag</span> would
@@ -103332,11 +103294,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
-  <span title="text node">text nodes</span> in the DOM (and indeed
-  might be forced to use representations that don't match the DOM's,
-  e.g. if a <code>CDATASection</code> node contains the string "<code
-  title="">]]></code>").</p>
+  regular text and character references to represent
+  <code>Text</code> nodes in the DOM.</p>
 
   <p>For <code>Element</code>s, if any of the elements in the
   serialization are in no namespace, the default namespace in scope
@@ -103389,14 +103348,11 @@
    the same local name and namespace.</li>
 
    <li>An <code>Attr</code> node, <code>Text</code> node,
-   <code>CDATASection</code> node, <code>Comment</code> node, or
-   <code>ProcessingInstruction</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>Comment</code> node, or <code>ProcessingInstruction</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>CDATASection</code> node whose data contains the
-   string "<code title="">]]></code>".</li> (these can be split)-->
-
    <li>A <code>Comment</code> node whose data contains two adjacent
    U+002D HYPHEN-MINUS characters (-) or ends with such a
    character.</li>
@@ -105243,7 +105199,7 @@
 
        <li>For the purposes of processing by the CSS
        specification, <span title="WebVTT Text Object">WebVTT Text
-       Objects</span> are equivalent to text nodes.</li>
+       Objects</span> are equivalent to <code>Text</code> nodes.</li>
 
        <li>No style sheets are associated with <var
        title="">nodes</var>. (The nodes are subsequently restyled