- From: poot <cvsmail@w3.org>
- Date: Mon, 14 Jul 2008 18:58:34 +0900 (JST)
- To: public-html-diffs@w3.org
Fix spelling of tokenisation to be american. Sigh. (Re: 8.2.1:
tokenisation) (credit: db) (whatwg r1864) (changed by: Ian Hickson)
Diffs for this change per section:
next input character
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1053.html#next-input
consume a character reference
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1053.html#consume
8.2.4.1. Tokenizing character references
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1053.html#tokenizing
8.2.1 Overview of the parsing model
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1053.html#overview
CDATA block state
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1053.html#cdata1
script-created parser
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1053.html#script-created
Tokenization
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1053.html#tokenization0
escape flag
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1053.html#escape
alt
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1053.html#alt
8.2.2 The input stream
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1053.html#the-input0
scripting flag
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1053.html#scripting2
A start tag whose tag name is "script"
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1053.html#scriptTag
Tree construction
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1053.html#tree-construction0
5.9.4 Page load processing model for text files
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1053.html#read-text
generic RCDATA parsing algorithm
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1053.html#generic0
fragment case
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1053.html#fragment
8.2.2.3. Preprocessing the input stream
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1053.html#preprocessing
Acknowledgements
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1053.html#acknowledgements
At this stage, if there is a pending external script, then:
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1053.html#scriptTagParserResumes
consumed
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1053.html#consumed
A start tag whose tag name is "isindex"
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1053.html#isindex
8.2.4 Tokenization
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1053.html#tokenization
Current content per affected section:
http://dev.w3.org/html5/spec/Overview.html#next-input
http://dev.w3.org/html5/spec/Overview.html#consume
http://dev.w3.org/html5/spec/Overview.html#tokenizing
http://dev.w3.org/html5/spec/Overview.html#overview
http://dev.w3.org/html5/spec/Overview.html#cdata1
http://dev.w3.org/html5/spec/Overview.html#tokenising
http://dev.w3.org/html5/spec/Overview.html#script-created
http://dev.w3.org/html5/spec/Overview.html#tokenization0
http://dev.w3.org/html5/spec/Overview.html#escape
http://dev.w3.org/html5/spec/Overview.html#alt
http://dev.w3.org/html5/spec/Overview.html#the-input0
http://dev.w3.org/html5/spec/Overview.html#scripting2
http://dev.w3.org/html5/spec/Overview.html#scriptTag
http://dev.w3.org/html5/spec/Overview.html#tree-construction0
http://dev.w3.org/html5/spec/Overview.html#read-text
http://dev.w3.org/html5/spec/Overview.html#generic0
http://dev.w3.org/html5/spec/Overview.html#tokenisation
http://dev.w3.org/html5/spec/Overview.html#fragment
http://dev.w3.org/html5/spec/Overview.html#preprocessing
http://dev.w3.org/html5/spec/Overview.html#acknowledgements
http://dev.w3.org/html5/spec/Overview.html#tokenisation0
http://dev.w3.org/html5/spec/Overview.html#scriptTagParserResumes
http://dev.w3.org/html5/spec/Overview.html#consumed
http://dev.w3.org/html5/spec/Overview.html#isindex
http://dev.w3.org/html5/spec/Overview.html#tokenization
Previously published WD content per affected section:
http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#next-input
http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#consume
http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#tokenizing
http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#overview
http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#cdata1
http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#tokenising
http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#script-created
http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#tokenization0
http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#escape
http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#alt
http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#the-input0
http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#scripting2
http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#scriptTag
http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#tree-construction0
http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#read-text
http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#generic0
http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#tokenisation
http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#fragment
http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#preprocessing
http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#acknowledgements
http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#tokenisation0
http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#scriptTagParserResumes
http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#consumed
http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#isindex
http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#tokenization
Cumulative diff: http://people.w3.org/mike/diffs/html5/spec/Overview.diff.html
http://dev.w3.org/cvsweb/html5/spec/Overview.html?r1=1.1052&r2=1.1053&f=h
http://html5.org/tools/web-apps-tracker?from=1863&to=1864
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.1052
retrieving revision 1.1053
diff -u -d -r1.1052 -r1.1053
--- Overview.html 11 Jul 2008 09:41:15 -0000 1.1052
+++ Overview.html 11 Jul 2008 19:33:24 -0000 1.1053
@@ -1765,11 +1765,11 @@
scripting state</a>
</ul>
- <li><a href="#tokenisation"><span class=secno>8.2.4
- </span>Tokenisation</a>
+ <li><a href="#tokenization"><span class=secno>8.2.4
+ </span>Tokenization</a>
<ul class=toc>
- <li><a href="#tokenising"><span class=secno>8.2.4.1.
- </span>Tokenising character references</a>
+ <li><a href="#tokenizing"><span class=secno>8.2.4.1.
+ </span>Tokenizing character references</a>
</ul>
<li><a href="#tree-construction"><span class=secno>8.2.5 </span>Tree
@@ -8345,7 +8345,7 @@
-->, then act as if the
tokeniser had emitted a start tag token with the tag name "pre", then
set the <a href="#html-0">HTML parser</a>'s <a
- href="#tokenisation0">tokenisation</a> stage's <a
+ href="#tokenization0">tokenization</a> stage's <a
href="#content3">content model flag</a> to <em>PLAINTEXT</em>.
<li>
@@ -15176,7 +15176,7 @@
with text in the <code title=attr-img-alt><a href="#alt">alt</a></code>
attribute rephrasing the flowchart in prose form:</p>
- <pre><p>In the common case, the data handled by the tokenisation stage
+ <pre><p>In the common case, the data handled by the tokenization stage
comes from the network, but it can also come from script.</p>
<p><strong><img src="images/parsing-model-overview.png" alt="The network
passes data to the Tokeniser stage, which passes data to the Tree
@@ -34871,7 +34871,7 @@
title="HTML documents">HTML document</a>, create an <a href="#html-0">HTML
parser</a>, associate it with the document, act as if the tokeniser had
emitted a start tag token with the tag name "pre", set the <a
- href="#tokenisation0">tokenisation</a> stage's <a href="#content3">content
+ href="#tokenization0">tokenization</a> stage's <a href="#content3">content
model flag</a> to <i>PLAINTEXT</i>, and begin to pass the stream of
characters in the plain text document to that tokeniser.
@@ -43210,7 +43210,7 @@
<p>The input to the HTML parsing process consists of a stream of Unicode
characters, which is passed through a <a
- href="#tokenisation0">tokenisation</a> stage (lexical analysis) followed
+ href="#tokenization0">tokenization</a> stage (lexical analysis) followed
by a <a href="#tree-construction0">tree construction</a> stage (semantic
analysis). The output is a <code>Document</code> object.
@@ -43219,7 +43219,7 @@
object, but the DOM tree in such cases is still used as the model for the
rest of the specification.
- <p>In the common case, the data handled by the tokenisation stage comes
+ <p>In the common case, the data handled by the tokenization stage comes
from the network, but <a href="#dynamic3" title="dynamic markup
insertion">it can also come from script</a>, e.g. using the <code
title=dom-document-write-HTML><a
@@ -43249,7 +43249,7 @@
stream</dfn></h4>
<p>The stream of Unicode characters that consists the input to the
- tokenisation stage will be initially seen by the user agent as a stream of
+ tokenization stage will be initially seen by the user agent as a stream of
bytes (typically coming over the network or from the local file system).
The bytes encode the actual characters according to a particular
<em>character encoding</em>, which the user agent must use to decode the
@@ -43883,7 +43883,7 @@
LF characters must be removed, and any CR characters not followed by LF
characters must be converted to LF characters. Thus, newlines in HTML DOMs
are represented by LF characters, and there are never any CR characters in
- the input to the <a href="#tokenisation0">tokenisation</a> stage.
+ the input to the <a href="#tokenization0">tokenization</a> stage.
<p>The <dfn id=next-input>next input character</dfn> is the first character
in the input stream that has not yet been <dfn id=consumed>consumed</dfn>.
@@ -44448,8 +44448,8 @@
href="#with-script">with script</a> when the parser was created, and
"disabled" otherwise.
- <h4 id=tokenisation><span class=secno>8.2.4 </span><dfn
- id=tokenisation0>Tokenisation</dfn></h4>
+ <h4 id=tokenization><span class=secno>8.2.4 </span><dfn
+ id=tokenization0>Tokenization</dfn></h4>
<p>Implementations must act as if they used the following state machine to
tokenise HTML. The state machine must start in the <a
@@ -44469,9 +44469,9 @@
used to control the behavior of the tokeniser. It is either true or false,
and initially must be set to the false state. The <span>insertion
mode</span> and the <a href="#stack">stack of open elements</a> also
- affects tokenisation.
+ affects tokenization.
- <p>The output of the tokenisation step is a series of zero or more of the
+ <p>The output of the tokenization step is a series of zero or more of the
following tokens: DOCTYPE, start tag, end tag, comment, character,
end-of-file. DOCTYPE tokens have a name, a public identifier, a system
identifier, and a <i>force-quirks flag</i>. When a DOCTYPE token is
@@ -45878,7 +45878,7 @@
<p>If the end of the file was reached, reconsume the EOF character.</p>
</dl>
- <h5 id=tokenising><span class=secno>8.2.4.1. </span>Tokenising character
+ <h5 id=tokenizing><span class=secno>8.2.4.1. </span>Tokenizing character
references</h5>
<p>This section defines how to <dfn id=consume>consume a character
@@ -46267,7 +46267,7 @@
id=tree-construction0>Tree construction</dfn></h4>
<p>The input to the tree construction stage is a sequence of tokens from
- the <a href="#tokenisation0">tokenisation</a> stage. The tree construction
+ the <a href="#tokenization0">tokenization</a> stage. The tree construction
stage is associated with a DOM <code>Document</code> object when a parser
is created. The "output" of this stage consists of dynamically modifying
or extending that document's DOM tree.
@@ -46588,7 +46588,7 @@
<li>
<p>Then, collect all the character tokens that the tokeniser returns
until it returns a token that is not a character token, or until it
- stops tokenising.
+ stops tokenizing.
<li>
<p>If this process resulted in a collection of character tokens, append a
@@ -47231,7 +47231,7 @@
<p>Then, collect all the character tokens that the tokeniser returns
until it returns a token that is not a character token, or until it
- stops tokenising.</p>
+ stops tokenizing.</p>
<p>If this process resulted in a collection of character tokens, append a
single <code>Text</code> node to the <code><a
@@ -47290,7 +47290,7 @@
<dd>
<p>Abort the processing of any nested invocations of the tokeniser,
- yielding control back to the caller. (Tokenisation will resume when
+ yielding control back to the caller. (Tokenization will resume when
the caller returns to the "outer" tree construction stage.)
<dt>Otherwise:
@@ -48448,7 +48448,7 @@
<p>Then, collect all the character tokens that the tokeniser returns
until it returns a token that is not a character token, or until it
- stops tokenising.</p>
+ stops tokenizing.</p>
<p>If this process resulted in a collection of character tokens, append a
single <code>Text</code> node, whose contents is the concatenation of
@@ -50275,7 +50275,7 @@
<li>
<p>Set the <a href="#html-0">HTML parser</a>'s <a
- href="#tokenisation0">tokenisation</a> stage's <a
+ href="#tokenization0">tokenization</a> stage's <a
href="#content3">content model flag</a> according to the <var
title="">context</var> element, as follows:</p>
@@ -52915,38 +52915,37 @@
Carlos Perelló Marín, Chao Cai, 윤석찬
(Channy Yun), Charl van Niekerk, Charles Iliya Krempeaux, Charles
McCathieNevile, Christian Biesinger, Christian Johansen, Chriswa, Cole
- Robison, Collin Jackson, Daniel Brumbaugh Keeney, Daniel Glazman, Daniel
- Peng, Daniel Spång, Daniel Steinberg, Danny Sullivan, Darin Adler,
- Darin Fisher, Dave Camp, Dave Singer, Dave Townsend<!--
- Mossop on moz irc -->,
- David Baron, David Bloom, David Carlisle, David Flanagan, David
- Håsäther, David Hyatt, Dean Edridge, Debi Orton, Derek
- Featherstone, DeWitt Clinton, Dimitri Glazkov, dolphinling, Doron
- Rosenberg, Doug Kramer, Eira Monstad, Elliotte Harold, Eric Law, Erik
- Arvidsson, Evan Martin, Evan Prodromou, fantasai, Felix Sasaki, Franck
- 'Shift' Quélain, Garrett Smith, Geoffrey Garen, Geoffrey Sneddon,
- Håkon Wium Lie, Henri Sivonen, Henrik Lied, Henry Mason, Hugh
- Winkler, Ignacio Javier, Ivo Emanuel Gonçalves, J. King, Jacques
- Distler, James Graham, James Justin Harrell, James M Snell, James Perrett,
- Jan-Klaas Kollhof, Jason White, Jasper Bryant-Greene, Jeff Cutsinger, Jeff
- Walden, Jens Bannmann, Jens Fendler, Jeroen van der Meer, Jim Jewett, Jim
- Meehan, Joe Clark, Jjgod Jiang, Joel Spolsky, Johan Herland, John Boyer,
- John Bussjaeger, John Harding, Johnny Stenback, Jon Perlow, Jonathan
- Worent, Jorgen Horstink, Josh Levenberg, Joshua Randall, Jukka K. Korpela,
- Julian Reschke, Kai Hendry, <!-- Keryx Web, = Lars Gunther --> Kornel
- Lesinski, 黒澤剛志 (KUROSAWA Takeshi), Kristof
- Zelechovski, Lachlan Hunt, Larry Page, Lars Gunther, Laura L. Carlson,
- Laura Wisewell, Laurens Holst, Lee Kowalkowski, Leif Halvard Silli, Lenny
- Domnitser, Léonard Bouchet, Leons Petrazickis,
- Logan<!-- on moz irc -->, Loune, Maciej Stachowiak, Magnus
- Kristiansen<!-- Dashiva -->, Malcolm Rowe, Mark Nottingham, Mark
- Rowe<!--bdash-->, Mark Schenk, Martijn Wargers, Martin Atkins, Martin
- Dürst, Martin Honnen, Masataka Yakura, Mathieu Henri, Matthew
- Mastracci, Matthew Raymond, Matthew Thomas, Mattias Waldau, Max
- Romantschuk, Michael 'Ratt' Iannarelli, Michael A. Nachbaur, Michael A.
- Puls II<!--Shadow2531-->, Michael Carter, Michael Gratton, Michael Powers,
- Michael(tm) Smith, Michel Fortin, Michiel van der Blonk, Mihai
- Şucan<!-- from ROBO Design -->, Mike Brown, Mike
+ Robison, Collin Jackson, Daniel Barclay, Daniel Brumbaugh Keeney, Daniel
+ Glazman, Daniel Peng, Daniel Spång, Daniel Steinberg, Danny
+ Sullivan, Darin Adler, Darin Fisher, Dave Camp, Dave Singer, Dave
+ Townsend<!-- Mossop on moz irc -->, David Baron, David Bloom, David
+ Carlisle, David Flanagan, David Håsäther, David Hyatt, Dean
+ Edridge, Debi Orton, Derek Featherstone, DeWitt Clinton, Dimitri Glazkov,
+ dolphinling, Doron Rosenberg, Doug Kramer, Eira Monstad, Elliotte Harold,
+ Eric Law, Erik Arvidsson, Evan Martin, Evan Prodromou, fantasai, Felix
+ Sasaki, Franck 'Shift' Quélain, Garrett Smith, Geoffrey Garen,
+ Geoffrey Sneddon, Håkon Wium Lie, Henri Sivonen, Henrik Lied, Henry
+ Mason, Hugh Winkler, Ignacio Javier, Ivo Emanuel Gonçalves, J.
+ King, Jacques Distler, James Graham, James Justin Harrell, James M Snell,
+ James Perrett, Jan-Klaas Kollhof, Jason White, Jasper Bryant-Greene, Jeff
+ Cutsinger, Jeff Walden, Jens Bannmann, Jens Fendler, Jeroen van der Meer,
+ Jim Jewett, Jim Meehan, Joe Clark, Jjgod Jiang, Joel Spolsky, Johan
+ Herland, John Boyer, John Bussjaeger, John Harding, Johnny Stenback, Jon
+ Perlow, Jonathan Worent, Jorgen Horstink, Josh Levenberg, Joshua Randall,
+ Jukka K. Korpela, Julian Reschke, Kai Hendry,
+ <!-- Keryx Web, = Lars Gunther --> Kornel Lesinski,
+ 黒澤剛志 (KUROSAWA Takeshi), Kristof Zelechovski,
+ Lachlan Hunt, Larry Page, Lars Gunther, Laura L. Carlson, Laura Wisewell,
+ Laurens Holst, Lee Kowalkowski, Leif Halvard Silli, Lenny Domnitser,
+ Léonard Bouchet, Leons Petrazickis, Logan<!-- on moz irc -->,
+ Loune, Maciej Stachowiak, Magnus Kristiansen<!-- Dashiva -->, Malcolm
+ Rowe, Mark Nottingham, Mark Rowe<!--bdash-->, Mark Schenk, Martijn
+ Wargers, Martin Atkins, Martin Dürst, Martin Honnen, Masataka Yakura,
+ Mathieu Henri, Matthew Mastracci, Matthew Raymond, Matthew Thomas, Mattias
+ Waldau, Max Romantschuk, Michael 'Ratt' Iannarelli, Michael A. Nachbaur,
+ Michael A. Puls II<!--Shadow2531-->, Michael Carter, Michael Gratton,
+ Michael Powers, Michael(tm) Smith, Michel Fortin, Michiel van der Blonk,
+ Mihai Şucan<!-- from ROBO Design -->, Mike Brown, Mike
Dierken<!-- S. Mike Dierken -->, Mike Dixon, Mike Schinkel, Mike Shaver,
Mikko Rantalainen, Neil Deakin, Neil Soiffer, Olaf Hoffmann, Olav Junker
Kjær, Oliver Hunt, Peter Karlsson, Peter Kasting, Philip
Received on Monday, 14 July 2008 09:59:14 UTC