[html5] r7817 - [ac] (0) Restrict <main> from having <aside>, <footer>, <header>, or <nav> ances [...]

whatwg at whatwg.org whatwg at whatwg.org
Thu Apr 11 16:06:49 PDT 2013


Author: ianh
Date: 2013-04-11 16:06:48 -0700 (Thu, 11 Apr 2013)
New Revision: 7817

Modified:
   complete.html
   index
   source
Log:
[ac] (0) Restrict <main> from having <aside>, <footer>, <header>, or <nav> ancestors
Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=21553
Affected topics: HTML

Modified: complete.html
===================================================================
--- complete.html	2013-04-11 22:43:52 UTC (rev 7816)
+++ complete.html	2013-04-11 23:06:48 UTC (rev 7817)
@@ -15759,7 +15759,7 @@
    <dt><a href=#element-dfn-contexts title=element-dfn-contexts>Contexts in which this element can be used</a>:</dt>
    <dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
    <dt><a href=#element-dfn-content-model title=element-dfn-content-model>Content model</a>:</dt>
-   <dd><a href=#flow-content>Flow content</a>.</dd>
+   <dd><a href=#flow-content>Flow content</a>, but with no <code><a href=#the-main-element>main</a></code> element descendants.</dd>
    <dt><a href=#element-dfn-tag-omission title=element-dfn-tag-omission>Tag omission in text/html</a>:</dt>
    <dd>Neither tag is omissible.</dd>
    <dt><a href=#element-dfn-attributes title=element-dfn-attributes>Content attributes</a>:</dt>
@@ -15920,7 +15920,7 @@
    <dt><a href=#element-dfn-contexts title=element-dfn-contexts>Contexts in which this element can be used</a>:</dt>
    <dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
    <dt><a href=#element-dfn-content-model title=element-dfn-content-model>Content model</a>:</dt>
-   <dd><a href=#flow-content>Flow content</a>.</dd>
+   <dd><a href=#flow-content>Flow content</a>, but with no <code><a href=#the-main-element>main</a></code> element descendants.</dd>
    <dt><a href=#element-dfn-tag-omission title=element-dfn-tag-omission>Tag omission in text/html</a>:</dt>
    <dd>Neither tag is omissible.</dd>
    <dt><a href=#element-dfn-attributes title=element-dfn-attributes>Content attributes</a>:</dt>
@@ -16206,8 +16206,7 @@
    <dt><a href=#element-dfn-contexts title=element-dfn-contexts>Contexts in which this element can be used</a>:</dt>
    <dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
    <dt><a href=#element-dfn-content-model title=element-dfn-content-model>Content model</a>:</dt>
-   <dd><a href=#flow-content>Flow content</a>, but with no <code><a href=#the-header-element>header</a></code> or
-   <code><a href=#the-footer-element>footer</a></code> element descendants.</dd>
+   <dd><a href=#flow-content>Flow content</a>, but with no <code><a href=#the-header-element>header</a></code>, <code><a href=#the-footer-element>footer</a></code>, or <code><a href=#the-main-element>main</a></code> element descendants.</dd>
    <dt><a href=#element-dfn-tag-omission title=element-dfn-tag-omission>Tag omission in text/html</a>:</dt>
    <dd>Neither tag is omissible.</dd>
    <dt><a href=#element-dfn-attributes title=element-dfn-attributes>Content attributes</a>:</dt>
@@ -16301,8 +16300,7 @@
    <dt><a href=#element-dfn-contexts title=element-dfn-contexts>Contexts in which this element can be used</a>:</dt>
    <dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
    <dt><a href=#element-dfn-content-model title=element-dfn-content-model>Content model</a>:</dt>
-   <dd><a href=#flow-content>Flow content</a>, but with no <code><a href=#the-header-element>header</a></code> or
-   <code><a href=#the-footer-element>footer</a></code> element descendants.</dd>
+   <dd><a href=#flow-content>Flow content</a>, but with no <code><a href=#the-header-element>header</a></code>, <code><a href=#the-footer-element>footer</a></code>, or <code><a href=#the-main-element>main</a></code> element descendants.</dd>
    <dt><a href=#element-dfn-tag-omission title=element-dfn-tag-omission>Tag omission in text/html</a>:</dt>
    <dd>Neither tag is omissible.</dd>
    <dt><a href=#element-dfn-attributes title=element-dfn-attributes>Content attributes</a>:</dt>

Modified: index
===================================================================
--- index	2013-04-11 22:43:52 UTC (rev 7816)
+++ index	2013-04-11 23:06:48 UTC (rev 7817)
@@ -15759,7 +15759,7 @@
    <dt><a href=#element-dfn-contexts title=element-dfn-contexts>Contexts in which this element can be used</a>:</dt>
    <dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
    <dt><a href=#element-dfn-content-model title=element-dfn-content-model>Content model</a>:</dt>
-   <dd><a href=#flow-content>Flow content</a>.</dd>
+   <dd><a href=#flow-content>Flow content</a>, but with no <code><a href=#the-main-element>main</a></code> element descendants.</dd>
    <dt><a href=#element-dfn-tag-omission title=element-dfn-tag-omission>Tag omission in text/html</a>:</dt>
    <dd>Neither tag is omissible.</dd>
    <dt><a href=#element-dfn-attributes title=element-dfn-attributes>Content attributes</a>:</dt>
@@ -15920,7 +15920,7 @@
    <dt><a href=#element-dfn-contexts title=element-dfn-contexts>Contexts in which this element can be used</a>:</dt>
    <dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
    <dt><a href=#element-dfn-content-model title=element-dfn-content-model>Content model</a>:</dt>
-   <dd><a href=#flow-content>Flow content</a>.</dd>
+   <dd><a href=#flow-content>Flow content</a>, but with no <code><a href=#the-main-element>main</a></code> element descendants.</dd>
    <dt><a href=#element-dfn-tag-omission title=element-dfn-tag-omission>Tag omission in text/html</a>:</dt>
    <dd>Neither tag is omissible.</dd>
    <dt><a href=#element-dfn-attributes title=element-dfn-attributes>Content attributes</a>:</dt>
@@ -16206,8 +16206,7 @@
    <dt><a href=#element-dfn-contexts title=element-dfn-contexts>Contexts in which this element can be used</a>:</dt>
    <dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
    <dt><a href=#element-dfn-content-model title=element-dfn-content-model>Content model</a>:</dt>
-   <dd><a href=#flow-content>Flow content</a>, but with no <code><a href=#the-header-element>header</a></code> or
-   <code><a href=#the-footer-element>footer</a></code> element descendants.</dd>
+   <dd><a href=#flow-content>Flow content</a>, but with no <code><a href=#the-header-element>header</a></code>, <code><a href=#the-footer-element>footer</a></code>, or <code><a href=#the-main-element>main</a></code> element descendants.</dd>
    <dt><a href=#element-dfn-tag-omission title=element-dfn-tag-omission>Tag omission in text/html</a>:</dt>
    <dd>Neither tag is omissible.</dd>
    <dt><a href=#element-dfn-attributes title=element-dfn-attributes>Content attributes</a>:</dt>
@@ -16301,8 +16300,7 @@
    <dt><a href=#element-dfn-contexts title=element-dfn-contexts>Contexts in which this element can be used</a>:</dt>
    <dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
    <dt><a href=#element-dfn-content-model title=element-dfn-content-model>Content model</a>:</dt>
-   <dd><a href=#flow-content>Flow content</a>, but with no <code><a href=#the-header-element>header</a></code> or
-   <code><a href=#the-footer-element>footer</a></code> element descendants.</dd>
+   <dd><a href=#flow-content>Flow content</a>, but with no <code><a href=#the-header-element>header</a></code>, <code><a href=#the-footer-element>footer</a></code>, or <code><a href=#the-main-element>main</a></code> element descendants.</dd>
    <dt><a href=#element-dfn-tag-omission title=element-dfn-tag-omission>Tag omission in text/html</a>:</dt>
    <dd>Neither tag is omissible.</dd>
    <dt><a href=#element-dfn-attributes title=element-dfn-attributes>Content attributes</a>:</dt>

Modified: source
===================================================================
--- source	2013-04-11 22:43:52 UTC (rev 7816)
+++ source	2013-04-11 23:06:48 UTC (rev 7817)
@@ -16377,7 +16377,7 @@
    <dt><span title="element-dfn-contexts">Contexts in which this element can be used</span>:</dt>
    <dd>Where <span>flow content</span> is expected.</dd>
    <dt><span title="element-dfn-content-model">Content model</span>:</dt>
-   <dd><span>Flow content</span>.</dd>
+   <dd><span>Flow content</span>, but with no <code>main</code> element descendants.</dd>
    <dt><span title="element-dfn-attributes">Content attributes</span>:</dt>
    <dd><span>Global attributes</span></dd>
    <dt><span title="element-dfn-dom">DOM interface</span>:</dt><!--TOPIC:DOM APIs-->
@@ -16539,7 +16539,7 @@
    <dt><span title="element-dfn-contexts">Contexts in which this element can be used</span>:</dt>
    <dd>Where <span>flow content</span> is expected.</dd>
    <dt><span title="element-dfn-content-model">Content model</span>:</dt>
-   <dd><span>Flow content</span>.</dd>
+   <dd><span>Flow content</span>, but with no <code>main</code> element descendants.</dd>
    <dt><span title="element-dfn-attributes">Content attributes</span>:</dt>
    <dd><span>Global attributes</span></dd>
    <dt><span title="element-dfn-dom">DOM interface</span>:</dt><!--TOPIC:DOM APIs-->
@@ -16831,8 +16831,7 @@
    <dt><span title="element-dfn-contexts">Contexts in which this element can be used</span>:</dt>
    <dd>Where <span>flow content</span> is expected.</dd>
    <dt><span title="element-dfn-content-model">Content model</span>:</dt>
-   <dd><span>Flow content</span>, but with no <code>header</code> or
-   <code>footer</code> element descendants.</dd>
+   <dd><span>Flow content</span>, but with no <code>header</code>, <code>footer</code>, or <code>main</code> element descendants.</dd>
    <dt><span title="element-dfn-attributes">Content attributes</span>:</dt>
    <dd><span>Global attributes</span></dd>
    <dt><span title="element-dfn-dom">DOM interface</span>:</dt><!--TOPIC:DOM APIs-->
@@ -16927,8 +16926,7 @@
    <dt><span title="element-dfn-contexts">Contexts in which this element can be used</span>:</dt>
    <dd>Where <span>flow content</span> is expected.</dd>
    <dt><span title="element-dfn-content-model">Content model</span>:</dt>
-   <dd><span>Flow content</span>, but with no <code>header</code> or
-   <code>footer</code> element descendants.</dd>
+   <dd><span>Flow content</span>, but with no <code>header</code>, <code>footer</code>, or <code>main</code> element descendants.</dd>
    <dt><span title="element-dfn-attributes">Content attributes</span>:</dt>
    <dd><span>Global attributes</span></dd>
    <dt><span title="element-dfn-dom">DOM interface</span>:</dt><!--TOPIC:DOM APIs-->




More information about the Commit-Watchers mailing list