html5/spec content-models.html,1.95,1.96 spec.html,1.1694,1.1695

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

Modified Files:
	content-models.html spec.html 
Log Message:
Disallow some combinations that would indicate element misuse. (whatwg r6610)

[updated by splitter]


Index: content-models.html
===================================================================
RCS file: /sources/public/html5/spec/content-models.html,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- content-models.html	30 Sep 2011 00:47:06 -0000	1.95
+++ content-models.html	2 Oct 2011 05:46:23 -0000	1.96
@@ -1040,7 +1040,6 @@
 
    </th></tr></thead><tbody><tr><td><code><a href="the-map-element.html#the-area-element">area</a></code> element that creates a <a href="links.html#hyperlink">hyperlink</a>
      </td><td><code title="attr-aria-role-link">link</code> role
-     
 
     </td></tr><tr><td><code><a href="semantics.html#the-base-element">base</a></code> element
      </td><td><a href="#concept-role-none" title="concept-role-none">No role</a>
@@ -1241,7 +1240,7 @@
 
    </th></tr></thead><tbody><tr><td><code><a href="text-level-semantics.html#the-a-element">a</a></code> element that creates a <a href="links.html#hyperlink">hyperlink</a>
      </td><td><code title="attr-aria-role-link">link</code> role
-     </td><td>Role must be either <code title="attr-aria-role-link">link</code>, <code title="attr-aria-role-button">button</code>, <code title="attr-aria-role-checkbox">checkbox</code>, <code title="attr-aria-role-menuitem">menuitem</code>, <code title="attr-aria-role-menuitemcheckbox">menuitemcheckbox</code>, <code title="attr-aria-role-menuitemradio">menuitemradio</code>, <code title="attr-aria-role-tab">tab</code>, or <code title="attr-aria-role-treeitem">treeitem</code>
+     </td><td>Role must be either <code title="attr-aria-role-link">link</code>, <code title="attr-aria-role-menuitem">menuitem</code>, or <code title="attr-aria-role-tab">tab</code>
 
     </td></tr><tr><td><code><a href="sections.html#the-address-element">address</a></code> element
      </td><td><a href="#concept-role-none" title="concept-role-none">No role</a>

Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.1694
retrieving revision 1.1695
diff -u -d -r1.1694 -r1.1695
--- spec.html	1 Oct 2011 00:47:04 -0000	1.1694
+++ spec.html	2 Oct 2011 05:46:23 -0000	1.1695
@@ -325,7 +325,7 @@
 
    <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>
-   <h2 class="no-num no-toc" id="editor-s-draft-30-september-2011">Editor's Draft 30 September 2011</h2>
+   <h2 class="no-num no-toc" id="editor-s-draft-2-october-2011">Editor's Draft 2 October 2011</h2>
    <dl><dt>Latest Published Version:</dt>
     <dd><a href="http://www.w3.org/TR/html5/">http://www.w3.org/TR/html5/</a></dd>
     <dt>Latest Editor's Draft:</dt>
@@ -350,7 +350,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.5302.
+This is revision 1.5303.
    </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
@@ -471,7 +471,7 @@
   Group</a> is the W3C working group responsible for this
   specification's progress along the W3C Recommendation
   track.
-  This specification is the 30 September 2011 Editor's Draft.
+  This specification is the 2 October 2011 Editor's Draft.
   </p><!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><p>Work on this specification is also done at the <a href="http://www.whatwg.org/">WHATWG</a>. The W3C HTML working group
   actively pursues convergence with the WHATWG, as required by the <a href="http://www.w3.org/2007/03/HTML-WG-charter">W3C HTML working
   group charter</a>.</p><!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><p>This document was produced by a group operating under the <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5

Received on Sunday, 2 October 2011 05:46:27 UTC