html5/spec acknowledgements.html,1.899,1.900 browsers.html,1.889,1.890 dom.html,1.895,1.896 editing.html,1.890,1.891 embedded-content-0.html,1.881,1.882 forms.html,1.888,1.889 history.html,1.885,1.886 iana.html,1.220,1.221 index.html,1.891,1.892 infrastructure.html,1.903,1.904 interactive-elements.html,1.887,1.888 introduction.html,1.892,1.893 named-character-references.html,1.882,1.883 obsolete.html,1.885,1.886 offline.html,1.883,1.884 references.html,1.889,1.890 semantics.html,1.903,1.904 spec.html,1.933,1.934 syntax.html,1.896,1.897 tabular-data.html,1.884,1.885 text-level-semantics.html,1.889,1.890 the-canvas-element.html,1.756,1.757 the-xhtml-syntax.html,1.894,1.895 video.html,1.764,1.765 webappapis.html,1.18,1.19

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

Modified Files:
	acknowledgements.html browsers.html dom.html editing.html 
	embedded-content-0.html forms.html history.html iana.html 
	index.html infrastructure.html interactive-elements.html 
	introduction.html named-character-references.html 
	obsolete.html offline.html references.html semantics.html 
	spec.html syntax.html tabular-data.html 
	text-level-semantics.html the-canvas-element.html 
	the-xhtml-syntax.html video.html webappapis.html 
Log Message:
Allow a few more unescaped &s. (whatwg r4960)

[updated by splitter]


Index: infrastructure.html
===================================================================
RCS file: /sources/public/html5/spec/infrastructure.html,v
retrieving revision 1.903
retrieving revision 1.904
diff -u -d -r1.903 -r1.904
--- infrastructure.html	2 Apr 2010 22:47:13 -0000	1.903
+++ infrastructure.html	2 Apr 2010 23:26:45 -0000	1.904
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3982.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3983.</p>
 
    </div><div>
    <a href="introduction.html">&#8592; 1 Introduction</a> &#8211;

Index: text-level-semantics.html
===================================================================
RCS file: /sources/public/html5/spec/text-level-semantics.html,v
retrieving revision 1.889
retrieving revision 1.890
diff -u -d -r1.889 -r1.890
--- text-level-semantics.html	2 Apr 2010 22:47:14 -0000	1.889
+++ text-level-semantics.html	2 Apr 2010 23:26:46 -0000	1.890
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3982.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3983.</p>
 
    </div><div>
    <a href="semantics.html">&#8592; 4 The elements of HTML</a> &#8211;

Index: the-canvas-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-canvas-element.html,v
retrieving revision 1.756
retrieving revision 1.757
diff -u -d -r1.756 -r1.757
--- the-canvas-element.html	2 Apr 2010 22:47:14 -0000	1.756
+++ the-canvas-element.html	2 Apr 2010 23:26:46 -0000	1.757
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3982.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3983.</p>
 
    </div><div>
    <a href="video.html">&#8592; 4.8.6 The video element</a> &#8211;

Index: tabular-data.html
===================================================================
RCS file: /sources/public/html5/spec/tabular-data.html,v
retrieving revision 1.884
retrieving revision 1.885
diff -u -d -r1.884 -r1.885
--- tabular-data.html	2 Apr 2010 22:47:14 -0000	1.884
+++ tabular-data.html	2 Apr 2010 23:26:46 -0000	1.885
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3982.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3983.</p>
 
    </div><div>
    <a href="the-canvas-element.html">&#8592; 4.8.10 The canvas element</a> &#8211;

Index: embedded-content-0.html
===================================================================
RCS file: /sources/public/html5/spec/embedded-content-0.html,v
retrieving revision 1.881
retrieving revision 1.882
diff -u -d -r1.881 -r1.882
--- embedded-content-0.html	2 Apr 2010 22:47:13 -0000	1.881
+++ embedded-content-0.html	2 Apr 2010 23:26:44 -0000	1.882
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3982.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3983.</p>
 
    </div><div>
    <a href="dom.html">&#8592; 3 Semantics, structure, and APIs of HTML documents</a> &#8211;

Index: dom.html
===================================================================
RCS file: /sources/public/html5/spec/dom.html,v
retrieving revision 1.895
retrieving revision 1.896
diff -u -d -r1.895 -r1.896
--- dom.html	2 Apr 2010 22:47:13 -0000	1.895
+++ dom.html	2 Apr 2010 23:26:44 -0000	1.896
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3982.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3983.</p>
 
    </div><div>
    <a href="infrastructure.html">&#8592; 2 Common infrastructure</a> &#8211;

Index: references.html
===================================================================
RCS file: /sources/public/html5/spec/references.html,v
retrieving revision 1.889
retrieving revision 1.890
diff -u -d -r1.889 -r1.890
--- references.html	2 Apr 2010 22:47:14 -0000	1.889
+++ references.html	2 Apr 2010 23:26:45 -0000	1.890
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3982.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3983.</p>
 
    </div><div>
    <a href="index.html">&#8592; Index</a> &#8211;

Index: acknowledgements.html
===================================================================
RCS file: /sources/public/html5/spec/acknowledgements.html,v
retrieving revision 1.899
retrieving revision 1.900
diff -u -d -r1.899 -r1.900
--- acknowledgements.html	2 Apr 2010 22:47:12 -0000	1.899
+++ acknowledgements.html	2 Apr 2010 23:26:44 -0000	1.900
@@ -289,7 +289,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3982.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3983.</p>
 
    </div><div>
    <a href="references.html">&#8592; References</a> &#8211;

Index: iana.html
===================================================================
RCS file: /sources/public/html5/spec/iana.html,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -d -r1.220 -r1.221
--- iana.html	2 Apr 2010 22:47:13 -0000	1.220
+++ iana.html	2 Apr 2010 23:26:45 -0000	1.221
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3982.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3983.</p>
 
    </div><div>
    <a href="obsolete.html">&#8592; 11 Obsolete features</a> &#8211;

Index: forms.html
===================================================================
RCS file: /sources/public/html5/spec/forms.html,v
retrieving revision 1.888
retrieving revision 1.889
diff -u -d -r1.888 -r1.889
--- forms.html	2 Apr 2010 22:47:13 -0000	1.888
+++ forms.html	2 Apr 2010 23:26:45 -0000	1.889
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3982.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3983.</p>
 
    </div><div>
    <a href="tabular-data.html">&#8592; 4.9 Tabular data</a> &#8211;

Index: interactive-elements.html
===================================================================
RCS file: /sources/public/html5/spec/interactive-elements.html,v
retrieving revision 1.887
retrieving revision 1.888
diff -u -d -r1.887 -r1.888
--- interactive-elements.html	2 Apr 2010 22:47:13 -0000	1.887
+++ interactive-elements.html	2 Apr 2010 23:26:45 -0000	1.888
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3982.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3983.</p>
 
    </div><div>
    <a href="forms.html">&#8592; 4.10 Forms</a> &#8211;

Index: editing.html
===================================================================
RCS file: /sources/public/html5/spec/editing.html,v
retrieving revision 1.890
retrieving revision 1.891
diff -u -d -r1.890 -r1.891
--- editing.html	2 Apr 2010 22:47:13 -0000	1.890
+++ editing.html	2 Apr 2010 23:26:44 -0000	1.891
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3982.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3983.</p>
 
    </div><div>
    <a href="webappapis.html">&#8592; 6 Web application APIs</a> &#8211;

Index: video.html
===================================================================
RCS file: /sources/public/html5/spec/video.html,v
retrieving revision 1.764
retrieving revision 1.765
diff -u -d -r1.764 -r1.765
--- video.html	2 Apr 2010 22:47:14 -0000	1.764
+++ video.html	2 Apr 2010 23:26:46 -0000	1.765
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3982.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3983.</p>
 
    </div><div>
    <a href="text-level-semantics.html">&#8592; 4.6 Text-level semantics</a> &#8211;

Index: browsers.html
===================================================================
RCS file: /sources/public/html5/spec/browsers.html,v
retrieving revision 1.889
retrieving revision 1.890
diff -u -d -r1.889 -r1.890
--- browsers.html	2 Apr 2010 22:47:12 -0000	1.889
+++ browsers.html	2 Apr 2010 23:26:44 -0000	1.890
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3982.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3983.</p>
 
    </div><div>
    <a href="interactive-elements.html">&#8592; 4.11 Interactive elements</a> &#8211;

Index: the-xhtml-syntax.html
===================================================================
RCS file: /sources/public/html5/spec/the-xhtml-syntax.html,v
retrieving revision 1.894
retrieving revision 1.895
diff -u -d -r1.894 -r1.895
--- the-xhtml-syntax.html	2 Apr 2010 22:47:14 -0000	1.894
+++ the-xhtml-syntax.html	2 Apr 2010 23:26:46 -0000	1.895
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3982.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3983.</p>
 
    </div><div>
    <a href="named-character-references.html">&#8592; 8.5 Named character references</a> &#8211;

Index: offline.html
===================================================================
RCS file: /sources/public/html5/spec/offline.html,v
retrieving revision 1.883
retrieving revision 1.884
diff -u -d -r1.883 -r1.884
--- offline.html	2 Apr 2010 22:47:14 -0000	1.883
+++ offline.html	2 Apr 2010 23:26:45 -0000	1.884
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3982.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3983.</p>
 
    </div><div>
    <a href="history.html">&#8592; 5.4 Session history and navigation</a> &#8211;

Index: obsolete.html
===================================================================
RCS file: /sources/public/html5/spec/obsolete.html,v
retrieving revision 1.885
retrieving revision 1.886
diff -u -d -r1.885 -r1.886
--- obsolete.html	2 Apr 2010 22:47:14 -0000	1.885
+++ obsolete.html	2 Apr 2010 23:26:45 -0000	1.886
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3982.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3983.</p>
 
    </div><div>
    <a href="the-xhtml-syntax.html">&#8592; 9 The XHTML syntax</a> &#8211;

Index: named-character-references.html
===================================================================
RCS file: /sources/public/html5/spec/named-character-references.html,v
retrieving revision 1.882
retrieving revision 1.883
diff -u -d -r1.882 -r1.883
--- named-character-references.html	2 Apr 2010 22:47:13 -0000	1.882
+++ named-character-references.html	2 Apr 2010 23:26:45 -0000	1.883
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3982.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3983.</p>
 
    </div><div>
    <a href="syntax.html">&#8592; 8 The HTML syntax</a> &#8211;

Index: history.html
===================================================================
RCS file: /sources/public/html5/spec/history.html,v
retrieving revision 1.885
retrieving revision 1.886
diff -u -d -r1.885 -r1.886
--- history.html	2 Apr 2010 22:47:13 -0000	1.885
+++ history.html	2 Apr 2010 23:26:45 -0000	1.886
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3982.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3983.</p>
 
    </div><div>
    <a href="browsers.html">&#8592; 5 Loading Web pages</a> &#8211;

Index: semantics.html
===================================================================
RCS file: /sources/public/html5/spec/semantics.html,v
retrieving revision 1.903
retrieving revision 1.904
diff -u -d -r1.903 -r1.904
--- semantics.html	2 Apr 2010 22:47:14 -0000	1.903
+++ semantics.html	2 Apr 2010 23:26:45 -0000	1.904
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3982.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3983.</p>
 
    </div><div>
    <a href="embedded-content-0.html">&#8592; 3.2.5.1.6 Embedded content</a> &#8211;

Index: index.html
===================================================================
RCS file: /sources/public/html5/spec/index.html,v
retrieving revision 1.891
retrieving revision 1.892
diff -u -d -r1.891 -r1.892
--- index.html	2 Apr 2010 22:47:13 -0000	1.891
+++ index.html	2 Apr 2010 23:26:45 -0000	1.892
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3982.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3983.</p>
 
    </div><div>
    <a href="iana.html">&#8592; 12 IANA considerations</a> &#8211;

Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.933
retrieving revision 1.934
diff -u -d -r1.933 -r1.934
--- spec.html	2 Apr 2010 22:47:14 -0000	1.933
+++ spec.html	2 Apr 2010 23:26:46 -0000	1.934
@@ -310,7 +310,7 @@
    </dl><p>This specification is available in the following formats: 
     <a href="Overview.html">single page HTML</a>,
     <a href="spec.html">multipage HTML</a>.
-This is revision 1.3982.
+This is revision 1.3983.
    </p> 
    <p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a>
    &#169; 2010 <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.892
retrieving revision 1.893
diff -u -d -r1.892 -r1.893
--- introduction.html	2 Apr 2010 22:47:13 -0000	1.892
+++ introduction.html	2 Apr 2010 23:26:45 -0000	1.893
@@ -289,7 +289,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3982.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3983.</p>
 
    </div><div>
    <a href="spec.html#contents">Table of contents</a> &#8211;
@@ -799,14 +799,14 @@
      <pre class="bad">&lt;a href="?original=1&amp;copy=2"&gt;Compare&lt;/a&gt;</pre>
 
      <p>To avoid this problem, all named character references are
-     required to end with a semicolon, and any ampersands followed by
-     letters are required to be escaped.</p>
+     required to end with a semicolon, and uses of named character
+     references without a semicolon are flagged as errors.</p>
 
      <p>Thus, the correct way to express the above cases is as
      follows:</p>
 
-     <pre>&lt;a href="?hello=1&amp;amp;world=2"&gt;Demo&lt;/a&gt;</pre>
-     <pre>&lt;a href="?original=1&amp;amp;copy=2"&gt;Compare&lt;/a&gt;</pre>
+     <pre>&lt;a href="?hello=1&amp;world=2"&gt;Demo&lt;/a&gt; &lt;!-- &amp;world is ok, since it's not a named character reference --&gt;</pre>
+     <pre>&lt;a href="?original=1&amp;amp;copy=2"&gt;Compare&lt;/a&gt; &lt;!-- the &amp; has to be escaped, since &amp;copy <em>is</em> a named character reference --&gt;</pre>
 
     </div>
 

Index: syntax.html
===================================================================
RCS file: /sources/public/html5/spec/syntax.html,v
retrieving revision 1.896
retrieving revision 1.897
diff -u -d -r1.896 -r1.897
--- syntax.html	2 Apr 2010 22:47:14 -0000	1.896
+++ syntax.html	2 Apr 2010 23:26:46 -0000	1.897
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3982.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3983.</p>
 
    </div><div>
    <a href="editing.html">&#8592; 7 User interaction</a> &#8211;
@@ -909,9 +909,12 @@
   control characters other than <a href="infrastructure.html#space-character" title="space character">space
   characters</a>.</p><p>An <dfn id="syntax-ambiguous-ampersand" title="syntax-ambiguous-ampersand">ambiguous
   ampersand</dfn> is a U+0026 AMPERSAND character (&amp;) that is
-  followed by some <a href="#syntax-text" title="syntax-text">text</a> other than a
-  <a href="infrastructure.html#space-character">space character</a>, a U+003C LESS-THAN SIGN character
-  (&lt;), or another U+0026 AMPERSAND character (&amp;).</p><h4 id="cdata-sections"><span class="secno">8.1.5 </span>CDATA sections</h4><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p><p><dfn id="syntax-cdata" title="syntax-cdata">CDATA sections</dfn> must start with
+  followed by one or more characters in the range U+0030 DIGIT ZERO
+  (0) to U+0039 DIGIT NINE (9), U+0061 LATIN SMALL LETTER A to U+007A
+  LATIN SMALL LETTER Z, and U+0041 LATIN CAPITAL LETTER A to U+005A
+  LATIN CAPITAL LETTER Z, followed by a U+003B SEMICOLON character
+  (;), where these characters do not match any of the names given in
+  the <a href="named-character-references.html#named-character-references">named character references</a> section.</p><h4 id="cdata-sections"><span class="secno">8.1.5 </span>CDATA sections</h4><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p><p><dfn id="syntax-cdata" title="syntax-cdata">CDATA sections</dfn> must start with
   the character sequence U+003C LESS-THAN SIGN, U+0021 EXCLAMATION
   MARK, U+005B LEFT SQUARE BRACKET, U+0043 LATIN CAPITAL LETTER C,
   U+0044 LATIN CAPITAL LETTER D, U+0041 LATIN CAPITAL LETTER A, U+0054
@@ -4276,12 +4279,14 @@
     column of the <a href="named-character-references.html#named-character-references">named character references</a> table (in a
     <a href="infrastructure.html#case-sensitive">case-sensitive</a> manner).</p>
 
-    <p>If no match can be made, then this is a <a href="#parse-error">parse
-    error</a>. No characters are consumed, and nothing is
-    returned.</p>
-
-    <p>If the last character matched is not a U+003B SEMICOLON
-    character (;), there is a <a href="#parse-error">parse error</a>.</p>
+    <p>If no match can be made, then no characters are consumed, and
+    nothing is returned. In this case, if the characters after the
+    U+0026 AMPERSAND character (&amp;) consist of a sequence of one or
+    more characters in the range U+0030 DIGIT ZERO (0) to U+0039 DIGIT
+    NINE (9), U+0061 LATIN SMALL LETTER A to U+007A LATIN SMALL LETTER
+    Z, and U+0041 LATIN CAPITAL LETTER A to U+005A LATIN CAPITAL
+    LETTER Z, followed by a U+003B SEMICOLON character (;), then this
+    is a <a href="#parse-error">parse error</a>.</p>
 
     <p>If the character reference is being consumed <a href="#character-reference-in-attribute-value-state" title="character reference in attribute value state">as part of an
     attribute</a>, and the last character matched is not a U+003B
@@ -4294,19 +4299,23 @@
     (&amp;) must be unconsumed, and nothing is returned.</p>
     <!-- "=" added because of http://www.w3.org/Bugs/Public/show_bug.cgi?id=9207#c5 -->
 
-    <p>Otherwise, return a character token for the character
-    corresponding to the character reference name (as given by the
-    second column of the <a href="named-character-references.html#named-character-references">named character references</a>
-    table).</p>
+    <p>Otherwise, a character reference is parsed. If the last
+    character matched is not a U+003B SEMICOLON character (;), there
+    is a <a href="#parse-error">parse error</a>.</p>
+
+    <p>Return a character token for the character corresponding to the
+    character reference name (as given by the second column of the
+    <a href="named-character-references.html#named-character-references">named character references</a> table).</p>
 
     <div class="example">
 
-     <p>If the markup contains <code title="">I'm &amp;notit; I tell
-     you</code>, the character reference is parsed as "not", as in,
-     <code title="">I'm &#172;it; I tell you</code>. But if the markup
+     <p>If the markup contains (not in an attribute) the string <code title="">I'm &amp;notit; I tell you</code>, the character
+     reference is parsed as "not", as in, <code title="">I'm &#172;it;
+     I tell you</code> (and this is a parse error). But if the markup
      was <code title="">I'm &amp;notin; I tell you</code>, the
      character reference would be parsed as "notin;", resulting in
-     <code title="">I'm &#8713; I tell you</code>.</p>
+     <code title="">I'm &#8713; I tell you</code> (and no parse
+     error).</p>
 
     </div>
 

Index: webappapis.html
===================================================================
RCS file: /sources/public/html5/spec/webappapis.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- webappapis.html	2 Apr 2010 22:47:14 -0000	1.18
+++ webappapis.html	2 Apr 2010 23:26:46 -0000	1.19
@@ -290,7 +290,7 @@
   </head><body onload="fixBrokenLink(); init()"><div class="head" id="head">
    <p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
    <h1>HTML5</h1>
-   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3982.</p>
+   <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2><p>This is revision 1.3983.</p>
 
    </div><div>
    <a href="offline.html">&#8592; 5.6 Offline Web applications</a> &#8211;

Received on Friday, 2 April 2010 23:26:51 UTC