Note differences between specs for aria. https://www.w3.org/Bugs/Public/show_bug.cgi?id=21909

zcorpan · zcorpan · commit 67c16829accb · 2013-05-03T11:43:58.000+02:00
diff --git a/Overview.html b/Overview.html
@@ -5,6 +5,7 @@
       @media screen { code { color: #D93B00; } code :link, code :visited { color: inherit; } }
       pre, code { font-size: inherit; font-family: monospace; font-variant: normal; }
       pre strong { color: black; font: inherit; font-weight: bold; background: yellow; }
+      .XXX { color: #E50000; background: white; border: solid red; padding: 0.5em; margin: 1em 0; }
     </style>
     <link class="not-whatwg" href="http://www.w3.org/StyleSheets/TR/W3C-ED" rel="stylesheet">
     </head>
@@ -24,7 +25,7 @@
 <!--end-logo--></div>
       <hgroup>
         <h1>HTML differences from HTML4</h1>
-        <h2 class="no-num no-toc not-whatwg" id="w3c-doctype">Editor's Draft 2 May 2013</h2>
+        <h2 class="no-num no-toc not-whatwg" id="w3c-doctype">Editor's Draft 3 May 2013</h2>
         </hgroup>
 
       <dl>
@@ -92,7 +93,7 @@ <h2 class="no-num no-toc" id="sotd">Status of this Document</h2>
     found in the <a href="http://www.w3.org/TR/">W3C technical reports index</a>
     at http://www.w3.org/TR/.</i></p>
 
-    <p>This is the 2 May 2013 Editor's Draft produced by the
+    <p>This is the 3 May 2013 Editor's Draft produced by the
     <a href="http://www.w3.org/html/wg/">HTML Working Group</a>, part of the
     <a href="http://www.w3.org/MarkUp/Activity">HTML Activity</a>. The
     Working Group intends to publish this document as a
@@ -462,7 +463,7 @@ <h3 id="new-elements"><span class="secno">3.1 </span>New Elements</h3>
 
       <li><p><code class="external"><a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/grouping-content.html#the-main-element">main</a></code>
       can be used as a container for the dominant contents of another element, such as
-      the main content of the page.</li>
+      the main content of the page. In W3C HTML5 and W3C HTML 5.1, only one such element is allowed in a document.</li>
 
       <li><p><code class="external"><a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/sections.html#the-aside-element">aside</a></code>
       represents a piece of content that is only slightly related to the
@@ -813,7 +814,7 @@ <h3 id="new-attributes"><span class="secno">3.2 </span>New Attributes</h3>
       <li><p>The <code class="external" title="wai-aria"><a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/elements.html#wai-aria">role</a></code> and
       <code class="external" title="wai-aria"><a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/elements.html#wai-aria">aria-<var>*</var></a></code>
       collection attributes which can be used to instruct assistive
-      technology.</li>
+      technology. These attributes have slightly different requirements in WHATWG HTML and W3C HTML5/W3C HTML5.1.
 
       <li><p>The <code class="external" title="attr-spellcheck"><a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/editing.html#attr-spellcheck">spellcheck</a></code> attribute allows for hinting
       whether content can be checked for spelling or not.
diff --git a/Overview.src.html b/Overview.src.html
@@ -791,7 +791,7 @@ <h3 id="new-attributes">New Attributes</h3>
       <li><p>The <code data-anolis-spec=html title=wai-aria>role</code> and
       <code data-anolis-spec=html title=wai-aria>aria-<var>*</var></code>
       collection attributes which can be used to instruct assistive
-      technology.</li>
+      technology. These attributes have slightly different requirements in WHATWG HTML and W3C HTML5/W3C HTML5.1.
 
       <li><p>The <code data-anolis-spec=html
       title=attr-spellcheck>spellcheck</code> attribute allows for hinting
diff --git a/Overview.whatwg.html b/Overview.whatwg.html
@@ -17,7 +17,7 @@
 
       <hgroup>
         <h1>HTML differences from HTML4</h1>
-        <h2 class="no-num no-toc not-w3c">Living Document — Last Updated 2 May 2013</h2>
+        <h2 class="no-num no-toc not-w3c">Living Document — Last Updated 3 May 2013</h2>
       </hgroup>
 
       <dl>
@@ -49,7 +49,7 @@ <h2 class="no-num no-toc not-w3c">Living Document — Last Updated 2 May 2013</h
       <p class="copyright not-w3c"><a href="http://creativecommons.org/publicdomain/zero/1.0/" rel="license"><img alt="CC0" src="http://i.creativecommons.org/p/zero/1.0/80x15.png"></a>
       To the extent possible under law, the editors have waived all copyright and
       related or neighboring rights to this work. In addition, as of
-      2 May 2013, the editors have made this specification available
+      3 May 2013, the editors have made this specification available
       under the
       <a href="http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0" rel="license">Open Web Foundation Agreement Version 1.0</a>,
       which is available at
@@ -408,7 +408,7 @@ <h3 id="new-elements"><span class="secno">3.1 </span>New Elements</h3>
 
       <li><p><code class="external"><a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/grouping-content.html#the-main-element">main</a></code>
       can be used as a container for the dominant contents of another element, such as
-      the main content of the page.</li>
+      the main content of the page. In W3C HTML5 and W3C HTML 5.1, only one such element is allowed in a document.</li>
 
       <li><p><code class="external"><a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/sections.html#the-aside-element">aside</a></code>
       represents a piece of content that is only slightly related to the
@@ -759,7 +759,7 @@ <h3 id="new-attributes"><span class="secno">3.2 </span>New Attributes</h3>
       <li><p>The <code class="external" title="wai-aria"><a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/elements.html#wai-aria">role</a></code> and
       <code class="external" title="wai-aria"><a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/elements.html#wai-aria">aria-<var>*</var></a></code>
       collection attributes which can be used to instruct assistive
-      technology.</li>
+      technology. These attributes have slightly different requirements in WHATWG HTML and W3C HTML5/W3C HTML5.1.
 
       <li><p>The <code class="external" title="attr-spellcheck"><a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/editing.html#attr-spellcheck">spellcheck</a></code> attribute allows for hinting
       whether content can be checked for spelling or not.
