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

html5/spec Overview.html,1.1052,1.1053

From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
Date: Fri, 11 Jul 2008 19:33:27 +0000
To: public-html-commits@w3.org
Message-Id: <E1KHOMx-0006WE-5V@lionel-hutz.w3.org>

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

Modified Files:
	Overview.html 
Log Message:
Fix spelling of tokenisation to be american. Sigh. (Re: 8.2.1: tokenisation) (credit: db) (whatwg r1864)

Index: Overview.html
===================================================================
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>&lt;p>In the common case, the data handled by the tokenisation stage
+     <pre>&lt;p>In the common case, the data handled by the tokenization stage
 comes from the network, but it can also come from script.&lt;/p>
 &lt;p><strong>&lt;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&oacute; Mar&iacute;n, Chao Cai, &#xc724;&#xc11d;&#xcc2c;
    (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&aring;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&aring;s&auml;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&eacute;lain, Garrett Smith, Geoffrey Garen, Geoffrey Sneddon,
-   H&aring;kon Wium Lie, Henri Sivonen, Henrik Lied, Henry Mason, Hugh
-   Winkler, Ignacio Javier, Ivo Emanuel Gon&ccedil;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, &#x9ed2;&#x6fa4;&#x525b;&#x5fd7; (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&eacute;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&uuml;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
-   &#x015E;ucan<!-- from ROBO Design -->, Mike Brown, Mike
+   Robison, Collin Jackson, Daniel Barclay, Daniel Brumbaugh Keeney, Daniel
+   Glazman, Daniel Peng, Daniel Sp&aring;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&aring;s&auml;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&eacute;lain, Garrett Smith, Geoffrey Garen,
+   Geoffrey Sneddon, H&aring;kon Wium Lie, Henri Sivonen, Henrik Lied, Henry
+   Mason, Hugh Winkler, Ignacio Javier, Ivo Emanuel Gon&ccedil;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,
+   &#x9ed2;&#x6fa4;&#x525b;&#x5fd7; (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&eacute;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&uuml;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 &#x015E;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&aelig;r, Oliver Hunt, Peter Karlsson, Peter Kasting, Philip
Received on Friday, 11 July 2008 19:34:03 GMT

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