[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 git-svn-id: http://svn.whatwg.org/webapps@7817 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Apr 11, 2013 · 25735a1 · 25735a1
1 parent 7f2630b
commit 25735a1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/complete.html b/complete.html
@@ -15759,7 +15759,7 @@ <h4 id=the-nav-element><span class=secno>4.4.4 </span>The <dfn><code>nav</code><
    <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 @@ <h4 id=the-aside-element><span class=secno>4.4.5 </span>The <dfn><code>aside</co
    <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 @@ <h4 id=the-header-element><span class=secno>4.4.8 </span>The <dfn><code>header</
    <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 @@ <h4 id=the-footer-element><span class=secno>4.4.9 </span>The <dfn><code>footer</
    <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>

diff --git a/index b/index
@@ -15759,7 +15759,7 @@ not-slash     = %x0000-002E / %x0030-10FFFF
    <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 @@ not-slash     = %x0000-002E / %x0030-10FFFF
    <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 @@ Space is not the only void</pre>
    <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 @@ Space is not the only void</pre>
    <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>

diff --git a/source b/source
@@ -16377,7 +16377,7 @@ not-slash     = %x0000-002E / %x0030-10FFFF
    <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 @@ not-slash     = %x0000-002E / %x0030-10FFFF
    <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 @@ Space is not the only void</pre>
    <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 @@ Space is not the only void</pre>
    <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-->