[html5] r6825 - [giowt] (2) Fix <script>document.write('...')</script> -- it turns out the token [...]

whatwg at whatwg.org whatwg at whatwg.org
Fri Nov 11 11:45:11 PST 2011


Author: ianh
Date: 2011-11-11 11:45:09 -0800 (Fri, 11 Nov 2011)
New Revision: 6825

Modified:
   complete.html
   index
   source
Log:
[giowt] (2) Fix <script>document.write('...')</script> -- it turns out the tokeniser would have been in the wrong state when processing the '.'s. This is actually just fixing the cases I somehow missed in r5164.
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=14698

Modified: complete.html
===================================================================
--- complete.html	2011-11-11 00:55:55 UTC (rev 6824)
+++ complete.html	2011-11-11 19:45:09 UTC (rev 6825)
@@ -85036,12 +85036,12 @@
   machine to tokenize HTML. The state machine must start in the
   <a href=#data-state>data state</a>. Most states consume a single character,
   which may have various side-effects, and either switches the state
-  machine to a new state to <em>reconsume</em> the same character, or
-  switches it to a new state (to consume the next character), or
-  repeats the same state (to consume the next character). Some states
-  have more complicated behavior and can consume several characters
-  before switching to another state. In some cases, the tokenizer
-  state is also changed by the tree construction stage.</p>
+  machine to a new state to <i>reconsume</i> the same character, or
+  switches it to a new state to consume the next character, or stays
+  in the same state to consume the next character. Some states have
+  more complicated behavior and can consume several characters before
+  switching to another state. In some cases, the tokenizer state is
+  also changed by the tree construction stage.</p>
 
   <p>The exact behavior of certain states depends on the
   <a href=#insertion-mode>insertion mode</a> and the <a href=#stack-of-open-elements>stack of open
@@ -85125,6 +85125,8 @@
 
   </dl><h5 id=character-reference-in-data-state><span class=secno>13.2.4.2 </span><dfn>Character reference in data state</dfn></h5>
 
+  <p>Switch to the <a href=#data-state>data state</a>.</p>
+
   <p>Attempt to <a href=#consume-a-character-reference>consume a character reference</a>, with no
   <a href=#additional-allowed-character>additional allowed character</a>.</p>
 
@@ -85133,9 +85135,7 @@
 
   <p>Otherwise, emit the character tokens that were returned.</p>
 
-  <p>Finally, switch to the <a href=#data-state>data state</a>.</p>
 
-
   <h5 id=rcdata-state><span class=secno>13.2.4.3 </span><dfn>RCDATA state</dfn></h5>
 
   <p>Consume the <a href=#next-input-character>next input character</a>:</p>
@@ -85160,6 +85160,8 @@
 
   </dl><h5 id=character-reference-in-rcdata-state><span class=secno>13.2.4.4 </span><dfn>Character reference in RCDATA state</dfn></h5>
 
+  <p>Switch to the <a href=#rcdata-state>RCDATA state</a>.</p>
+
   <p>Attempt to <a href=#consume-a-character-reference>consume a character reference</a>, with no
   <a href=#additional-allowed-character>additional allowed character</a>.</p>
 
@@ -85168,9 +85170,7 @@
 
   <p>Otherwise, emit the character tokens that were returned.</p>
 
-  <p>Finally, switch to the <a href=#rcdata-state>RCDATA state</a>.</p>
 
-
   <h5 id=rawtext-state><span class=secno>13.2.4.5 </span><dfn>RAWTEXT state</dfn></h5>
 
   <p>Consume the <a href=#next-input-character>next input character</a>:</p>
@@ -85250,9 +85250,9 @@
    comment state</a>.</dd>
 
    <dt>Anything else</dt>
-   <dd><a href=#parse-error>Parse error</a>. Emit a U+003C LESS-THAN SIGN
-   character token and reconsume the <a href=#current-input-character>current input
-   character</a> in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Emit a U+003C LESS-THAN SIGN character token.
+   Reconsume the <a href=#current-input-character>current input character</a>.</dd>
 
   </dl><h5 id=end-tag-open-state><span class=secno>13.2.4.9 </span><dfn>End tag open state</dfn></h5>
 
@@ -85276,9 +85276,9 @@
    state</a>.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Emit a U+003C LESS-THAN SIGN
-   character token and a U+002F SOLIDUS character token. Reconsume
-   the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Emit a U+003C LESS-THAN SIGN character token and a
+   U+002F SOLIDUS character token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#bogus-comment-state>bogus
@@ -85312,8 +85312,8 @@
    character to the current tag token's tag name.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <a href=#current-input-character>current input character</a> to the current
@@ -85329,9 +85329,9 @@
    to the <a href=#rcdata-end-tag-open-state>RCDATA end tag open state</a>.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token and reconsume the
-   <a href=#current-input-character>current input character</a> in the <a href=#rcdata-state>RCDATA
-   state</a>.</dd>
+   <dd>Switch to the <a href=#rcdata-state>RCDATA state</a>. Emit a U+003C
+   LESS-THAN SIGN character token. Reconsume the <a href=#current-input-character>current
+   input character</a>.</dd>
 
   </dl><h5 id=rcdata-end-tag-open-state><span class=secno>13.2.4.12 </span><dfn>RCDATA end tag open state</dfn></h5>
   <!-- identical to the RAWTEXT (and Script data) end tag open state, except s/RAWTEXT/RCDATA/g -->
@@ -85356,9 +85356,9 @@
    emitted.)</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
-   character token, and reconsume the <a href=#current-input-character>current input
-   character</a> in the <a href=#rcdata-state>RCDATA state</a>.</dd>
+   <dd>Switch to the <a href=#rcdata-state>RCDATA state</a>. Emit a U+003C
+   LESS-THAN SIGN character token and a U+002F SOLIDUS character token.
+   Reconsume the <a href=#current-input-character>current input character</a>.</dd>
 
   </dl><h5 id=rcdata-end-tag-name-state><span class=secno>13.2.4.13 </span><dfn>RCDATA end tag name state</dfn></h5>
   <!-- identical to the RAWTEXT (and Script data) end tag name state, except s/RAWTEXT/RCDATA/g -->
@@ -85383,8 +85383,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (>)</dt>
    <dd>If the current end tag token is an <a href=#appropriate-end-tag-token>appropriate end tag
-   token</a>, then emit the current tag token and switch to the
-   <a href=#data-state>data state</a>. Otherwise, treat it as per the "anything
+   token</a>, then switch to the <a href=#data-state>data state</a> and emit
+   the current tag token. Otherwise, treat it as per the "anything
    else" entry below.</dd>
 
    <dt>U+0041 LATIN CAPITAL LETTER A through to U+005A LATIN CAPITAL LETTER Z</dt>
@@ -85399,11 +85399,11 @@
    character</a> to the <var><a href=#temporary-buffer>temporary buffer</a></var>.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
-   character token, a character token for each of the characters in
-   the <var><a href=#temporary-buffer>temporary buffer</a></var> (in the order they were added to
-   the buffer), and reconsume the <a href=#current-input-character>current input character</a>
-   in the <a href=#rcdata-state>RCDATA state</a>.</dd>
+   <dd>Switch to the <a href=#rcdata-state>RCDATA state</a>. Emit a U+003C
+   LESS-THAN SIGN character token, a U+002F SOLIDUS character token,
+   and a character token for each of the characters in the
+   <var><a href=#temporary-buffer>temporary buffer</a></var> (in the order they were added to the
+   buffer). Reconsume the <a href=#current-input-character>current input character</a>.</dd>
 
   </dl><h5 id=rawtext-less-than-sign-state><span class=secno>13.2.4.14 </span><dfn>RAWTEXT less-than sign state</dfn></h5>
   <!-- identical to the RCDATA less-than sign state, except s/RCDATA/RAWTEXT/g -->
@@ -85415,9 +85415,9 @@
    to the <a href=#rawtext-end-tag-open-state>RAWTEXT end tag open state</a>.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token and reconsume the
-   <a href=#current-input-character>current input character</a> in the <a href=#rawtext-state>RAWTEXT
-   state</a>.</dd>
+   <dd>Switch to the <a href=#rawtext-state>RAWTEXT state</a>. Emit a U+003C
+   LESS-THAN SIGN character token. Reconsume the <a href=#current-input-character>current
+   input character</a>.</dd>
 
   </dl><h5 id=rawtext-end-tag-open-state><span class=secno>13.2.4.15 </span><dfn>RAWTEXT end tag open state</dfn></h5>
   <!-- identical to the RCDATA (and Script data) end tag open state, except s/RCDATA/RAWTEXT/g -->
@@ -85442,9 +85442,9 @@
    emitted.)</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
-   character token, and reconsume the <a href=#current-input-character>current input
-   character</a> in the <a href=#rawtext-state>RAWTEXT state</a>.</dd>
+   <dd>Switch to the <a href=#rawtext-state>RAWTEXT state</a>. Emit a U+003C
+   LESS-THAN SIGN character token and a U+002F SOLIDUS character
+   token. Reconsume the <a href=#current-input-character>current input character</a>.</dd>
 
   </dl><h5 id=rawtext-end-tag-name-state><span class=secno>13.2.4.16 </span><dfn>RAWTEXT end tag name state</dfn></h5>
   <!-- identical to the RCDATA (and Script data) end tag name state, except s/RCDATA/RAWTEXT/g -->
@@ -85469,8 +85469,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (>)</dt>
    <dd>If the current end tag token is an <a href=#appropriate-end-tag-token>appropriate end tag
-   token</a>, then emit the current tag token and switch to the
-   <a href=#data-state>data state</a>. Otherwise, treat it as per the "anything
+   token</a>, then switch to the <a href=#data-state>data state</a> and emit
+   the current tag token. Otherwise, treat it as per the "anything
    else" entry below.</dd>
 
    <dt>U+0041 LATIN CAPITAL LETTER A through to U+005A LATIN CAPITAL LETTER Z</dt>
@@ -85485,11 +85485,11 @@
    character</a> to the <var><a href=#temporary-buffer>temporary buffer</a></var>.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
-   character token, a character token for each of the characters in
-   the <var><a href=#temporary-buffer>temporary buffer</a></var> (in the order they were added to
-   the buffer), and reconsume the <a href=#current-input-character>current input character</a>
-   in the <a href=#rawtext-state>RAWTEXT state</a>.</dd>
+   <dd>Switch to the <a href=#rawtext-state>RAWTEXT state</a>. Emit a U+003C
+   LESS-THAN SIGN character token, a U+002F SOLIDUS character token,
+   and a character token for each of the characters in the
+   <var><a href=#temporary-buffer>temporary buffer</a></var> (in the order they were added to the
+   buffer). Reconsume the <a href=#current-input-character>current input character</a>.</dd>
 
   </dl><h5 id=script-data-less-than-sign-state><span class=secno>13.2.4.17 </span><dfn>Script data less-than sign state</dfn></h5>
 
@@ -85505,9 +85505,9 @@
    MARK character token.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token and reconsume the
-   <a href=#current-input-character>current input character</a> in the <a href=#script-data-state>script data
-   state</a>.</dd>
+   <dd>Switch to the <a href=#script-data-state>script data state</a>. Emit a U+003C
+   LESS-THAN SIGN character token. Reconsume the <a href=#current-input-character>current
+   input character</a>.</dd>
 
   </dl><h5 id=script-data-end-tag-open-state><span class=secno>13.2.4.18 </span><dfn>Script data end tag open state</dfn></h5>
   <!-- identical to the RCDATA (and RAWTEXT) end tag open state, except s/RCDATA/Script data/g -->
@@ -85532,9 +85532,9 @@
    emitted.)</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
-   character token, and reconsume the <a href=#current-input-character>current input
-   character</a> in the <a href=#script-data-state>script data state</a>.</dd>
+   <dd>Switch to the <a href=#script-data-state>script data state</a>. Emit a U+003C
+   LESS-THAN SIGN character token and a U+002F SOLIDUS character token.
+   Reconsume the <a href=#current-input-character>current input character</a>.</dd>
 
   </dl><h5 id=script-data-end-tag-name-state><span class=secno>13.2.4.19 </span><dfn>Script data end tag name state</dfn></h5>
   <!-- identical to the RCDATA (and RAWTEXT) end tag name state, except s/RCDATA/Script data/g -->
@@ -85559,8 +85559,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (>)</dt>
    <dd>If the current end tag token is an <a href=#appropriate-end-tag-token>appropriate end tag
-   token</a>, then emit the current tag token and switch to the
-   <a href=#data-state>data state</a>. Otherwise, treat it as per the "anything
+   token</a>, then switch to the <a href=#data-state>data state</a> and emit
+   the current tag token. Otherwise, treat it as per the "anything
    else" entry below.</dd>
 
    <dt>U+0041 LATIN CAPITAL LETTER A through to U+005A LATIN CAPITAL LETTER Z</dt>
@@ -85575,11 +85575,11 @@
    character</a> to the <var><a href=#temporary-buffer>temporary buffer</a></var>.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
-   character token, a character token for each of the characters in
-   the <var><a href=#temporary-buffer>temporary buffer</a></var> (in the order they were added to
-   the buffer), and reconsume the <a href=#current-input-character>current input character</a>
-   in the <a href=#script-data-state>script data state</a>.</dd>
+   <dd>Switch to the <a href=#script-data-state>script data state</a>. Emit a U+003C
+   LESS-THAN SIGN character token, a U+002F SOLIDUS character token,
+   and a character token for each of the characters in the
+   <var><a href=#temporary-buffer>temporary buffer</a></var> (in the order they were added to the
+   buffer). Reconsume the <a href=#current-input-character>current input character</a>.</dd>
 
   </dl><h5 id=script-data-escape-start-state><span class=secno>13.2.4.20 </span><dfn>Script data escape start state</dfn></h5>
 
@@ -85590,8 +85590,8 @@
    state</a>. Emit a U+002D HYPHEN-MINUS character token.</dd>
 
    <dt>Anything else</dt>
-   <dd>Reconsume the <a href=#current-input-character>current input character</a> in the
-   <a href=#script-data-state>script data state</a>.</dd>
+   <dd>Switch to the <a href=#script-data-state>script data state</a>. Reconsume the
+   <a href=#current-input-character>current input character</a>.</dd>
 
   </dl><h5 id=script-data-escape-start-dash-state><span class=secno>13.2.4.21 </span><dfn>Script data escape start dash state</dfn></h5>
 
@@ -85602,8 +85602,8 @@
    state</a>. Emit a U+002D HYPHEN-MINUS character token.</dd>
 
    <dt>Anything else</dt>
-   <dd>Reconsume the <a href=#current-input-character>current input character</a> in the
-   <a href=#script-data-state>script data state</a>.</dd>
+   <dd>Switch to the <a href=#script-data-state>script data state</a>. Reconsume the
+   <a href=#current-input-character>current input character</a>.</dd>
 
   </dl><h5 id=script-data-escaped-state><span class=secno>13.2.4.22 </span><dfn>Script data escaped state</dfn></h5>
 
@@ -85622,8 +85622,8 @@
    character token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd>Switch to the <a href=#data-state>data state</a>. <a href=#parse-error>Parse
+   error</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Emit the <a href=#current-input-character>current input character</a> as a character
@@ -85647,8 +85647,8 @@
    token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Switch to the <a href=#script-data-escaped-state>script data escaped state</a>. Emit the
@@ -85675,8 +85675,8 @@
    token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Switch to the <a href=#script-data-escaped-state>script data escaped state</a>. Emit the
@@ -85706,9 +85706,9 @@
    <a href=#current-input-character>current input character</a> as a character token.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token and reconsume the
-   <a href=#current-input-character>current input character</a> in the <a href=#script-data-escaped-state>script data
-   escaped state</a>.</dd>
+   <dd>Switch to the <a href=#script-data-state>script data state</a>. Emit a U+003C
+   LESS-THAN SIGN character token. Reconsume the <a href=#current-input-character>current
+   input character</a>.</dd>
 
   </dl><h5 id=script-data-escaped-end-tag-open-state><span class=secno>13.2.4.26 </span><dfn>Script data escaped end tag open state</dfn></h5>
 
@@ -85732,9 +85732,10 @@
    filled in before it is emitted.)</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
-   character token, and reconsume the <a href=#current-input-character>current input
-   character</a> in the <a href=#script-data-escaped-state>script data escaped state</a>.</dd>
+   <dd>Switch to the <a href=#script-data-escaped-state>script data escaped state</a>. Emit a
+   U+003C LESS-THAN SIGN character token and a U+002F SOLIDUS
+   character token. Reconsume the <a href=#current-input-character>current input
+   character</a>.</dd>
 
   </dl><h5 id=script-data-escaped-end-tag-name-state><span class=secno>13.2.4.27 </span><dfn>Script data escaped end tag name state</dfn></h5>
 
@@ -85758,8 +85759,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (>)</dt>
    <dd>If the current end tag token is an <a href=#appropriate-end-tag-token>appropriate end tag
-   token</a>, then emit the current tag token and switch to the
-   <a href=#data-state>data state</a>. Otherwise, treat it as per the "anything
+   token</a>, then switch to the <a href=#data-state>data state</a> and emit
+   the current tag token. Otherwise, treat it as per the "anything
    else" entry below.</dd>
 
    <dt>U+0041 LATIN CAPITAL LETTER A through to U+005A LATIN CAPITAL LETTER Z</dt>
@@ -85774,11 +85775,11 @@
    character</a> to the <var><a href=#temporary-buffer>temporary buffer</a></var>.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
-   character token, a character token for each of the characters in
-   the <var><a href=#temporary-buffer>temporary buffer</a></var> (in the order they were added to
-   the buffer), and reconsume the <a href=#current-input-character>current input character</a>
-   in the <a href=#script-data-escaped-state>script data escaped state</a>.</dd>
+   <dd>Switch to the <a href=#script-data-escaped-state>script data escaped state</a>. Emit a
+   U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS character
+   token, and a character token for each of the characters in the
+   <var><a href=#temporary-buffer>temporary buffer</a></var> (in the order they were added to the
+   buffer). Reconsume the <a href=#current-input-character>current input character</a>.</dd>
 
   </dl><h5 id=script-data-double-escape-start-state><span class=secno>13.2.4.28 </span><dfn>Script data double escape start state</dfn></h5>
 
@@ -85808,8 +85809,8 @@
    character</a> as a character token.</dd>
 
    <dt>Anything else</dt>
-   <dd>Reconsume the <a href=#current-input-character>current input character</a> in the
-   <a href=#script-data-escaped-state>script data escaped state</a>.</dd>
+   <dd>Switch to the <a href=#script-data-escaped-state>script data escaped state</a>. Reconsume
+   the <a href=#current-input-character>current input character</a>.</dd>
 
   </dl><h5 id=script-data-double-escaped-state><span class=secno>13.2.4.29 </span><dfn>Script data double escaped state</dfn></h5>
 
@@ -85829,8 +85830,8 @@
    character token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Emit the <a href=#current-input-character>current input character</a> as a character
@@ -85855,8 +85856,8 @@
    character token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Switch to the <a href=#script-data-double-escaped-state>script data double escaped
@@ -85885,8 +85886,8 @@
    character token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Switch to the <a href=#script-data-double-escaped-state>script data double escaped
@@ -85903,8 +85904,8 @@
    U+002F SOLIDUS character token.</dd>
 
    <dt>Anything else</dt>
-   <dd>Reconsume the <a href=#current-input-character>current input character</a> in the
-   <a href=#script-data-double-escaped-state>script data double escaped state</a>.</dd>
+   <dd>Switch to the <a href=#script-data-double-escaped-state>script data double escaped state</a>.
+   Reconsume the <a href=#current-input-character>current input character</a>.</dd>
 
   </dl><h5 id=script-data-double-escape-end-state><span class=secno>13.2.4.33 </span><dfn>Script data double escape end state</dfn></h5>
 
@@ -85934,8 +85935,8 @@
    character</a> as a character token.</dd>
 
    <dt>Anything else</dt>
-   <dd>Reconsume the <a href=#current-input-character>current input character</a> in the
-   <a href=#script-data-double-escaped-state>script data double escaped state</a>.</dd>
+   <dd>Switch to the <a href=#script-data-double-escaped-state>script data double escaped state</a>.
+   Reconsume the <a href=#current-input-character>current input character</a>.</dd>
 
   </dl><h5 id=before-attribute-name-state><span class=secno>13.2.4.34 </span><dfn>Before attribute name state</dfn></h5>
 
@@ -85976,8 +85977,8 @@
    entry below.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Start a new attribute in the current tag token. Set that
@@ -86022,8 +86023,8 @@
    entry below.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <a href=#current-input-character>current input character</a> to the current
@@ -86079,8 +86080,8 @@
    entry below.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Start a new attribute in the current tag token. Set that
@@ -86103,8 +86104,8 @@
    <dd>Switch to the <a href=#attribute-value-(double-quoted)-state>attribute value (double-quoted) state</a>.</dd>
 
    <dt>U+0026 AMPERSAND (&)</dt>
-   <dd>Switch to the <a href=#attribute-value-(unquoted)-state>attribute value (unquoted) state</a>
-   and reconsume this <a href=#current-input-character>current input character</a>.</dd>
+   <dd>Switch to the <a href=#attribute-value-(unquoted)-state>attribute value (unquoted) state</a>.
+   Reconsume the <a href=#current-input-character>current input character</a>.</dd>
 
    <dt>U+0027 APOSTROPHE (')</dt>
    <dd>Switch to the <a href=#attribute-value-(single-quoted)-state>attribute value (single-quoted) state</a>.</dd>
@@ -86125,8 +86126,8 @@
    entry below.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <a href=#current-input-character>current input character</a> to the current
@@ -86151,8 +86152,8 @@
    character to the current attribute's value.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <a href=#current-input-character>current input character</a> to the current
@@ -86176,8 +86177,8 @@
    character to the current attribute's value.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <a href=#current-input-character>current input character</a> to the current
@@ -86216,8 +86217,8 @@
    entry below.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <a href=#current-input-character>current input character</a> to the current
@@ -86256,12 +86257,12 @@
    token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the character in
-   the <a href=#before-attribute-name-state>before attribute name state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#before-attribute-name-state>before attribute
+   name state</a>. Reconsume the character.</dd>
 
   </dl><h5 id=self-closing-start-tag-state><span class=secno>13.2.4.43 </span><dfn>Self-closing start tag state</dfn></h5>
 
@@ -86273,12 +86274,12 @@
    token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the character in
-   the <a href=#before-attribute-name-state>before attribute name state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#before-attribute-name-state>before attribute
+   name state</a>. Reconsume the character.</dd>
 
   </dl><h5 id=bogus-comment-state><span class=secno>13.2.4.44 </span><dfn>Bogus comment state</dfn></h5>
 
@@ -86341,8 +86342,8 @@
    comment end state -->
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Emit the comment token. Reconsume
-   the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Emit the comment token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <a href=#current-input-character>current input character</a> to the comment
@@ -86366,9 +86367,9 @@
    state</a>. Emit the comment token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Emit the comment token. Reconsume the
-   EOF character in the <a href=#data-state>data state</a>.</dd> <!-- see comment
-   in comment end state -->
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Emit the comment token. Reconsume the EOF
+   character.</dd> <!-- see comment in comment end state -->
 
    <dt>Anything else</dt>
    <dd>Append a U+002D HYPHEN-MINUS character (-) and the
@@ -86387,9 +86388,9 @@
    character to the comment token's data.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Emit the comment token. Reconsume the
-   EOF character in the <a href=#data-state>data state</a>.</dd> <!-- see comment
-   in comment end state -->
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Emit the comment token. Reconsume the EOF
+   character.</dd> <!-- see comment in comment end state -->
 
    <dt>Anything else</dt>
    <dd>Append the <a href=#current-input-character>current input character</a> to the comment
@@ -86409,9 +86410,9 @@
    state</a>.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Emit the comment token. Reconsume the
-   EOF character in the <a href=#data-state>data state</a>.</dd> <!-- see comment
-   in comment end state -->
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Emit the comment token. Reconsume the EOF
+   character.</dd> <!-- see comment in comment end state -->
 
    <dt>Anything else</dt>
    <dd>Append a U+002D HYPHEN-MINUS character (-) and the
@@ -86441,12 +86442,12 @@
    character (-) to the comment token's data.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Emit the comment token. Reconsume
-   the EOF character in the <a href=#data-state>data state</a>.</dd> <!-- For
-   security reasons: otherwise, hostile user could put a <script> in
-   a comment e.g. in a blog comment and then DOS the server so that
-   the end tag isn't read, and then the commented <script> tag would
-   be treated as live code -->
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Emit the comment token. Reconsume the EOF
+   character.</dd> <!-- For security reasons: otherwise, hostile user
+   could put a <script> in a comment e.g. in a blog comment and then
+   DOS the server so that the end tag isn't read, and then the
+   commented <script> tag would be treated as live code -->
 
    <dt>Anything else</dt>
    <dd><a href=#parse-error>Parse error</a>. Append two U+002D HYPHEN-MINUS
@@ -86474,9 +86475,9 @@
    Switch to the <a href=#comment-state>comment state</a>.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Emit the comment token. Reconsume
-   the EOF character in the <a href=#data-state>data state</a>.</dd> <!-- see
-   comment in comment end state -->
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Emit the comment token. Reconsume the EOF
+   character.</dd> <!-- see comment in comment end state -->
 
    <dt>Anything else</dt>
    <dd>Append two U+002D HYPHEN-MINUS characters (-), a U+0021
@@ -86496,13 +86497,14 @@
    <dd>Switch to the <a href=#before-doctype-name-state>before DOCTYPE name state</a>.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Create a new DOCTYPE token. Set its
-   <i>force-quirks flag</i> to <i>on</i>. Emit the token. Reconsume
-   the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Create a new DOCTYPE token. Set its <i>force-quirks
+   flag</i> to <i>on</i>. Emit the token. Reconsume the EOF
+   character.</dd>
 
    <dt>Anything else</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the character in the
-   <a href=#before-doctype-name-state>before DOCTYPE name state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#before-doctype-name-state>before DOCTYPE
+   name state</a>. Reconsume the character.</dd>
 
   </dl><h5 id=before-doctype-name-state><span class=secno>13.2.4.53 </span><dfn>Before DOCTYPE name state</dfn></h5>
 
@@ -86532,9 +86534,10 @@
    state</a>. Emit the token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Create a new DOCTYPE token. Set its
-   <i>force-quirks flag</i> to <i>on</i>. Emit the token. Reconsume
-   the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Create a new DOCTYPE token. Set its <i>force-quirks
+   flag</i> to <i>on</i>. Emit the token. Reconsume the EOF
+   character.</dd>
 
    <dt>Anything else</dt>
    <dd>Create a new DOCTYPE token. Set the token's name to the
@@ -86566,9 +86569,9 @@
    character to the current DOCTYPE token's name.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <a href=#current-input-character>current input character</a> to the current
@@ -86590,9 +86593,9 @@
    token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>
@@ -86642,9 +86645,9 @@
    state</a>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
@@ -86678,9 +86681,9 @@
    state</a>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
@@ -86704,9 +86707,9 @@
    state</a>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <a href=#current-input-character>current input character</a> to the current
@@ -86729,9 +86732,9 @@
    state</a>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <a href=#current-input-character>current input character</a> to the current
@@ -86764,9 +86767,9 @@
    <a href=#doctype-system-identifier-(single-quoted)-state>DOCTYPE system identifier (single-quoted) state</a>.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
@@ -86799,9 +86802,9 @@
    (single-quoted) state</a>.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
@@ -86836,9 +86839,9 @@
    state</a>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
@@ -86872,9 +86875,9 @@
    state</a>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
@@ -86899,9 +86902,9 @@
    state</a>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <a href=#current-input-character>current input character</a> to the current
@@ -86925,9 +86928,9 @@
    state</a>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <a href=#current-input-character>current input character</a> to the current
@@ -86949,9 +86952,9 @@
    token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#bogus-doctype-state>bogus DOCTYPE
@@ -86967,14 +86970,16 @@
    token.</dd>
 
    <dt>EOF</dt>
-   <dd>Emit the DOCTYPE token. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd>Switch to the <a href=#data-state>data state</a>. Emit the DOCTYPE token.
+   Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Ignore the character.</dd>
 
   </dl><h5 id=cdata-section-state><span class=secno>13.2.4.68 </span><dfn>CDATA section state</dfn></h5>
 
+  <p>Switch to the <a href=#data-state>data state</a>.</p>
+
   <p>Consume every character up to the next occurrence of the three
   character sequence U+005D RIGHT SQUARE BRACKET U+005D RIGHT SQUARE
   BRACKET U+003E GREATER-THAN SIGN (<code title="">]]></code>), or the
@@ -86985,8 +86990,6 @@
   tree constructor), but with any U+0000 NULL characters replaced by
   U+FFFD REPLACEMENT CHARACTER characters-->.</p>
 
-  <p>Switch to the <a href=#data-state>data state</a>.</p>
-
   <p>If the end of the file was reached, reconsume the EOF
   character.</p>
 

Modified: index
===================================================================
--- index	2011-11-11 00:55:55 UTC (rev 6824)
+++ index	2011-11-11 19:45:09 UTC (rev 6825)
@@ -85036,12 +85036,12 @@
   machine to tokenize HTML. The state machine must start in the
   <a href=#data-state>data state</a>. Most states consume a single character,
   which may have various side-effects, and either switches the state
-  machine to a new state to <em>reconsume</em> the same character, or
-  switches it to a new state (to consume the next character), or
-  repeats the same state (to consume the next character). Some states
-  have more complicated behavior and can consume several characters
-  before switching to another state. In some cases, the tokenizer
-  state is also changed by the tree construction stage.</p>
+  machine to a new state to <i>reconsume</i> the same character, or
+  switches it to a new state to consume the next character, or stays
+  in the same state to consume the next character. Some states have
+  more complicated behavior and can consume several characters before
+  switching to another state. In some cases, the tokenizer state is
+  also changed by the tree construction stage.</p>
 
   <p>The exact behavior of certain states depends on the
   <a href=#insertion-mode>insertion mode</a> and the <a href=#stack-of-open-elements>stack of open
@@ -85125,6 +85125,8 @@
 
   </dl><h5 id=character-reference-in-data-state><span class=secno>13.2.4.2 </span><dfn>Character reference in data state</dfn></h5>
 
+  <p>Switch to the <a href=#data-state>data state</a>.</p>
+
   <p>Attempt to <a href=#consume-a-character-reference>consume a character reference</a>, with no
   <a href=#additional-allowed-character>additional allowed character</a>.</p>
 
@@ -85133,9 +85135,7 @@
 
   <p>Otherwise, emit the character tokens that were returned.</p>
 
-  <p>Finally, switch to the <a href=#data-state>data state</a>.</p>
 
-
   <h5 id=rcdata-state><span class=secno>13.2.4.3 </span><dfn>RCDATA state</dfn></h5>
 
   <p>Consume the <a href=#next-input-character>next input character</a>:</p>
@@ -85160,6 +85160,8 @@
 
   </dl><h5 id=character-reference-in-rcdata-state><span class=secno>13.2.4.4 </span><dfn>Character reference in RCDATA state</dfn></h5>
 
+  <p>Switch to the <a href=#rcdata-state>RCDATA state</a>.</p>
+
   <p>Attempt to <a href=#consume-a-character-reference>consume a character reference</a>, with no
   <a href=#additional-allowed-character>additional allowed character</a>.</p>
 
@@ -85168,9 +85170,7 @@
 
   <p>Otherwise, emit the character tokens that were returned.</p>
 
-  <p>Finally, switch to the <a href=#rcdata-state>RCDATA state</a>.</p>
 
-
   <h5 id=rawtext-state><span class=secno>13.2.4.5 </span><dfn>RAWTEXT state</dfn></h5>
 
   <p>Consume the <a href=#next-input-character>next input character</a>:</p>
@@ -85250,9 +85250,9 @@
    comment state</a>.</dd>
 
    <dt>Anything else</dt>
-   <dd><a href=#parse-error>Parse error</a>. Emit a U+003C LESS-THAN SIGN
-   character token and reconsume the <a href=#current-input-character>current input
-   character</a> in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Emit a U+003C LESS-THAN SIGN character token.
+   Reconsume the <a href=#current-input-character>current input character</a>.</dd>
 
   </dl><h5 id=end-tag-open-state><span class=secno>13.2.4.9 </span><dfn>End tag open state</dfn></h5>
 
@@ -85276,9 +85276,9 @@
    state</a>.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Emit a U+003C LESS-THAN SIGN
-   character token and a U+002F SOLIDUS character token. Reconsume
-   the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Emit a U+003C LESS-THAN SIGN character token and a
+   U+002F SOLIDUS character token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#bogus-comment-state>bogus
@@ -85312,8 +85312,8 @@
    character to the current tag token's tag name.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <a href=#current-input-character>current input character</a> to the current
@@ -85329,9 +85329,9 @@
    to the <a href=#rcdata-end-tag-open-state>RCDATA end tag open state</a>.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token and reconsume the
-   <a href=#current-input-character>current input character</a> in the <a href=#rcdata-state>RCDATA
-   state</a>.</dd>
+   <dd>Switch to the <a href=#rcdata-state>RCDATA state</a>. Emit a U+003C
+   LESS-THAN SIGN character token. Reconsume the <a href=#current-input-character>current
+   input character</a>.</dd>
 
   </dl><h5 id=rcdata-end-tag-open-state><span class=secno>13.2.4.12 </span><dfn>RCDATA end tag open state</dfn></h5>
   <!-- identical to the RAWTEXT (and Script data) end tag open state, except s/RAWTEXT/RCDATA/g -->
@@ -85356,9 +85356,9 @@
    emitted.)</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
-   character token, and reconsume the <a href=#current-input-character>current input
-   character</a> in the <a href=#rcdata-state>RCDATA state</a>.</dd>
+   <dd>Switch to the <a href=#rcdata-state>RCDATA state</a>. Emit a U+003C
+   LESS-THAN SIGN character token and a U+002F SOLIDUS character token.
+   Reconsume the <a href=#current-input-character>current input character</a>.</dd>
 
   </dl><h5 id=rcdata-end-tag-name-state><span class=secno>13.2.4.13 </span><dfn>RCDATA end tag name state</dfn></h5>
   <!-- identical to the RAWTEXT (and Script data) end tag name state, except s/RAWTEXT/RCDATA/g -->
@@ -85383,8 +85383,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (>)</dt>
    <dd>If the current end tag token is an <a href=#appropriate-end-tag-token>appropriate end tag
-   token</a>, then emit the current tag token and switch to the
-   <a href=#data-state>data state</a>. Otherwise, treat it as per the "anything
+   token</a>, then switch to the <a href=#data-state>data state</a> and emit
+   the current tag token. Otherwise, treat it as per the "anything
    else" entry below.</dd>
 
    <dt>U+0041 LATIN CAPITAL LETTER A through to U+005A LATIN CAPITAL LETTER Z</dt>
@@ -85399,11 +85399,11 @@
    character</a> to the <var><a href=#temporary-buffer>temporary buffer</a></var>.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
-   character token, a character token for each of the characters in
-   the <var><a href=#temporary-buffer>temporary buffer</a></var> (in the order they were added to
-   the buffer), and reconsume the <a href=#current-input-character>current input character</a>
-   in the <a href=#rcdata-state>RCDATA state</a>.</dd>
+   <dd>Switch to the <a href=#rcdata-state>RCDATA state</a>. Emit a U+003C
+   LESS-THAN SIGN character token, a U+002F SOLIDUS character token,
+   and a character token for each of the characters in the
+   <var><a href=#temporary-buffer>temporary buffer</a></var> (in the order they were added to the
+   buffer). Reconsume the <a href=#current-input-character>current input character</a>.</dd>
 
   </dl><h5 id=rawtext-less-than-sign-state><span class=secno>13.2.4.14 </span><dfn>RAWTEXT less-than sign state</dfn></h5>
   <!-- identical to the RCDATA less-than sign state, except s/RCDATA/RAWTEXT/g -->
@@ -85415,9 +85415,9 @@
    to the <a href=#rawtext-end-tag-open-state>RAWTEXT end tag open state</a>.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token and reconsume the
-   <a href=#current-input-character>current input character</a> in the <a href=#rawtext-state>RAWTEXT
-   state</a>.</dd>
+   <dd>Switch to the <a href=#rawtext-state>RAWTEXT state</a>. Emit a U+003C
+   LESS-THAN SIGN character token. Reconsume the <a href=#current-input-character>current
+   input character</a>.</dd>
 
   </dl><h5 id=rawtext-end-tag-open-state><span class=secno>13.2.4.15 </span><dfn>RAWTEXT end tag open state</dfn></h5>
   <!-- identical to the RCDATA (and Script data) end tag open state, except s/RCDATA/RAWTEXT/g -->
@@ -85442,9 +85442,9 @@
    emitted.)</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
-   character token, and reconsume the <a href=#current-input-character>current input
-   character</a> in the <a href=#rawtext-state>RAWTEXT state</a>.</dd>
+   <dd>Switch to the <a href=#rawtext-state>RAWTEXT state</a>. Emit a U+003C
+   LESS-THAN SIGN character token and a U+002F SOLIDUS character
+   token. Reconsume the <a href=#current-input-character>current input character</a>.</dd>
 
   </dl><h5 id=rawtext-end-tag-name-state><span class=secno>13.2.4.16 </span><dfn>RAWTEXT end tag name state</dfn></h5>
   <!-- identical to the RCDATA (and Script data) end tag name state, except s/RCDATA/RAWTEXT/g -->
@@ -85469,8 +85469,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (>)</dt>
    <dd>If the current end tag token is an <a href=#appropriate-end-tag-token>appropriate end tag
-   token</a>, then emit the current tag token and switch to the
-   <a href=#data-state>data state</a>. Otherwise, treat it as per the "anything
+   token</a>, then switch to the <a href=#data-state>data state</a> and emit
+   the current tag token. Otherwise, treat it as per the "anything
    else" entry below.</dd>
 
    <dt>U+0041 LATIN CAPITAL LETTER A through to U+005A LATIN CAPITAL LETTER Z</dt>
@@ -85485,11 +85485,11 @@
    character</a> to the <var><a href=#temporary-buffer>temporary buffer</a></var>.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
-   character token, a character token for each of the characters in
-   the <var><a href=#temporary-buffer>temporary buffer</a></var> (in the order they were added to
-   the buffer), and reconsume the <a href=#current-input-character>current input character</a>
-   in the <a href=#rawtext-state>RAWTEXT state</a>.</dd>
+   <dd>Switch to the <a href=#rawtext-state>RAWTEXT state</a>. Emit a U+003C
+   LESS-THAN SIGN character token, a U+002F SOLIDUS character token,
+   and a character token for each of the characters in the
+   <var><a href=#temporary-buffer>temporary buffer</a></var> (in the order they were added to the
+   buffer). Reconsume the <a href=#current-input-character>current input character</a>.</dd>
 
   </dl><h5 id=script-data-less-than-sign-state><span class=secno>13.2.4.17 </span><dfn>Script data less-than sign state</dfn></h5>
 
@@ -85505,9 +85505,9 @@
    MARK character token.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token and reconsume the
-   <a href=#current-input-character>current input character</a> in the <a href=#script-data-state>script data
-   state</a>.</dd>
+   <dd>Switch to the <a href=#script-data-state>script data state</a>. Emit a U+003C
+   LESS-THAN SIGN character token. Reconsume the <a href=#current-input-character>current
+   input character</a>.</dd>
 
   </dl><h5 id=script-data-end-tag-open-state><span class=secno>13.2.4.18 </span><dfn>Script data end tag open state</dfn></h5>
   <!-- identical to the RCDATA (and RAWTEXT) end tag open state, except s/RCDATA/Script data/g -->
@@ -85532,9 +85532,9 @@
    emitted.)</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
-   character token, and reconsume the <a href=#current-input-character>current input
-   character</a> in the <a href=#script-data-state>script data state</a>.</dd>
+   <dd>Switch to the <a href=#script-data-state>script data state</a>. Emit a U+003C
+   LESS-THAN SIGN character token and a U+002F SOLIDUS character token.
+   Reconsume the <a href=#current-input-character>current input character</a>.</dd>
 
   </dl><h5 id=script-data-end-tag-name-state><span class=secno>13.2.4.19 </span><dfn>Script data end tag name state</dfn></h5>
   <!-- identical to the RCDATA (and RAWTEXT) end tag name state, except s/RCDATA/Script data/g -->
@@ -85559,8 +85559,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (>)</dt>
    <dd>If the current end tag token is an <a href=#appropriate-end-tag-token>appropriate end tag
-   token</a>, then emit the current tag token and switch to the
-   <a href=#data-state>data state</a>. Otherwise, treat it as per the "anything
+   token</a>, then switch to the <a href=#data-state>data state</a> and emit
+   the current tag token. Otherwise, treat it as per the "anything
    else" entry below.</dd>
 
    <dt>U+0041 LATIN CAPITAL LETTER A through to U+005A LATIN CAPITAL LETTER Z</dt>
@@ -85575,11 +85575,11 @@
    character</a> to the <var><a href=#temporary-buffer>temporary buffer</a></var>.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
-   character token, a character token for each of the characters in
-   the <var><a href=#temporary-buffer>temporary buffer</a></var> (in the order they were added to
-   the buffer), and reconsume the <a href=#current-input-character>current input character</a>
-   in the <a href=#script-data-state>script data state</a>.</dd>
+   <dd>Switch to the <a href=#script-data-state>script data state</a>. Emit a U+003C
+   LESS-THAN SIGN character token, a U+002F SOLIDUS character token,
+   and a character token for each of the characters in the
+   <var><a href=#temporary-buffer>temporary buffer</a></var> (in the order they were added to the
+   buffer). Reconsume the <a href=#current-input-character>current input character</a>.</dd>
 
   </dl><h5 id=script-data-escape-start-state><span class=secno>13.2.4.20 </span><dfn>Script data escape start state</dfn></h5>
 
@@ -85590,8 +85590,8 @@
    state</a>. Emit a U+002D HYPHEN-MINUS character token.</dd>
 
    <dt>Anything else</dt>
-   <dd>Reconsume the <a href=#current-input-character>current input character</a> in the
-   <a href=#script-data-state>script data state</a>.</dd>
+   <dd>Switch to the <a href=#script-data-state>script data state</a>. Reconsume the
+   <a href=#current-input-character>current input character</a>.</dd>
 
   </dl><h5 id=script-data-escape-start-dash-state><span class=secno>13.2.4.21 </span><dfn>Script data escape start dash state</dfn></h5>
 
@@ -85602,8 +85602,8 @@
    state</a>. Emit a U+002D HYPHEN-MINUS character token.</dd>
 
    <dt>Anything else</dt>
-   <dd>Reconsume the <a href=#current-input-character>current input character</a> in the
-   <a href=#script-data-state>script data state</a>.</dd>
+   <dd>Switch to the <a href=#script-data-state>script data state</a>. Reconsume the
+   <a href=#current-input-character>current input character</a>.</dd>
 
   </dl><h5 id=script-data-escaped-state><span class=secno>13.2.4.22 </span><dfn>Script data escaped state</dfn></h5>
 
@@ -85622,8 +85622,8 @@
    character token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd>Switch to the <a href=#data-state>data state</a>. <a href=#parse-error>Parse
+   error</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Emit the <a href=#current-input-character>current input character</a> as a character
@@ -85647,8 +85647,8 @@
    token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Switch to the <a href=#script-data-escaped-state>script data escaped state</a>. Emit the
@@ -85675,8 +85675,8 @@
    token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Switch to the <a href=#script-data-escaped-state>script data escaped state</a>. Emit the
@@ -85706,9 +85706,9 @@
    <a href=#current-input-character>current input character</a> as a character token.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token and reconsume the
-   <a href=#current-input-character>current input character</a> in the <a href=#script-data-escaped-state>script data
-   escaped state</a>.</dd>
+   <dd>Switch to the <a href=#script-data-state>script data state</a>. Emit a U+003C
+   LESS-THAN SIGN character token. Reconsume the <a href=#current-input-character>current
+   input character</a>.</dd>
 
   </dl><h5 id=script-data-escaped-end-tag-open-state><span class=secno>13.2.4.26 </span><dfn>Script data escaped end tag open state</dfn></h5>
 
@@ -85732,9 +85732,10 @@
    filled in before it is emitted.)</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
-   character token, and reconsume the <a href=#current-input-character>current input
-   character</a> in the <a href=#script-data-escaped-state>script data escaped state</a>.</dd>
+   <dd>Switch to the <a href=#script-data-escaped-state>script data escaped state</a>. Emit a
+   U+003C LESS-THAN SIGN character token and a U+002F SOLIDUS
+   character token. Reconsume the <a href=#current-input-character>current input
+   character</a>.</dd>
 
   </dl><h5 id=script-data-escaped-end-tag-name-state><span class=secno>13.2.4.27 </span><dfn>Script data escaped end tag name state</dfn></h5>
 
@@ -85758,8 +85759,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (>)</dt>
    <dd>If the current end tag token is an <a href=#appropriate-end-tag-token>appropriate end tag
-   token</a>, then emit the current tag token and switch to the
-   <a href=#data-state>data state</a>. Otherwise, treat it as per the "anything
+   token</a>, then switch to the <a href=#data-state>data state</a> and emit
+   the current tag token. Otherwise, treat it as per the "anything
    else" entry below.</dd>
 
    <dt>U+0041 LATIN CAPITAL LETTER A through to U+005A LATIN CAPITAL LETTER Z</dt>
@@ -85774,11 +85775,11 @@
    character</a> to the <var><a href=#temporary-buffer>temporary buffer</a></var>.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
-   character token, a character token for each of the characters in
-   the <var><a href=#temporary-buffer>temporary buffer</a></var> (in the order they were added to
-   the buffer), and reconsume the <a href=#current-input-character>current input character</a>
-   in the <a href=#script-data-escaped-state>script data escaped state</a>.</dd>
+   <dd>Switch to the <a href=#script-data-escaped-state>script data escaped state</a>. Emit a
+   U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS character
+   token, and a character token for each of the characters in the
+   <var><a href=#temporary-buffer>temporary buffer</a></var> (in the order they were added to the
+   buffer). Reconsume the <a href=#current-input-character>current input character</a>.</dd>
 
   </dl><h5 id=script-data-double-escape-start-state><span class=secno>13.2.4.28 </span><dfn>Script data double escape start state</dfn></h5>
 
@@ -85808,8 +85809,8 @@
    character</a> as a character token.</dd>
 
    <dt>Anything else</dt>
-   <dd>Reconsume the <a href=#current-input-character>current input character</a> in the
-   <a href=#script-data-escaped-state>script data escaped state</a>.</dd>
+   <dd>Switch to the <a href=#script-data-escaped-state>script data escaped state</a>. Reconsume
+   the <a href=#current-input-character>current input character</a>.</dd>
 
   </dl><h5 id=script-data-double-escaped-state><span class=secno>13.2.4.29 </span><dfn>Script data double escaped state</dfn></h5>
 
@@ -85829,8 +85830,8 @@
    character token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Emit the <a href=#current-input-character>current input character</a> as a character
@@ -85855,8 +85856,8 @@
    character token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Switch to the <a href=#script-data-double-escaped-state>script data double escaped
@@ -85885,8 +85886,8 @@
    character token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Switch to the <a href=#script-data-double-escaped-state>script data double escaped
@@ -85903,8 +85904,8 @@
    U+002F SOLIDUS character token.</dd>
 
    <dt>Anything else</dt>
-   <dd>Reconsume the <a href=#current-input-character>current input character</a> in the
-   <a href=#script-data-double-escaped-state>script data double escaped state</a>.</dd>
+   <dd>Switch to the <a href=#script-data-double-escaped-state>script data double escaped state</a>.
+   Reconsume the <a href=#current-input-character>current input character</a>.</dd>
 
   </dl><h5 id=script-data-double-escape-end-state><span class=secno>13.2.4.33 </span><dfn>Script data double escape end state</dfn></h5>
 
@@ -85934,8 +85935,8 @@
    character</a> as a character token.</dd>
 
    <dt>Anything else</dt>
-   <dd>Reconsume the <a href=#current-input-character>current input character</a> in the
-   <a href=#script-data-double-escaped-state>script data double escaped state</a>.</dd>
+   <dd>Switch to the <a href=#script-data-double-escaped-state>script data double escaped state</a>.
+   Reconsume the <a href=#current-input-character>current input character</a>.</dd>
 
   </dl><h5 id=before-attribute-name-state><span class=secno>13.2.4.34 </span><dfn>Before attribute name state</dfn></h5>
 
@@ -85976,8 +85977,8 @@
    entry below.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Start a new attribute in the current tag token. Set that
@@ -86022,8 +86023,8 @@
    entry below.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <a href=#current-input-character>current input character</a> to the current
@@ -86079,8 +86080,8 @@
    entry below.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Start a new attribute in the current tag token. Set that
@@ -86103,8 +86104,8 @@
    <dd>Switch to the <a href=#attribute-value-(double-quoted)-state>attribute value (double-quoted) state</a>.</dd>
 
    <dt>U+0026 AMPERSAND (&)</dt>
-   <dd>Switch to the <a href=#attribute-value-(unquoted)-state>attribute value (unquoted) state</a>
-   and reconsume this <a href=#current-input-character>current input character</a>.</dd>
+   <dd>Switch to the <a href=#attribute-value-(unquoted)-state>attribute value (unquoted) state</a>.
+   Reconsume the <a href=#current-input-character>current input character</a>.</dd>
 
    <dt>U+0027 APOSTROPHE (')</dt>
    <dd>Switch to the <a href=#attribute-value-(single-quoted)-state>attribute value (single-quoted) state</a>.</dd>
@@ -86125,8 +86126,8 @@
    entry below.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <a href=#current-input-character>current input character</a> to the current
@@ -86151,8 +86152,8 @@
    character to the current attribute's value.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <a href=#current-input-character>current input character</a> to the current
@@ -86176,8 +86177,8 @@
    character to the current attribute's value.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <a href=#current-input-character>current input character</a> to the current
@@ -86216,8 +86217,8 @@
    entry below.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <a href=#current-input-character>current input character</a> to the current
@@ -86256,12 +86257,12 @@
    token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the character in
-   the <a href=#before-attribute-name-state>before attribute name state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#before-attribute-name-state>before attribute
+   name state</a>. Reconsume the character.</dd>
 
   </dl><h5 id=self-closing-start-tag-state><span class=secno>13.2.4.43 </span><dfn>Self-closing start tag state</dfn></h5>
 
@@ -86273,12 +86274,12 @@
    token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the character in
-   the <a href=#before-attribute-name-state>before attribute name state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#before-attribute-name-state>before attribute
+   name state</a>. Reconsume the character.</dd>
 
   </dl><h5 id=bogus-comment-state><span class=secno>13.2.4.44 </span><dfn>Bogus comment state</dfn></h5>
 
@@ -86341,8 +86342,8 @@
    comment end state -->
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Emit the comment token. Reconsume
-   the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Emit the comment token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <a href=#current-input-character>current input character</a> to the comment
@@ -86366,9 +86367,9 @@
    state</a>. Emit the comment token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Emit the comment token. Reconsume the
-   EOF character in the <a href=#data-state>data state</a>.</dd> <!-- see comment
-   in comment end state -->
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Emit the comment token. Reconsume the EOF
+   character.</dd> <!-- see comment in comment end state -->
 
    <dt>Anything else</dt>
    <dd>Append a U+002D HYPHEN-MINUS character (-) and the
@@ -86387,9 +86388,9 @@
    character to the comment token's data.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Emit the comment token. Reconsume the
-   EOF character in the <a href=#data-state>data state</a>.</dd> <!-- see comment
-   in comment end state -->
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Emit the comment token. Reconsume the EOF
+   character.</dd> <!-- see comment in comment end state -->
 
    <dt>Anything else</dt>
    <dd>Append the <a href=#current-input-character>current input character</a> to the comment
@@ -86409,9 +86410,9 @@
    state</a>.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Emit the comment token. Reconsume the
-   EOF character in the <a href=#data-state>data state</a>.</dd> <!-- see comment
-   in comment end state -->
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Emit the comment token. Reconsume the EOF
+   character.</dd> <!-- see comment in comment end state -->
 
    <dt>Anything else</dt>
    <dd>Append a U+002D HYPHEN-MINUS character (-) and the
@@ -86441,12 +86442,12 @@
    character (-) to the comment token's data.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Emit the comment token. Reconsume
-   the EOF character in the <a href=#data-state>data state</a>.</dd> <!-- For
-   security reasons: otherwise, hostile user could put a <script> in
-   a comment e.g. in a blog comment and then DOS the server so that
-   the end tag isn't read, and then the commented <script> tag would
-   be treated as live code -->
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Emit the comment token. Reconsume the EOF
+   character.</dd> <!-- For security reasons: otherwise, hostile user
+   could put a <script> in a comment e.g. in a blog comment and then
+   DOS the server so that the end tag isn't read, and then the
+   commented <script> tag would be treated as live code -->
 
    <dt>Anything else</dt>
    <dd><a href=#parse-error>Parse error</a>. Append two U+002D HYPHEN-MINUS
@@ -86474,9 +86475,9 @@
    Switch to the <a href=#comment-state>comment state</a>.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Emit the comment token. Reconsume
-   the EOF character in the <a href=#data-state>data state</a>.</dd> <!-- see
-   comment in comment end state -->
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Emit the comment token. Reconsume the EOF
+   character.</dd> <!-- see comment in comment end state -->
 
    <dt>Anything else</dt>
    <dd>Append two U+002D HYPHEN-MINUS characters (-), a U+0021
@@ -86496,13 +86497,14 @@
    <dd>Switch to the <a href=#before-doctype-name-state>before DOCTYPE name state</a>.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Create a new DOCTYPE token. Set its
-   <i>force-quirks flag</i> to <i>on</i>. Emit the token. Reconsume
-   the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Create a new DOCTYPE token. Set its <i>force-quirks
+   flag</i> to <i>on</i>. Emit the token. Reconsume the EOF
+   character.</dd>
 
    <dt>Anything else</dt>
-   <dd><a href=#parse-error>Parse error</a>. Reconsume the character in the
-   <a href=#before-doctype-name-state>before DOCTYPE name state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#before-doctype-name-state>before DOCTYPE
+   name state</a>. Reconsume the character.</dd>
 
   </dl><h5 id=before-doctype-name-state><span class=secno>13.2.4.53 </span><dfn>Before DOCTYPE name state</dfn></h5>
 
@@ -86532,9 +86534,10 @@
    state</a>. Emit the token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Create a new DOCTYPE token. Set its
-   <i>force-quirks flag</i> to <i>on</i>. Emit the token. Reconsume
-   the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Create a new DOCTYPE token. Set its <i>force-quirks
+   flag</i> to <i>on</i>. Emit the token. Reconsume the EOF
+   character.</dd>
 
    <dt>Anything else</dt>
    <dd>Create a new DOCTYPE token. Set the token's name to the
@@ -86566,9 +86569,9 @@
    character to the current DOCTYPE token's name.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <a href=#current-input-character>current input character</a> to the current
@@ -86590,9 +86593,9 @@
    token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>
@@ -86642,9 +86645,9 @@
    state</a>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
@@ -86678,9 +86681,9 @@
    state</a>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
@@ -86704,9 +86707,9 @@
    state</a>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <a href=#current-input-character>current input character</a> to the current
@@ -86729,9 +86732,9 @@
    state</a>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <a href=#current-input-character>current input character</a> to the current
@@ -86764,9 +86767,9 @@
    <a href=#doctype-system-identifier-(single-quoted)-state>DOCTYPE system identifier (single-quoted) state</a>.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
@@ -86799,9 +86802,9 @@
    (single-quoted) state</a>.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
@@ -86836,9 +86839,9 @@
    state</a>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
@@ -86872,9 +86875,9 @@
    state</a>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
@@ -86899,9 +86902,9 @@
    state</a>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <a href=#current-input-character>current input character</a> to the current
@@ -86925,9 +86928,9 @@
    state</a>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <a href=#current-input-character>current input character</a> to the current
@@ -86949,9 +86952,9 @@
    token.</dd>
 
    <dt>EOF</dt>
-   <dd><a href=#parse-error>Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <a href=#data-state>data state</a>.</dd>
+   <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#data-state>data
+   state</a>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd><a href=#parse-error>Parse error</a>. Switch to the <a href=#bogus-doctype-state>bogus DOCTYPE
@@ -86967,14 +86970,16 @@
    token.</dd>
 
    <dt>EOF</dt>
-   <dd>Emit the DOCTYPE token. Reconsume the EOF character in the
-   <a href=#data-state>data state</a>.</dd>
+   <dd>Switch to the <a href=#data-state>data state</a>. Emit the DOCTYPE token.
+   Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Ignore the character.</dd>
 
   </dl><h5 id=cdata-section-state><span class=secno>13.2.4.68 </span><dfn>CDATA section state</dfn></h5>
 
+  <p>Switch to the <a href=#data-state>data state</a>.</p>
+
   <p>Consume every character up to the next occurrence of the three
   character sequence U+005D RIGHT SQUARE BRACKET U+005D RIGHT SQUARE
   BRACKET U+003E GREATER-THAN SIGN (<code title="">]]></code>), or the
@@ -86985,8 +86990,6 @@
   tree constructor), but with any U+0000 NULL characters replaced by
   U+FFFD REPLACEMENT CHARACTER characters-->.</p>
 
-  <p>Switch to the <a href=#data-state>data state</a>.</p>
-
   <p>If the end of the file was reached, reconsume the EOF
   character.</p>
 

Modified: source
===================================================================
--- source	2011-11-11 00:55:55 UTC (rev 6824)
+++ source	2011-11-11 19:45:09 UTC (rev 6825)
@@ -96357,12 +96357,12 @@
   machine to tokenize HTML. The state machine must start in the
   <span>data state</span>. Most states consume a single character,
   which may have various side-effects, and either switches the state
-  machine to a new state to <em>reconsume</em> the same character, or
-  switches it to a new state (to consume the next character), or
-  repeats the same state (to consume the next character). Some states
-  have more complicated behavior and can consume several characters
-  before switching to another state. In some cases, the tokenizer
-  state is also changed by the tree construction stage.</p>
+  machine to a new state to <i>reconsume</i> the same character, or
+  switches it to a new state to consume the next character, or stays
+  in the same state to consume the next character. Some states have
+  more complicated behavior and can consume several characters before
+  switching to another state. In some cases, the tokenizer state is
+  also changed by the tree construction stage.</p>
 
   <p>The exact behavior of certain states depends on the
   <span>insertion mode</span> and the <span>stack of open
@@ -96451,6 +96451,8 @@
 
   <h5><dfn>Character reference in data state</dfn></h5>
 
+  <p>Switch to the <span>data state</span>.</p>
+
   <p>Attempt to <span>consume a character reference</span>, with no
   <span>additional allowed character</span>.</p>
 
@@ -96459,9 +96461,7 @@
 
   <p>Otherwise, emit the character tokens that were returned.</p>
 
-  <p>Finally, switch to the <span>data state</span>.</p>
 
-
   <h5><dfn>RCDATA state</dfn></h5>
 
   <p>Consume the <span>next input character</span>:</p>
@@ -96491,6 +96491,8 @@
 
   <h5><dfn>Character reference in RCDATA state</dfn></h5>
 
+  <p>Switch to the <span>RCDATA state</span>.</p>
+
   <p>Attempt to <span>consume a character reference</span>, with no
   <span>additional allowed character</span>.</p>
 
@@ -96499,9 +96501,7 @@
 
   <p>Otherwise, emit the character tokens that were returned.</p>
 
-  <p>Finally, switch to the <span>RCDATA state</span>.</p>
 
-
   <h5><dfn>RAWTEXT state</dfn></h5>
 
   <p>Consume the <span>next input character</span>:</p>
@@ -96598,13 +96598,12 @@
    comment state</span>.</dd>
 
    <dt>Anything else</dt>
-   <dd><span>Parse error</span>. Emit a U+003C LESS-THAN SIGN
-   character token and reconsume the <span>current input
-   character</span> in the <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Emit a U+003C LESS-THAN SIGN character token.
+   Reconsume the <span>current input character</span>.</dd>
 
   </dl>
 
-
   <h5><dfn>End tag open state</dfn></h5>
 
   <p>Consume the <span>next input character</span>:</p>
@@ -96629,9 +96628,9 @@
    state</span>.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Emit a U+003C LESS-THAN SIGN
-   character token and a U+002F SOLIDUS character token. Reconsume
-   the EOF character in the <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Emit a U+003C LESS-THAN SIGN character token and a
+   U+002F SOLIDUS character token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd><span>Parse error</span>. Switch to the <span>bogus
@@ -96670,8 +96669,8 @@
    character to the current tag token's tag name.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Reconsume the EOF character in the
-   <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <span>current input character</span> to the current
@@ -96692,9 +96691,9 @@
    to the <span>RCDATA end tag open state</span>.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token and reconsume the
-   <span>current input character</span> in the <span>RCDATA
-   state</span>.</dd>
+   <dd>Switch to the <span>RCDATA state</span>. Emit a U+003C
+   LESS-THAN SIGN character token. Reconsume the <span>current
+   input character</span>.</dd>
 
   </dl>
 
@@ -96724,9 +96723,9 @@
    emitted.)</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
-   character token, and reconsume the <span>current input
-   character</span> in the <span>RCDATA state</span>.</dd>
+   <dd>Switch to the <span>RCDATA state</span>. Emit a U+003C
+   LESS-THAN SIGN character token and a U+002F SOLIDUS character token.
+   Reconsume the <span>current input character</span>.</dd>
 
   </dl>
 
@@ -96756,8 +96755,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (>)</dt>
    <dd>If the current end tag token is an <span>appropriate end tag
-   token</span>, then emit the current tag token and switch to the
-   <span>data state</span>. Otherwise, treat it as per the "anything
+   token</span>, then switch to the <span>data state</span> and emit
+   the current tag token. Otherwise, treat it as per the "anything
    else" entry below.</dd>
 
    <dt>U+0041 LATIN CAPITAL LETTER A through to U+005A LATIN CAPITAL LETTER Z</dt>
@@ -96772,11 +96771,11 @@
    character</span> to the <var>temporary buffer</var>.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
-   character token, a character token for each of the characters in
-   the <var>temporary buffer</var> (in the order they were added to
-   the buffer), and reconsume the <span>current input character</span>
-   in the <span>RCDATA state</span>.</dd>
+   <dd>Switch to the <span>RCDATA state</span>. Emit a U+003C
+   LESS-THAN SIGN character token, a U+002F SOLIDUS character token,
+   and a character token for each of the characters in the
+   <var>temporary buffer</var> (in the order they were added to the
+   buffer). Reconsume the <span>current input character</span>.</dd>
 
   </dl>
 
@@ -96793,9 +96792,9 @@
    to the <span>RAWTEXT end tag open state</span>.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token and reconsume the
-   <span>current input character</span> in the <span>RAWTEXT
-   state</span>.</dd>
+   <dd>Switch to the <span>RAWTEXT state</span>. Emit a U+003C
+   LESS-THAN SIGN character token. Reconsume the <span>current
+   input character</span>.</dd>
 
   </dl>
 
@@ -96825,9 +96824,9 @@
    emitted.)</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
-   character token, and reconsume the <span>current input
-   character</span> in the <span>RAWTEXT state</span>.</dd>
+   <dd>Switch to the <span>RAWTEXT state</span>. Emit a U+003C
+   LESS-THAN SIGN character token and a U+002F SOLIDUS character
+   token. Reconsume the <span>current input character</span>.</dd>
 
   </dl>
 
@@ -96857,8 +96856,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (>)</dt>
    <dd>If the current end tag token is an <span>appropriate end tag
-   token</span>, then emit the current tag token and switch to the
-   <span>data state</span>. Otherwise, treat it as per the "anything
+   token</span>, then switch to the <span>data state</span> and emit
+   the current tag token. Otherwise, treat it as per the "anything
    else" entry below.</dd>
 
    <dt>U+0041 LATIN CAPITAL LETTER A through to U+005A LATIN CAPITAL LETTER Z</dt>
@@ -96873,11 +96872,11 @@
    character</span> to the <var>temporary buffer</var>.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
-   character token, a character token for each of the characters in
-   the <var>temporary buffer</var> (in the order they were added to
-   the buffer), and reconsume the <span>current input character</span>
-   in the <span>RAWTEXT state</span>.</dd>
+   <dd>Switch to the <span>RAWTEXT state</span>. Emit a U+003C
+   LESS-THAN SIGN character token, a U+002F SOLIDUS character token,
+   and a character token for each of the characters in the
+   <var>temporary buffer</var> (in the order they were added to the
+   buffer). Reconsume the <span>current input character</span>.</dd>
 
   </dl>
 
@@ -96898,9 +96897,9 @@
    MARK character token.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token and reconsume the
-   <span>current input character</span> in the <span>script data
-   state</span>.</dd>
+   <dd>Switch to the <span>script data state</span>. Emit a U+003C
+   LESS-THAN SIGN character token. Reconsume the <span>current
+   input character</span>.</dd>
 
   </dl>
 
@@ -96930,9 +96929,9 @@
    emitted.)</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
-   character token, and reconsume the <span>current input
-   character</span> in the <span>script data state</span>.</dd>
+   <dd>Switch to the <span>script data state</span>. Emit a U+003C
+   LESS-THAN SIGN character token and a U+002F SOLIDUS character token.
+   Reconsume the <span>current input character</span>.</dd>
 
   </dl>
 
@@ -96962,8 +96961,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (>)</dt>
    <dd>If the current end tag token is an <span>appropriate end tag
-   token</span>, then emit the current tag token and switch to the
-   <span>data state</span>. Otherwise, treat it as per the "anything
+   token</span>, then switch to the <span>data state</span> and emit
+   the current tag token. Otherwise, treat it as per the "anything
    else" entry below.</dd>
 
    <dt>U+0041 LATIN CAPITAL LETTER A through to U+005A LATIN CAPITAL LETTER Z</dt>
@@ -96978,11 +96977,11 @@
    character</span> to the <var>temporary buffer</var>.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
-   character token, a character token for each of the characters in
-   the <var>temporary buffer</var> (in the order they were added to
-   the buffer), and reconsume the <span>current input character</span>
-   in the <span>script data state</span>.</dd>
+   <dd>Switch to the <span>script data state</span>. Emit a U+003C
+   LESS-THAN SIGN character token, a U+002F SOLIDUS character token,
+   and a character token for each of the characters in the
+   <var>temporary buffer</var> (in the order they were added to the
+   buffer). Reconsume the <span>current input character</span>.</dd>
 
   </dl>
 
@@ -96998,8 +96997,8 @@
    state</span>. Emit a U+002D HYPHEN-MINUS character token.</dd>
 
    <dt>Anything else</dt>
-   <dd>Reconsume the <span>current input character</span> in the
-   <span>script data state</span>.</dd>
+   <dd>Switch to the <span>script data state</span>. Reconsume the
+   <span>current input character</span>.</dd>
 
   </dl>
 
@@ -97015,8 +97014,8 @@
    state</span>. Emit a U+002D HYPHEN-MINUS character token.</dd>
 
    <dt>Anything else</dt>
-   <dd>Reconsume the <span>current input character</span> in the
-   <span>script data state</span>.</dd>
+   <dd>Switch to the <span>script data state</span>. Reconsume the
+   <span>current input character</span>.</dd>
 
   </dl>
 
@@ -97040,8 +97039,8 @@
    character token.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Reconsume the EOF character in the
-   <span>data state</span>.</dd>
+   <dd>Switch to the <span>data state</span>. <span>Parse
+   error</span>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Emit the <span>current input character</span> as a character
@@ -97070,8 +97069,8 @@
    token.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Reconsume the EOF character in the
-   <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Switch to the <span>script data escaped state</span>. Emit the
@@ -97103,8 +97102,8 @@
    token.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Reconsume the EOF character in the
-   <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Switch to the <span>script data escaped state</span>. Emit the
@@ -97139,9 +97138,9 @@
    <span>current input character</span> as a character token.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token and reconsume the
-   <span>current input character</span> in the <span>script data
-   escaped state</span>.</dd>
+   <dd>Switch to the <span>script data state</span>. Emit a U+003C
+   LESS-THAN SIGN character token. Reconsume the <span>current
+   input character</span>.</dd>
 
   </dl>
 
@@ -97170,9 +97169,10 @@
    filled in before it is emitted.)</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
-   character token, and reconsume the <span>current input
-   character</span> in the <span>script data escaped state</span>.</dd>
+   <dd>Switch to the <span>script data escaped state</span>. Emit a
+   U+003C LESS-THAN SIGN character token and a U+002F SOLIDUS
+   character token. Reconsume the <span>current input
+   character</span>.</dd>
 
   </dl>
 
@@ -97201,8 +97201,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (>)</dt>
    <dd>If the current end tag token is an <span>appropriate end tag
-   token</span>, then emit the current tag token and switch to the
-   <span>data state</span>. Otherwise, treat it as per the "anything
+   token</span>, then switch to the <span>data state</span> and emit
+   the current tag token. Otherwise, treat it as per the "anything
    else" entry below.</dd>
 
    <dt>U+0041 LATIN CAPITAL LETTER A through to U+005A LATIN CAPITAL LETTER Z</dt>
@@ -97217,11 +97217,11 @@
    character</span> to the <var>temporary buffer</var>.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
-   character token, a character token for each of the characters in
-   the <var>temporary buffer</var> (in the order they were added to
-   the buffer), and reconsume the <span>current input character</span>
-   in the <span>script data escaped state</span>.</dd>
+   <dd>Switch to the <span>script data escaped state</span>. Emit a
+   U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS character
+   token, and a character token for each of the characters in the
+   <var>temporary buffer</var> (in the order they were added to the
+   buffer). Reconsume the <span>current input character</span>.</dd>
 
   </dl>
 
@@ -97257,8 +97257,8 @@
    character</span> as a character token.</dd>
 
    <dt>Anything else</dt>
-   <dd>Reconsume the <span>current input character</span> in the
-   <span>script data escaped state</span>.</dd>
+   <dd>Switch to the <span>script data escaped state</span>. Reconsume
+   the <span>current input character</span>.</dd>
 
   </dl>
 
@@ -97283,8 +97283,8 @@
    character token.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Reconsume the EOF character in the
-   <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Emit the <span>current input character</span> as a character
@@ -97314,8 +97314,8 @@
    character token.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Reconsume the EOF character in the
-   <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Switch to the <span>script data double escaped
@@ -97349,8 +97349,8 @@
    character token.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Reconsume the EOF character in the
-   <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Switch to the <span>script data double escaped
@@ -97372,8 +97372,8 @@
    U+002F SOLIDUS character token.</dd>
 
    <dt>Anything else</dt>
-   <dd>Reconsume the <span>current input character</span> in the
-   <span>script data double escaped state</span>.</dd>
+   <dd>Switch to the <span>script data double escaped state</span>.
+   Reconsume the <span>current input character</span>.</dd>
 
   </dl>
 
@@ -97409,8 +97409,8 @@
    character</span> as a character token.</dd>
 
    <dt>Anything else</dt>
-   <dd>Reconsume the <span>current input character</span> in the
-   <span>script data double escaped state</span>.</dd>
+   <dd>Switch to the <span>script data double escaped state</span>.
+   Reconsume the <span>current input character</span>.</dd>
 
   </dl>
 
@@ -97456,8 +97456,8 @@
    entry below.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Reconsume the EOF character in the
-   <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Start a new attribute in the current tag token. Set that
@@ -97507,8 +97507,8 @@
    entry below.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Reconsume the EOF character in the
-   <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <span>current input character</span> to the current
@@ -97568,8 +97568,8 @@
    entry below.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Reconsume the EOF character in the
-   <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Start a new attribute in the current tag token. Set that
@@ -97597,8 +97597,8 @@
    <dd>Switch to the <span>attribute value (double-quoted) state</span>.</dd>
 
    <dt>U+0026 AMPERSAND (&)</dt>
-   <dd>Switch to the <span>attribute value (unquoted) state</span>
-   and reconsume this <span>current input character</span>.</dd>
+   <dd>Switch to the <span>attribute value (unquoted) state</span>.
+   Reconsume the <span>current input character</span>.</dd>
 
    <dt>U+0027 APOSTROPHE (')</dt>
    <dd>Switch to the <span>attribute value (single-quoted) state</span>.</dd>
@@ -97619,8 +97619,8 @@
    entry below.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Reconsume the EOF character in the
-   <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <span>current input character</span> to the current
@@ -97650,8 +97650,8 @@
    character to the current attribute's value.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Reconsume the EOF character in the
-   <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <span>current input character</span> to the current
@@ -97680,8 +97680,8 @@
    character to the current attribute's value.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Reconsume the EOF character in the
-   <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <span>current input character</span> to the current
@@ -97725,8 +97725,8 @@
    entry below.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Reconsume the EOF character in the
-   <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <span>current input character</span> to the current
@@ -97770,12 +97770,12 @@
    token.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Reconsume the EOF character in the
-   <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
-   <dd><span>Parse error</span>. Reconsume the character in
-   the <span>before attribute name state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>before attribute
+   name state</span>. Reconsume the character.</dd>
 
   </dl>
 
@@ -97792,12 +97792,12 @@
    token.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Reconsume the EOF character in the
-   <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
-   <dd><span>Parse error</span>. Reconsume the character in
-   the <span>before attribute name state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>before attribute
+   name state</span>. Reconsume the character.</dd>
 
   </dl>
 
@@ -97865,8 +97865,8 @@
    comment end state -->
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Emit the comment token. Reconsume
-   the EOF character in the <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Emit the comment token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <span>current input character</span> to the comment
@@ -97895,9 +97895,9 @@
    state</span>. Emit the comment token.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Emit the comment token. Reconsume the
-   EOF character in the <span>data state</span>.</dd> <!-- see comment
-   in comment end state -->
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Emit the comment token. Reconsume the EOF
+   character.</dd> <!-- see comment in comment end state -->
 
    <dt>Anything else</dt>
    <dd>Append a U+002D HYPHEN-MINUS character (-) and the
@@ -97921,9 +97921,9 @@
    character to the comment token's data.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Emit the comment token. Reconsume the
-   EOF character in the <span>data state</span>.</dd> <!-- see comment
-   in comment end state -->
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Emit the comment token. Reconsume the EOF
+   character.</dd> <!-- see comment in comment end state -->
 
    <dt>Anything else</dt>
    <dd>Append the <span>current input character</span> to the comment
@@ -97948,9 +97948,9 @@
    state</span>.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Emit the comment token. Reconsume the
-   EOF character in the <span>data state</span>.</dd> <!-- see comment
-   in comment end state -->
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Emit the comment token. Reconsume the EOF
+   character.</dd> <!-- see comment in comment end state -->
 
    <dt>Anything else</dt>
    <dd>Append a U+002D HYPHEN-MINUS character (-) and the
@@ -97985,12 +97985,12 @@
    character (-) to the comment token's data.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Emit the comment token. Reconsume
-   the EOF character in the <span>data state</span>.</dd> <!-- For
-   security reasons: otherwise, hostile user could put a <script> in
-   a comment e.g. in a blog comment and then DOS the server so that
-   the end tag isn't read, and then the commented <script> tag would
-   be treated as live code -->
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Emit the comment token. Reconsume the EOF
+   character.</dd> <!-- For security reasons: otherwise, hostile user
+   could put a <script> in a comment e.g. in a blog comment and then
+   DOS the server so that the end tag isn't read, and then the
+   commented <script> tag would be treated as live code -->
 
    <dt>Anything else</dt>
    <dd><span>Parse error</span>. Append two U+002D HYPHEN-MINUS
@@ -98023,9 +98023,9 @@
    Switch to the <span>comment state</span>.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Emit the comment token. Reconsume
-   the EOF character in the <span>data state</span>.</dd> <!-- see
-   comment in comment end state -->
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Emit the comment token. Reconsume the EOF
+   character.</dd> <!-- see comment in comment end state -->
 
    <dt>Anything else</dt>
    <dd>Append two U+002D HYPHEN-MINUS characters (-), a U+0021
@@ -98050,13 +98050,14 @@
    <dd>Switch to the <span>before DOCTYPE name state</span>.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Create a new DOCTYPE token. Set its
-   <i>force-quirks flag</i> to <i>on</i>. Emit the token. Reconsume
-   the EOF character in the <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Create a new DOCTYPE token. Set its <i>force-quirks
+   flag</i> to <i>on</i>. Emit the token. Reconsume the EOF
+   character.</dd>
 
    <dt>Anything else</dt>
-   <dd><span>Parse error</span>. Reconsume the character in the
-   <span>before DOCTYPE name state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>before DOCTYPE
+   name state</span>. Reconsume the character.</dd>
 
   </dl>
 
@@ -98091,9 +98092,10 @@
    state</span>. Emit the token.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Create a new DOCTYPE token. Set its
-   <i>force-quirks flag</i> to <i>on</i>. Emit the token. Reconsume
-   the EOF character in the <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Create a new DOCTYPE token. Set its <i>force-quirks
+   flag</i> to <i>on</i>. Emit the token. Reconsume the EOF
+   character.</dd>
 
    <dt>Anything else</dt>
    <dd>Create a new DOCTYPE token. Set the token's name to the
@@ -98130,9 +98132,9 @@
    character to the current DOCTYPE token's name.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <span>current input character</span> to the current
@@ -98159,9 +98161,9 @@
    token.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>
@@ -98216,9 +98218,9 @@
    state</span>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd><span>Parse error</span>. Set the DOCTYPE token's
@@ -98257,9 +98259,9 @@
    state</span>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd><span>Parse error</span>. Set the DOCTYPE token's
@@ -98288,9 +98290,9 @@
    state</span>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <span>current input character</span> to the current
@@ -98318,9 +98320,9 @@
    state</span>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <span>current input character</span> to the current
@@ -98358,9 +98360,9 @@
    <span>DOCTYPE system identifier (single-quoted) state</span>.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd><span>Parse error</span>. Set the DOCTYPE token's
@@ -98398,9 +98400,9 @@
    (single-quoted) state</span>.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd><span>Parse error</span>. Set the DOCTYPE token's
@@ -98440,9 +98442,9 @@
    state</span>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd><span>Parse error</span>. Set the DOCTYPE token's
@@ -98481,9 +98483,9 @@
    state</span>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd><span>Parse error</span>. Set the DOCTYPE token's
@@ -98513,9 +98515,9 @@
    state</span>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <span>current input character</span> to the current
@@ -98544,9 +98546,9 @@
    state</span>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Append the <span>current input character</span> to the current
@@ -98573,9 +98575,9 @@
    token.</dd>
 
    <dt>EOF</dt>
-   <dd><span>Parse error</span>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE token.
-   Reconsume the EOF character in the <span>data state</span>.</dd>
+   <dd><span>Parse error</span>. Switch to the <span>data
+   state</span>. Set the DOCTYPE token's <i>force-quirks flag</i> to
+   <i>on</i>. Emit that DOCTYPE token. Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd><span>Parse error</span>. Switch to the <span>bogus DOCTYPE
@@ -98596,8 +98598,8 @@
    token.</dd>
 
    <dt>EOF</dt>
-   <dd>Emit the DOCTYPE token. Reconsume the EOF character in the
-   <span>data state</span>.</dd>
+   <dd>Switch to the <span>data state</span>. Emit the DOCTYPE token.
+   Reconsume the EOF character.</dd>
 
    <dt>Anything else</dt>
    <dd>Ignore the character.</dd>
@@ -98607,6 +98609,8 @@
 
   <h5><dfn>CDATA section state</dfn></h5>
 
+  <p>Switch to the <span>data state</span>.</p>
+
   <p>Consume every character up to the next occurrence of the three
   character sequence U+005D RIGHT SQUARE BRACKET U+005D RIGHT SQUARE
   BRACKET U+003E GREATER-THAN SIGN (<code title="">]]></code>), or the
@@ -98617,8 +98621,6 @@
   tree constructor), but with any U+0000 NULL characters replaced by
   U+FFFD REPLACEMENT CHARACTER characters-->.</p>
 
-  <p>Switch to the <span>data state</span>.</p>
-
   <p>If the end of the file was reached, reconsume the EOF
   character.</p>
 




More information about the Commit-Watchers mailing list