W3C home > Mailing lists > Public > public-html-commits@w3.org > October 2011

html5/spec introduction.html,1.1055,1.1056 spec.html,1.1724,1.1725 tokenization.html,1.84,1.85

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Fri, 14 Oct 2011 22:46:30 +0000
To: public-html-commits@w3.org
Message-Id: <E1REqWM-0003k5-9a@lionel-hutz.w3.org>
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv14362

Modified Files:
	introduction.html spec.html tokenization.html 
Log Message:
Handle the cases where this algorithm returns two tokens. (whatwg r6687)

[updated by splitter]


Index: tokenization.html
===================================================================
RCS file: /sources/public/html5/spec/tokenization.html,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- tokenization.html	4 Oct 2011 17:46:34 -0000	1.84
+++ tokenization.html	14 Oct 2011 22:46:28 -0000	1.85
@@ -434,7 +434,7 @@
   <p>If nothing is returned, emit a U+0026 AMPERSAND character (&amp;)
   token.</p>
 
-  <p>Otherwise, emit the character token that was returned.</p>
+  <p>Otherwise, emit the character tokens that were returned.</p>
 
   <p>Finally, switch to the <a href="#data-state">data state</a>.</p>
 
@@ -469,7 +469,7 @@
   <p>If nothing is returned, emit a U+0026 AMPERSAND character (&amp;)
   token.</p>
 
-  <p>Otherwise, emit the character token that was returned.</p>
+  <p>Otherwise, emit the character tokens that were returned.</p>
 
   <p>Finally, switch to the <a href="#rcdata-state">RCDATA state</a>.</p>
 
@@ -1533,7 +1533,7 @@
   <p>If nothing is returned, append a U+0026 AMPERSAND character
   (&amp;) to the current attribute's value.</p>
 
-  <p>Otherwise, append the returned character token to the current
+  <p>Otherwise, append the returned character tokens to the current
   attribute's value.</p>
 
   <p>Finally, switch back to the attribute value state that switched

Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.1724
retrieving revision 1.1725
diff -u -d -r1.1724 -r1.1725
--- spec.html	14 Oct 2011 21:46:29 -0000	1.1724
+++ spec.html	14 Oct 2011 22:46:27 -0000	1.1725
@@ -349,7 +349,7 @@
     <a href="Overview.html">single page HTML</a>,
     <a href="spec.html">multipage HTML</a>,
     <a href="author/">web developer edition</a>.
-This is revision 1.5362.
+This is revision 1.5363.
    </p> 
      <p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a>
    &#169; 2011 <a href="http://www.w3.org/"><abbr title="World Wide

Index: introduction.html
===================================================================
RCS file: /sources/public/html5/spec/introduction.html,v
retrieving revision 1.1055
retrieving revision 1.1056
diff -u -d -r1.1055 -r1.1056
--- introduction.html	4 Oct 2011 17:46:30 -0000	1.1055
+++ introduction.html	14 Oct 2011 22:46:27 -0000	1.1056
@@ -377,7 +377,7 @@
   hosted first at CERN, and then at the IETF.</p><p>With the creation of the W3C, HTML's development changed venue
   again. A first abortive attempt at extending HTML in 1995 known as
   HTML 3.0 then made way to a more pragmatic approach known as HTML
-  3.2, which was completed in 1997. HTML4 quicky followed later that
+  3.2, which was completed in 1997. HTML4 quickly followed later that
   same year.</p><p>The following year, the W3C membership decided to stop evolving
   HTML and instead begin work on an XML-based equivalent, called
   XHTML.  This effort
Received on Friday, 14 October 2011 22:46:31 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Friday, 14 October 2011 22:46:34 GMT