[html5] r1294 - /

[whatwg at whatwg.org]

Author: ianh
Date: 2008-03-02 02:06:15 -0800 (Sun, 02 Mar 2008)
New Revision: 1294

Modified:
   index
   source
Log:
[cot] (2) Make entities not get parsed between 'comments' in RCDATA elements.

Modified: index
===================================================================
--- index	2008-03-02 09:50:56 UTC (rev 1293)
+++ index	2008-03-02 10:06:15 UTC (rev 1294)
@@ -37796,9 +37796,7 @@
    title=syntax-escape>escaping text span</a>.
 
   <p>An <dfn id=escaping title=syntax-escape>escaping text span</dfn> is a
-   span of <a href="#text1" title=syntax-text>text</a> (in CDATA and RCDATA
-   elements) and <a href="#character2" title=syntax-entities>character entity
-   references</a> (in RCDATA elements) that starts with an <a
+   span of <a href="#text1" title=syntax-text>text</a> that starts with an <a
    href="#escaping0" title=syntax-escape-start>escaping text span start</a>
    that is not itself in an <a href="#escaping" title=syntax-escape>escaping
    text span</a>, and ends at the next <a href="#escaping1"
@@ -38662,8 +38660,8 @@
      <dt>U+0026 AMPERSAND (&)
 
      <dd>When the <a href="#content2">content model flag</a> is set to one of
-      the PCDATA or RCDATA states: switch to the <a href="#entity">entity
-      data state</a>.
+      the PCDATA or RCDATA states and the <a href="#escape">escape flag</a>
+      is false: switch to the <a href="#entity">entity data state</a>.
 
      <dd>Otherwise: treat it as per the "anything else" entry below.
 

Modified: source
===================================================================
--- source	2008-03-02 09:50:56 UTC (rev 1293)
+++ source	2008-03-02 10:06:15 UTC (rev 1294)
@@ -35301,9 +35301,7 @@
   span</span>.</p>
 
   <p>An <dfn title="syntax-escape">escaping text span</dfn> is a span
-  of <span title="syntax-text">text</span> (in CDATA and RCDATA
-  elements) and <span title="syntax-entities">character entity
-  references</span> (in RCDATA elements) that starts with an <span
+  of <span title="syntax-text">text</span> that starts with an <span
   title="syntax-escape-start">escaping text span start</span> that is
   not itself in an <span title="syntax-escape">escaping text
   span</span>, and ends at the next <span
@@ -36227,8 +36225,8 @@
 
      <dt>U+0026 AMPERSAND (&)</dt>
      <dd>When the <span>content model flag</span> is set to one of the
-     PCDATA or RCDATA states: switch to the <span>entity data
-     state</span>.</dd>
+     PCDATA or RCDATA states and the <span>escape flag</span> is
+     false: switch to the <span>entity data state</span>.</dd>
      <dd>Otherwise: treat it as per the "anything else" entry below.</dd>
 
      <dt>U+002D HYPHEN-MINUS (-)</dt>