[html5] r6201 - [e] (0) apply chair revert request

[whatwg at whatwg.org]

Author: ianh
Date: 2011-06-08 23:57:24 -0700 (Wed, 08 Jun 2011)
New Revision: 6201

Modified:
   complete.html
   index
   source
Log:
[e] (0) apply chair revert request

Modified: complete.html
===================================================================
--- complete.html	2011-06-09 06:13:15 UTC (rev 6200)
+++ complete.html	2011-06-09 06:57:24 UTC (rev 6201)
@@ -34208,7 +34208,12 @@
    <dt>Contexts in which this element can be used:</dt>
    <dd>Where <a href=#embedded-content>embedded content</a> is expected.</dd>
    <dt>Content model:</dt>
-   <dd><a href=#transparent>Transparent</a>, but with no <a href=#interactive-content>interactive content</a> descendants except for <code><a href=#the-a-element>a</a></code> elements, <code><a href=#the-button-element>button</a></code> elements, <code><a href=#the-input-element>input</a></code> elements whose <code title=attr-input-type><a href=#attr-input-type>type</a></code> attribute are in the <a href=#checkbox-state title=attr-input-type-checkbox>Checkbox</a> or <a href=#radio-button-state title=attr-input-type-radio>Radio Button</a> states, and <code><a href=#the-input-element>input</a></code> elements that are <a href=#concept-button title=concept-button>buttons</a>.</dd> <!-- and maybe <select>, I guess -->
+   <dd><a href=#transparent>Transparent</a>.</dd>
+   <dd><a href=#transparent>Transparent</a><!--
+--><!--FORK--><!--
+-->, but with no <a href=#interactive-content>interactive content</a> descendants except for <code><a href=#the-a-element>a</a></code> elements, <code><a href=#the-button-element>button</a></code> elements, <code><a href=#the-input-element>input</a></code> elements whose <code title=attr-input-type><a href=#attr-input-type>type</a></code> attribute are in the <a href=#checkbox-state title=attr-input-type-checkbox>Checkbox</a> or <a href=#radio-button-state title=attr-input-type-radio>Radio Button</a> states, and <code><a href=#the-input-element>input</a></code> elements that are <a href=#concept-button title=concept-button>buttons</a><!--
+--><!--FORK--><!--
+-->.</dd> <!-- and maybe <select>, I guess? I've left it in for now, since I guess authors might make accessible selects if they're simple enough, and it's not obvious how to distinguish the simple ones from the complex ones... -->
    <dt>Content attributes:</dt>
    <dd><a href=#global-attributes>Global attributes</a></dd>
    <dd><code title=attr-canvas-width><a href=#attr-canvas-width>width</a></code></dd>

Modified: index
===================================================================
--- index	2011-06-09 06:13:15 UTC (rev 6200)
+++ index	2011-06-09 06:57:24 UTC (rev 6201)
@@ -1392,6 +1392,12 @@
    of <a href=http://lists.w3.org/Archives/Public/public-html/2011May/0018.html>a
    working group chair decision from May 2011</a>.</li><!--bug 11557-->
 
+   <li>The W3C version is missing some conformance constraints that
+   would make documents misusing <code><a href=#the-canvas-element>canvas</a></code> invalid, because
+   of <a href=http://lists.w3.org/Archives/Public/public-html/2011Jun/0083.html>a
+   working group chair decision from June 2011</a>.</li><!--bug
+   12906-->
+
   </ul><p>Features that are part of HTML (and this specification) but that
   are currently published as separate specifications as well, and are
   not included in the W3C HTML5 specification, consist of:</p>
@@ -34195,7 +34201,12 @@
    <dt>Contexts in which this element can be used:</dt>
    <dd>Where <a href=#embedded-content>embedded content</a> is expected.</dd>
    <dt>Content model:</dt>
-   <dd><a href=#transparent>Transparent</a>, but with no <a href=#interactive-content>interactive content</a> descendants except for <code><a href=#the-a-element>a</a></code> elements, <code><a href=#the-button-element>button</a></code> elements, <code><a href=#the-input-element>input</a></code> elements whose <code title=attr-input-type><a href=#attr-input-type>type</a></code> attribute are in the <a href=#checkbox-state title=attr-input-type-checkbox>Checkbox</a> or <a href=#radio-button-state title=attr-input-type-radio>Radio Button</a> states, and <code><a href=#the-input-element>input</a></code> elements that are <a href=#concept-button title=concept-button>buttons</a>.</dd> <!-- and maybe <select>, I guess -->
+   <dd><a href=#transparent>Transparent</a>.</dd>
+   <dd><a href=#transparent>Transparent</a><!--
+--><!--FORK--><!--
+-->, but with no <a href=#interactive-content>interactive content</a> descendants except for <code><a href=#the-a-element>a</a></code> elements, <code><a href=#the-button-element>button</a></code> elements, <code><a href=#the-input-element>input</a></code> elements whose <code title=attr-input-type><a href=#attr-input-type>type</a></code> attribute are in the <a href=#checkbox-state title=attr-input-type-checkbox>Checkbox</a> or <a href=#radio-button-state title=attr-input-type-radio>Radio Button</a> states, and <code><a href=#the-input-element>input</a></code> elements that are <a href=#concept-button title=concept-button>buttons</a><!--
+--><!--FORK--><!--
+-->.</dd> <!-- and maybe <select>, I guess? I've left it in for now, since I guess authors might make accessible selects if they're simple enough, and it's not obvious how to distinguish the simple ones from the complex ones... -->
    <dt>Content attributes:</dt>
    <dd><a href=#global-attributes>Global attributes</a></dd>
    <dd><code title=attr-canvas-width><a href=#attr-canvas-width>width</a></code></dd>

Modified: source
===================================================================
--- source	2011-06-09 06:13:15 UTC (rev 6200)
+++ source	2011-06-09 06:57:24 UTC (rev 6201)
@@ -170,6 +170,13 @@
    href="http://lists.w3.org/Archives/Public/public-html/2011May/0018.html">a
    working group chair decision from May 2011</a>.</li><!--bug 11557-->
 
+   <li>The W3C version is missing some conformance constraints that
+   would make documents misusing <code>canvas</code> invalid, because
+   of <a
+   href="http://lists.w3.org/Archives/Public/public-html/2011Jun/0083.html">a
+   working group chair decision from June 2011</a>.</li><!--bug
+   12906-->
+
   </ul>
 
   <p>Features that are part of HTML (and this specification) but that
@@ -37788,7 +37795,12 @@
    <dt>Contexts in which this element can be used:</dt>
    <dd>Where <span>embedded content</span> is expected.</dd>
    <dt>Content model:</dt>
-   <dd><span>Transparent</span>, but with no <span>interactive content</span> descendants except for <code>a</code> elements, <code>button</code> elements, <code>input</code> elements whose <code title="attr-input-type">type</code> attribute are in the <span title="attr-input-type-checkbox">Checkbox</span> or <span title="attr-input-type-radio">Radio Button</span> states, and <code>input</code> elements that are <span title="concept-button">buttons</span>.</dd> <!-- and maybe <select>, I guess -->
+   <dd><span>Transparent</span>.</dd>
+   <dd><span>Transparent</span><!--
+--><!--END w3c-html--><!--FORK--><!--
+-->, but with no <span>interactive content</span> descendants except for <code>a</code> elements, <code>button</code> elements, <code>input</code> elements whose <code title="attr-input-type">type</code> attribute are in the <span title="attr-input-type-checkbox">Checkbox</span> or <span title="attr-input-type-radio">Radio Button</span> states, and <code>input</code> elements that are <span title="concept-button">buttons</span><!--
+--><!--START w3c-html--><!--FORK--><!--
+-->.</dd> <!-- and maybe <select>, I guess? I've left it in for now, since I guess authors might make accessible selects if they're simple enough, and it's not obvious how to distinguish the simple ones from the complex ones... -->
    <dt>Content attributes:</dt>
    <dd><span>Global attributes</span></dd>
    <dd><code title="attr-canvas-width">width</code></dd>