W3C home > Mailing lists > Public > public-html-commits@w3.org > July 2008

html5/spec Overview.html,1.1092,1.1093

From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
Date: Wed, 23 Jul 2008 00:51:39 +0000
To: public-html-commits@w3.org
Message-Id: <E1KLSZv-0000KX-Ir@lionel-hutz.w3.org>

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

Modified Files:
	Overview.html 
Log Message:
Terminology cleanup near the term 'CDATA' (whatwg r1904)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.1092
retrieving revision 1.1093
diff -u -d -r1.1092 -r1.1093
--- Overview.html	22 Jul 2008 21:57:16 -0000	1.1092
+++ Overview.html	23 Jul 2008 00:51:36 -0000	1.1093
@@ -27,7 +27,7 @@
     for HTML and XHTML</h2>
 
    <h2 class="no-num no-toc" id=editors0><!-- "W3C Working Draft" -->
-    Editor's Draft <!--ZZZ-->22 July 2008</h2>
+    Editor's Draft <!--ZZZ-->23 July 2008</h2>
 
    <dl><!-- ZZZ: update the month/day
     <dt>This Version:</dt>
@@ -175,7 +175,7 @@
 
   <p>The W3C <a href="http://www.w3.org/html/wg/">HTML Working Group</a> is
    the W3C working group responsible for this specification's progress along
-   the W3C Recommendation track. <!--ZZZ:--> This specification is the 22
+   the W3C Recommendation track. <!--ZZZ:--> This specification is the 23
    July 2008 <!--ZZZ "Working Draft"-->Editor's Draft. <!--:ZZZ--></p>
   <!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST -->
   <!-- relationship to other work (required) -->
@@ -1780,7 +1780,8 @@
        <li><a href="#character"><span class=secno>8.1.4 </span>Character
         references</a>
 
-       <li><a href="#cdata"><span class=secno>8.1.5 </span>CDATA blocks</a>
+       <li><a href="#cdata"><span class=secno>8.1.5 </span>CDATA sections</a>
+        
 
        <li><a href="#comments"><span class=secno>8.1.6 </span>Comments</a>
       </ul>
@@ -29407,8 +29408,8 @@
 
   <p>If the <code title=attr-rule-condition><a
    href="#condition">condition</a></code> attribute is not specified, then
-   the condition applies to all elements, text nodes, CDATA nodes, and
-   processing instructions.
+   the condition applies to all elements, text nodes,
+   <code>CDATASection</code> nodes, and processing instructions.
 
   <p>The <dfn id=mode title=attr-rule-mode><code>mode</code></dfn> attribute,
    if specified, must have a value that is an <a href="#unordered">unordered
@@ -29481,8 +29482,9 @@
    processing at this point. <a href="#references">[SELECTORS]</a>
 
   <p>If the <code title=attr-nest-filter><a href="#filter">filter</a></code>
-   attribute is not specified, then all elements, text nodes, CDATA nodes,
-   and processing instructions are processed.
+   attribute is not specified, then all elements, text nodes,
+   <code>CDATASection</code> nodes, and processing instructions are
+   processed.
 
   <p>The <dfn id=mode1 title=attr-nest-mode><code>mode</code></dfn>
    attribute, if specified, must have a value that is a word token consisting
@@ -30163,16 +30165,17 @@
       </ol>
     </ol>
 
-    <p>Otherwise, the <var title="">new node</var> is a text node, CDATA
-     block, or PI. Run these substeps instead:</p>
+    <p>Otherwise, the <var title="">new node</var> is a text node,
+     <code>CDATASection</code> node, or processing instruction. Run these
+     substeps instead:</p>
 
     <ol>
      <li>
       <p>Let <var title="">expanded</var> be the result of passing the node
        value of <var title="">template node</var> (the content of the text
-       node, CDATA block, or PI) to the <a href="#text-expansion">text
-       expansion algorithm for templates</a> along with <var title="">source
-       node</var>.
+       node, <code>CDATASection</code> node, or processing instruction) to
+       the <a href="#text-expansion">text expansion algorithm for
+       templates</a> along with <var title="">source node</var>.
 
      <li>
       <p>If the value of the <var title="">new node</var> is different from
@@ -43514,7 +43517,7 @@
    is <em>not</em> marked as self-closing can have <a href="#text2"
    title=syntax-text>text</a>, <a href="#character3"
    title=syntax-charref>character references</a>, <a href="#cdata0"
-   title=syntax-cdata>CDATA blocks</a>, other <a href="#elements3"
+   title=syntax-cdata>CDATA sections</a>, other <a href="#elements3"
    title=syntax-elements>elements</a>, and <a href="#comments0"
    title=syntax-comments>comments</a>, but the text must not contain the
    character U+003C LESS-THAN SIGN (<code>&lt;</code>) or an <a
@@ -44070,18 +44073,18 @@
    a <a href="#space">space character</a>, a U+003C LESS-THAN SIGN character
    ('&lt;'), or another U+0026 AMPERSAND (<code>&amp;</code>) character.
 
-  <h4 id=cdata><span class=secno>8.1.5 </span>CDATA blocks</h4>
+  <h4 id=cdata><span class=secno>8.1.5 </span>CDATA sections</h4>
 
-  <p><dfn id=cdata0 title=syntax-cdata>CDATA blocks</dfn> must start with the
-   character sequence U+003C LESS-THAN SIGN, U+0021 EXCLAMATION MARK, U+005B
-   LEFT SQUARE BRACKET, U+0043 LATIN CAPITAL LETTER C, U+0044 LATIN CAPITAL
-   LETTER D, U+0041 LATIN CAPITAL LETTER A, U+0054 LATIN CAPITAL LETTER T,
-   U+0041 LATIN CAPITAL LETTER A, U+005B LEFT SQUARE BRACKET (<code
-   title="">&lt;![CDATA[</code>). Following this sequence, the block may have
-   <a href="#text2" title=syntax-text>text</a>, with the additional
+  <p><dfn id=cdata0 title=syntax-cdata>CDATA sections</dfn> must start with
+   the character sequence U+003C LESS-THAN SIGN, U+0021 EXCLAMATION MARK,
+   U+005B LEFT SQUARE BRACKET, U+0043 LATIN CAPITAL LETTER C, U+0044 LATIN
+   CAPITAL LETTER D, U+0041 LATIN CAPITAL LETTER A, U+0054 LATIN CAPITAL
+   LETTER T, U+0041 LATIN CAPITAL LETTER A, U+005B LEFT SQUARE BRACKET (<code
+   title="">&lt;![CDATA[</code>). Following this sequence, the CDATA section
+   may have <a href="#text2" title=syntax-text>text</a>, with the additional
    restriction that the text must not contain the three character sequence
    U+005D RIGHT SQUARE BRACKET, U+005D RIGHT SQUARE BRACKET, U+003E
-   GREATER-THAN SIGN (<code title="">]]></code>). Finally, the CDATA block
+   GREATER-THAN SIGN (<code title="">]]></code>). Finally, the CDATA section
    must be ended by the three character sequence U+005D RIGHT SQUARE BRACKET,
    U+005D RIGHT SQUARE BRACKET, U+003E GREATER-THAN SIGN (<code
    title="">]]></code>).
@@ -44934,7 +44937,7 @@
    after after frameset">after after frameset</a>" during the course of the
    parsing, as described in the <a href="#tree-construction0">tree
    construction</a> stage. The insertion mode affects how tokens are
-   processed and whether CDATA blocks are supported.
+   processed and whether CDATA sections are supported.
 
   <p>Seven of these modes, namely "<a href="#in-head" title="insertion mode:
    in head">in head</a>", "<a href="#in-body" title="insertion mode: in
@@ -46191,7 +46194,7 @@
     only --> match for
      the string "[CDATA[" (the five uppercase letters "CDATA" with a U+005B
      LEFT SQUARE BRACKET character before and after), then consume those
-     characters and switch to the <a href="#cdata1">CDATA block state</a>
+     characters and switch to the <a href="#cdata1">CDATA section state</a>
      (which is unrelated to the <a href="#content3">content model flag</a>'s
      CDATA state).</p>
 
@@ -46811,7 +46814,7 @@
      <dd>Stay in the <a href="#bogus0">bogus DOCTYPE state</a>.
     </dl>
 
-   <dt><dfn id=cdata1>CDATA block state</dfn>
+   <dt><dfn id=cdata1>CDATA section state</dfn>
 
    <dd>
     <p><em>(This can only happen if the <a href="#content3">content model
@@ -47517,10 +47520,10 @@
      <td> <a href="#xmlns">XMLNS namespace</a>
   </table>
 
-  <p>The <dfn id=generic>generic CDATA parsing algorithm</dfn> and the <dfn
-   id=generic0>generic RCDATA parsing algorithm</dfn> consist of the
-   following steps. These algorithms are always invoked in response to a
-   start tag token.
+  <p>The <dfn id=generic>generic CDATA element parsing algorithm</dfn> and
+   the <dfn id=generic0>generic RCDATA element parsing algorithm</dfn>
+   consist of the following steps. These algorithms are always invoked in
+   response to a start tag token.
 
   <ol>
    <li>
@@ -47532,11 +47535,11 @@
 
    <li>
     <p>If the algorithm that was invoked is the <a href="#generic">generic
-     CDATA parsing algorithm</a>, switch the tokeniser's <a
+     CDATA element parsing algorithm</a>, switch the tokeniser's <a
      href="#content3">content model flag</a> to the CDATA state; otherwise
-     the algorithm invoked was the <a href="#generic0">generic RCDATA parsing
-     algorithm</a>, switch the tokeniser's <a href="#content3">content model
-     flag</a> to the RCDATA state.
+     the algorithm invoked was the <a href="#generic0">generic RCDATA element
+     parsing algorithm</a>, switch the tokeniser's <a
+     href="#content3">content model flag</a> to the RCDATA state.
 
    <li>
     <p>Then, collect all the character tokens that the tokeniser returns
@@ -48147,7 +48150,8 @@
    <dt>A start tag whose tag name is "title"
 
    <dd>
-    <p>Follow the <a href="#generic0">generic RCDATA parsing algorithm</a>.</p>
+    <p>Follow the <a href="#generic0">generic RCDATA element parsing
+     algorithm</a>.</p>
 
    <dt>A start tag whose tag name is "noscript", if the <a
     href="#scripting2">scripting flag</a> is enabled
@@ -48155,7 +48159,8 @@
    <dt>A start tag whose tag name is one of: "noframes", "style"
 
    <dd>
-    <p>Follow the <a href="#generic">generic CDATA parsing algorithm</a>.</p>
+    <p>Follow the <a href="#generic">generic CDATA element parsing
+     algorithm</a>.</p>
 
    <dt>A start tag whose tag name is "noscript", if the <a
     href="#scripting2">scripting flag</a> is disabled
@@ -49221,7 +49226,8 @@
     <p><a href="#reconstruct">Reconstruct the active formatting elements</a>,
      if any.</p>
 
-    <p>Follow the <a href="#generic">generic CDATA parsing algorithm</a>.</p>
+    <p>Follow the <a href="#generic">generic CDATA element parsing
+     algorithm</a>.</p>
 
    <dt>A start tag whose tag name is "table"
 
@@ -49419,7 +49425,8 @@
     href="#scripting2">scripting flag</a> is enabled
 
    <dd>
-    <p>Follow the <a href="#generic">generic CDATA parsing algorithm</a>.</p>
+    <p>Follow the <a href="#generic">generic CDATA element parsing
+     algorithm</a>.</p>
 
    <dt>A start tag whose tag name is "select"
 
@@ -51236,29 +51243,32 @@
      <dt>If it is a <code><a href="#title1">title</a></code> or
       <code>textarea</code> element
 
-     <dd>Set the <a href="#content3">content model flag</a> to <i>RCDATA</i>.
+     <dd>Set the <a href="#content3">content model flag</a> to the RCDATA
+      state.
 
      <dt>If it is a <code><a href="#style1">style</a></code>, <code><a
       href="#script1">script</a></code>, <code>xmp</code>, <code><a
       href="#iframe">iframe</a></code>, <code>noembed</code>, or
       <code>noframes</code> element
 
-     <dd>Set the <a href="#content3">content model flag</a> to <i>CDATA</i>.
+     <dd>Set the <a href="#content3">content model flag</a> to the CDATA
+      state.
 
      <dt>If it is a <code><a href="#noscript">noscript</a></code> element
 
      <dd>If the <a href="#scripting2">scripting flag</a> is enabled, set the
-      <a href="#content3">content model flag</a> to <i>CDATA</i>. Otherwise,
-      set the <a href="#content3">content model flag</a> to <i>PCDATA</i>.
+      <a href="#content3">content model flag</a> to the CDATA state.
+      Otherwise, set the <a href="#content3">content model flag</a> to the
+      PCDATA state.
 
      <dt>If it is a <code>plaintext</code> element
 
-     <dd>Set the <a href="#content3">content model flag</a> to
-      <i>PLAINTEXT</i>.
+     <dd>Set the <a href="#content3">content model flag</a> to PLAINTEXT.
 
      <dt>Otherwise
 
-     <dd>Set the <a href="#content3">content model flag</a> to <i>PCDATA</i>.
+     <dd>Set the <a href="#content3">content model flag</a> to the PCDATA
+      state.
     </dl>
 
    <li>
Received on Wednesday, 23 July 2008 00:52:13 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Thursday, 9 October 2008 20:32:58 GMT