html5/spec acknowledgements.html,1.925,1.926 browsers.html,1.915,1.916 dom.html,1.921,1.922 editing.html,1.916,1.917 embedded-content-0.html,1.907,1.908 forms.html,1.914,1.915 history.html,1.911,1.912 iana.html,1.246,1.247 index.html,1.917,1.918 infrastructure.html,1.929,1.930 interactive-elements.html,1.913,1.914 introduction.html,1.918,1.919 named-character-references.html,1.908,1.909 obsolete.html,1.911,1.912 offline.html,1.909,1.910 references.html,1.915,1.916 semantics.html,1.929,1.930 spec.html,1.959,1.960 syntax.html,1.922,1.923 tabular-data.html,1.910,1.911 text-level-semantics.html,1.915,1.916 the-canvas-element.html,1.782,1.783 the-xhtml-syntax.html,1.920,1.921 video.html,1.790,1.791 webappapis.html,1.44,1.45 from Michael Smith via cvs-syncmail on 2010-04-12 (public-html-commits@w3.org from April 2010)

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Mon, 12 Apr 2010 06:46:47 +0000
To: public-html-commits@w3.org
Message-Id: <E1O1DPz-0004dj-BX@lionel-hutz.w3.org>
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv17800

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:
Change how character encodings are sniffed to require an http-equiv attribute, and to only process one character encoding per <meta> element, even if attributes are duplicated. (whatwg r4993)

[updated by splitter]


Index: infrastructure.html
===================================================================
RCS file: /sources/public/html5/spec/infrastructure.html,v
retrieving revision 1.929
retrieving revision 1.930
diff -u -d -r1.929 -r1.930
--- infrastructure.html	12 Apr 2010 05:56:44 -0000	1.929
+++ infrastructure.html	12 Apr 2010 06:46:43 -0000	1.930
@@ -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.4010.</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.4011.</p>
 
 
    </div><div>

Index: text-level-semantics.html
===================================================================
RCS file: /sources/public/html5/spec/text-level-semantics.html,v
retrieving revision 1.915
retrieving revision 1.916
diff -u -d -r1.915 -r1.916
--- text-level-semantics.html	12 Apr 2010 05:56:45 -0000	1.915
+++ text-level-semantics.html	12 Apr 2010 06:46:44 -0000	1.916
@@ -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.4010.</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.4011.</p>
 
 
    </div><div>

Index: the-canvas-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-canvas-element.html,v
retrieving revision 1.782
retrieving revision 1.783
diff -u -d -r1.782 -r1.783
--- the-canvas-element.html	12 Apr 2010 05:56:45 -0000	1.782
+++ the-canvas-element.html	12 Apr 2010 06:46:44 -0000	1.783
@@ -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.4010.</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.4011.</p>
 
 
    </div><div>

Index: tabular-data.html
===================================================================
RCS file: /sources/public/html5/spec/tabular-data.html,v
retrieving revision 1.910
retrieving revision 1.911
diff -u -d -r1.910 -r1.911
--- tabular-data.html	12 Apr 2010 05:56:45 -0000	1.910
+++ tabular-data.html	12 Apr 2010 06:46:44 -0000	1.911
@@ -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.4010.</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.4011.</p>
 
 
    </div><div>

Index: embedded-content-0.html
===================================================================
RCS file: /sources/public/html5/spec/embedded-content-0.html,v
retrieving revision 1.907
retrieving revision 1.908
diff -u -d -r1.907 -r1.908
--- embedded-content-0.html	12 Apr 2010 05:56:42 -0000	1.907
+++ embedded-content-0.html	12 Apr 2010 06:46:43 -0000	1.908
@@ -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.4010.</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.4011.</p>
 
 
    </div><div>

Index: dom.html
===================================================================
RCS file: /sources/public/html5/spec/dom.html,v
retrieving revision 1.921
retrieving revision 1.922
diff -u -d -r1.921 -r1.922
--- dom.html	12 Apr 2010 05:56:42 -0000	1.921
+++ dom.html	12 Apr 2010 06:46:43 -0000	1.922
@@ -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.4010.</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.4011.</p>
 
 
    </div><div>

Index: references.html
===================================================================
RCS file: /sources/public/html5/spec/references.html,v
retrieving revision 1.915
retrieving revision 1.916
diff -u -d -r1.915 -r1.916
--- references.html	12 Apr 2010 05:56:44 -0000	1.915
+++ references.html	12 Apr 2010 06:46:44 -0000	1.916
@@ -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.4010.</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.4011.</p>
 
 
    </div><div>

Index: acknowledgements.html
===================================================================
RCS file: /sources/public/html5/spec/acknowledgements.html,v
retrieving revision 1.925
retrieving revision 1.926
diff -u -d -r1.925 -r1.926
--- acknowledgements.html	12 Apr 2010 05:56:42 -0000	1.925
+++ acknowledgements.html	12 Apr 2010 06:46:43 -0000	1.926
@@ -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.4010.</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.4011.</p>
 
 
    </div><div>

Index: iana.html
===================================================================
RCS file: /sources/public/html5/spec/iana.html,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -d -r1.246 -r1.247
--- iana.html	12 Apr 2010 05:56:44 -0000	1.246
+++ iana.html	12 Apr 2010 06:46:43 -0000	1.247
@@ -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.4010.</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.4011.</p>
 
 
    </div><div>

Index: forms.html
===================================================================
RCS file: /sources/public/html5/spec/forms.html,v
retrieving revision 1.914
retrieving revision 1.915
diff -u -d -r1.914 -r1.915
--- forms.html	12 Apr 2010 05:56:42 -0000	1.914
+++ forms.html	12 Apr 2010 06:46:43 -0000	1.915
@@ -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.4010.</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.4011.</p>
 
 
    </div><div>

Index: interactive-elements.html
===================================================================
RCS file: /sources/public/html5/spec/interactive-elements.html,v
retrieving revision 1.913
retrieving revision 1.914
diff -u -d -r1.913 -r1.914
--- interactive-elements.html	12 Apr 2010 05:56:44 -0000	1.913
+++ interactive-elements.html	12 Apr 2010 06:46:43 -0000	1.914
@@ -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.4010.</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.4011.</p>
 
 
    </div><div>

Index: editing.html
===================================================================
RCS file: /sources/public/html5/spec/editing.html,v
retrieving revision 1.916
retrieving revision 1.917
diff -u -d -r1.916 -r1.917
--- editing.html	12 Apr 2010 05:56:42 -0000	1.916
+++ editing.html	12 Apr 2010 06:46:43 -0000	1.917
@@ -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.4010.</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.4011.</p>
 
 
    </div><div>

Index: video.html
===================================================================
RCS file: /sources/public/html5/spec/video.html,v
retrieving revision 1.790
retrieving revision 1.791
diff -u -d -r1.790 -r1.791
--- video.html	12 Apr 2010 05:56:45 -0000	1.790
+++ video.html	12 Apr 2010 06:46:44 -0000	1.791
@@ -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.4010.</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.4011.</p>
 
 
    </div><div>

Index: browsers.html
===================================================================
RCS file: /sources/public/html5/spec/browsers.html,v
retrieving revision 1.915
retrieving revision 1.916
diff -u -d -r1.915 -r1.916
--- browsers.html	12 Apr 2010 05:56:42 -0000	1.915
+++ browsers.html	12 Apr 2010 06:46:43 -0000	1.916
@@ -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.4010.</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.4011.</p>
 
 
    </div><div>

Index: the-xhtml-syntax.html
===================================================================
RCS file: /sources/public/html5/spec/the-xhtml-syntax.html,v
retrieving revision 1.920
retrieving revision 1.921
diff -u -d -r1.920 -r1.921
--- the-xhtml-syntax.html	12 Apr 2010 05:56:45 -0000	1.920
+++ the-xhtml-syntax.html	12 Apr 2010 06:46:44 -0000	1.921
@@ -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.4010.</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.4011.</p>
 
 
    </div><div>

Index: offline.html
===================================================================
RCS file: /sources/public/html5/spec/offline.html,v
retrieving revision 1.909
retrieving revision 1.910
diff -u -d -r1.909 -r1.910
--- offline.html	12 Apr 2010 05:56:44 -0000	1.909
+++ offline.html	12 Apr 2010 06:46:44 -0000	1.910
@@ -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.4010.</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.4011.</p>
 
 
    </div><div>

Index: obsolete.html
===================================================================
RCS file: /sources/public/html5/spec/obsolete.html,v
retrieving revision 1.911
retrieving revision 1.912
diff -u -d -r1.911 -r1.912
--- obsolete.html	12 Apr 2010 05:56:44 -0000	1.911
+++ obsolete.html	12 Apr 2010 06:46:44 -0000	1.912
@@ -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.4010.</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.4011.</p>
 
 
    </div><div>

Index: named-character-references.html
===================================================================
RCS file: /sources/public/html5/spec/named-character-references.html,v
retrieving revision 1.908
retrieving revision 1.909
diff -u -d -r1.908 -r1.909
--- named-character-references.html	12 Apr 2010 05:56:44 -0000	1.908
+++ named-character-references.html	12 Apr 2010 06:46:43 -0000	1.909
@@ -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.4010.</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.4011.</p>
 
 
    </div><div>

Index: history.html
===================================================================
RCS file: /sources/public/html5/spec/history.html,v
retrieving revision 1.911
retrieving revision 1.912
diff -u -d -r1.911 -r1.912
--- history.html	12 Apr 2010 05:56:44 -0000	1.911
+++ history.html	12 Apr 2010 06:46:43 -0000	1.912
@@ -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.4010.</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.4011.</p>
 
 
    </div><div>

Index: semantics.html
===================================================================
RCS file: /sources/public/html5/spec/semantics.html,v
retrieving revision 1.929
retrieving revision 1.930
diff -u -d -r1.929 -r1.930
--- semantics.html	12 Apr 2010 05:56:45 -0000	1.929
+++ semantics.html	12 Apr 2010 06:46:44 -0000	1.930
@@ -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.4010.</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.4011.</p>
 
 
    </div><div>

Index: index.html
===================================================================
RCS file: /sources/public/html5/spec/index.html,v
retrieving revision 1.917
retrieving revision 1.918
diff -u -d -r1.917 -r1.918
--- index.html	12 Apr 2010 05:56:44 -0000	1.917
+++ index.html	12 Apr 2010 06:46:43 -0000	1.918
@@ -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.4010.</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.4011.</p>
 
 
    </div><div>

Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.959
retrieving revision 1.960
diff -u -d -r1.959 -r1.960
--- spec.html	12 Apr 2010 05:56:45 -0000	1.959
+++ spec.html	12 Apr 2010 06:46:44 -0000	1.960
@@ -307,7 +307,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.4010.
+This is revision 1.4011.
    </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.918
retrieving revision 1.919
diff -u -d -r1.918 -r1.919
--- introduction.html	12 Apr 2010 05:56:44 -0000	1.918
+++ introduction.html	12 Apr 2010 06:46:43 -0000	1.919
@@ -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.4010.</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.4011.</p>
 
 
    </div><div>

Index: syntax.html
===================================================================
RCS file: /sources/public/html5/spec/syntax.html,v
retrieving revision 1.922
retrieving revision 1.923
diff -u -d -r1.922 -r1.923
--- syntax.html	12 Apr 2010 05:56:45 -0000	1.922
+++ syntax.html	12 Apr 2010 06:46:44 -0000	1.923
@@ -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.4010.</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.4011.</p>
 
 
    </div><div>
@@ -1196,36 +1196,71 @@
          0x2F byte (the one in sequence of characters matched
          above).</p></li>
 
-         <li><p><a href="#concept-get-attributes-when-sniffing" title="concept-get-attributes-when-sniffing">Get
-         an attribute</a> and its value. If no attribute was
-         sniffed, then skip this inner set of steps, and jump to the
-         second step in the overall "two step" algorithm.</p></li>
+         <li><p>Let <var title="">attribute list</var> be an empty
+         list of strings.</p></li> <!-- so long as we only care about
+         http-equiv, content, and charset, this can be a 3-bit
+         bitfield -->
 
-         <li><p>If the attribute's name is neither "<code title="">charset</code>" nor "<code title="">content</code>",
-         then return to step 2 in these inner steps.</p></li>
+         <li><p>Let <var title="">got pragma</var> be false.</p></li>
 
-         <li><p>If the attribute's name is "<code title="">charset</code>", let <var title="">charset</var> be
-         the attribute's value, interpreted as a character
-         encoding.</p></li>
+         <li><p>Let <var title="">mode</var> be null.</p></li>
 
-         <li><p>Otherwise, the attribute's name is "<code title="">content</code>": apply the <a href="infrastructure.html#algorithm-for-extracting-an-encoding-from-a-content-type">algorithm for
-         extracting an encoding from a Content-Type</a>, giving the
-         attribute's value as the string to parse. If an encoding is
-         returned, let <var title="">charset</var> be that
-         encoding. Otherwise, return to step 2 in these inner
-         steps.</p></li>
+         <li><p>Let <var title="">charset</var> be the null value
+         (which, for the purposes of this algorithm, is distinct from
+         an unrecognised encoding or the empty string).</p></li>
+
+         <li><p><i>Attributes</i>: <a href="#concept-get-attributes-when-sniffing" title="concept-get-attributes-when-sniffing">Get an
+         attribute</a> and its value. If no attribute was sniffed,
+         then jump to the <i>processing</i> step below.</p></li>
+
+         <li><p>If the attribute's name is already in <var title="">attribute list</var>, then return to the step
+         labeled <i>attributes</i>.</p>
+
+         </li><li>
+
+          <p>Run the appropriate step from the following list, if one
+          applies:</p>
+
+          <dl class="switch"><dt>If the attribute's name is "<code title="">http-equiv</code>"</dt>
+
+           <dd><p>If the attribute's value is "<code title="">content-type</code>", then set <var title="">got
+           pragma</var> to true.</p></dd>
+
+           <dt>If the attribute's name is "<code title="">charset</code>"</dt>
+
+           <dd><p>If <var title="">charset</var> is still set to null,
+           let <var title="">charset</var> be the encoding
+           corresponding to the attribute's value, and set <var title="">mode</var> to "charset".</p></dd>
+
+           <dt>If the attribute's name is "<code title="">content</code>"</dt>
+
+           <dd><p>Apply the <a href="infrastructure.html#algorithm-for-extracting-an-encoding-from-a-content-type">algorithm for extracting an encoding
+           from a Content-Type</a>, giving the attribute's value as
+           the string to parse. If an encoding is returned, and if
+           <var title="">charset</var> is still set to null, let <var title="">charset</var> be the encoding returned, and set
+           <var title="">mode</var> to "pragma".</p></dd>
+
+          </dl></li>
+
+         <li><p>Return to the step labeled <i>attributes</i>.</p></li>
+
+         <li><p><i>Processing</i>: If <var title="">mode</var> is
+         null, then jump to the second step of the overall "two step"
+         algorithm.</p></li>
+
+         <li><p>If <var title="">mode</var> is "pragma" but <var title="">got pragma</var> is false, then jump to the second
+         step of the overall "two step" algorithm.</p></li>
 
          <li><p>If <var title="">charset</var> is a UTF-16 encoding,
          change the value of <var title="">charset</var> to
          UTF-8.</p></li>
 
-         <li><p>If <var title="">charset</var> is a supported
-         character encoding, then return the given encoding, with
-         <a href="#concept-encoding-confidence" title="concept-encoding-confidence">confidence</a>
-         <i>tentative</i>, and abort all these steps.</p></li>
+         <li><p>If <var title="">charset</var> is not a supported
+         character encoding, then jump to the second step of the
+         overall "two step" algorithm.</p></li>
 
-         <li><p>Otherwise, return to step 2 in these inner
-         steps.</p></li>
+         <li><p>Return the encoding given by <var title="">charset</var>, with <a href="#concept-encoding-confidence" title="concept-encoding-confidence">confidence</a>
+         <i>tentative</i>, and abort all these steps.</p></li>
 
         </ol></dd>
 

Index: webappapis.html
===================================================================
RCS file: /sources/public/html5/spec/webappapis.html,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- webappapis.html	12 Apr 2010 05:56:45 -0000	1.44
+++ webappapis.html	12 Apr 2010 06:46:45 -0000	1.45
@@ -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.4010.</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.4011.</p>
 
 
    </div><div>
Received on Monday, 12 April 2010 06:46:50 UTC