Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[e] (0) Clean up content model descriptions.
Affected topics: HTML

git-svn-id: http://svn.whatwg.org/webapps@7238 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
Hixie committed Aug 9, 2012
1 parent 2c77faa commit 1652c20
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 102 deletions.
51 changes: 17 additions & 34 deletions complete.html
Expand Up @@ -12451,7 +12451,7 @@ <h6 id=heading-content-0><span class=secno>3.2.5.1.4 </span>Heading content</h6>
level. Runs of <a href=#phrasing-content>phrasing content</a> form <a href=#paragraph title=paragraph>paragraphs</a>.</p>

<!-- when updating this also update the category index -->
<ul class="brief category-list"><li><code><a href=#the-a-element>a</a></code> (if it contains only <a href=#phrasing-content>phrasing content</a>)</li>
<ul class="brief category-list"><li><code><a href=#the-a-element>a</a></code></li>
<li><code><a href=#the-abbr-element>abbr</a></code></li>
<li><code><a href=#the-area-element>area</a></code> (if it is a descendant of a <code><a href=#the-map-element>map</a></code> element)</li>
<li><code><a href=#the-audio-element>audio</a></code></li>
Expand All @@ -12468,22 +12468,22 @@ <h6 id=heading-content-0><span class=secno>3.2.5.1.4 </span>Heading content</h6>
<li><code><a href=#the-data-element>data</a></code></li>
<!--DATA--><!--FORK-->
<li><code><a href=#the-datalist-element>datalist</a></code></li>
<li><code><a href=#the-del-element>del</a></code> (if it contains only <a href=#phrasing-content>phrasing content</a>)</li>
<li><code><a href=#the-del-element>del</a></code></li>
<li><code><a href=#the-dfn-element>dfn</a></code></li>
<li><code><a href=#the-em-element>em</a></code></li>
<li><code><a href=#the-embed-element>embed</a></code></li>
<li><code><a href=#the-i-element>i</a></code></li>
<li><code><a href=#the-iframe-element>iframe</a></code></li>
<li><code><a href=#the-img-element>img</a></code></li>
<li><code><a href=#the-input-element>input</a></code></li>
<li><code><a href=#the-ins-element>ins</a></code> (if it contains only <a href=#phrasing-content>phrasing content</a>)</li>
<li><code><a href=#the-ins-element>ins</a></code></li>
<li><code><a href=#the-kbd-element>kbd</a></code></li>
<li><code><a href=#the-keygen-element>keygen</a></code></li>
<li><code><a href=#the-label-element>label</a></code></li>
<!--MD-->
<li><code><a href=#the-link-element>link</a></code> (if the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present)</li>
<!--MD-->
<li><code><a href=#the-map-element>map</a></code> (if it contains only <a href=#phrasing-content>phrasing content</a>)</li>
<li><code><a href=#the-map-element>map</a></code></li>
<li><code><a href=#the-mark-element>mark</a></code></li>
<li><code><a href=#math>math</a></code></li>
<!--MD-->
Expand Down Expand Up @@ -20736,12 +20736,11 @@ <h4 id=the-a-element><span class=secno>4.6.1 </span>The <dfn><code>a</code></dfn

<dl class=element><dt><a href=#element-dfn-categories title=element-dfn-categories>Categories</a>:</dt>
<dd><a href=#flow-content>Flow content</a>.</dd>
<dd>When the element only contains <a href=#phrasing-content>phrasing content</a>: <a href=#phrasing-content>phrasing content</a>.</dd>
<dd><a href=#phrasing-content>Phrasing content</a>.</dd>
<dd><a href=#interactive-content>Interactive content</a>.</dd>
<dd><a href=#palpable-content>Palpable content</a>.</dd>
<dt><a href=#element-dfn-contexts title=element-dfn-contexts>Contexts in which this element can be used</a>:</dt>
<dd>When the element only contains <a href=#phrasing-content>phrasing content</a>: where <a href=#phrasing-content>phrasing content</a> is expected.</dd>
<dd>Otherwise: where <a href=#flow-content>flow content</a> is expected.</dd>
<dd>Where <a href=#phrasing-content>phrasing content</a> is expected.</dd>
<dt><a href=#element-dfn-content-model title=element-dfn-content-model>Content model</a>:</dt>
<dd><a href=#transparent>Transparent</a>, but there must be no <a href=#interactive-content>interactive content</a> descendant.</dd>
<dt><a href=#element-dfn-attributes title=element-dfn-attributes>Content attributes</a>:</dt>
Expand Down Expand Up @@ -23245,11 +23244,10 @@ <h4 id=the-ins-element><span class=secno>4.7.1 </span>The <dfn><code>ins</code><

<dl class=element><dt><a href=#element-dfn-categories title=element-dfn-categories>Categories</a>:</dt>
<dd><a href=#flow-content>Flow content</a>.</dd>
<dd>When the element only contains <a href=#phrasing-content>phrasing content</a>: <a href=#phrasing-content>phrasing content</a>.</dd>
<dd><a href=#phrasing-content>Phrasing content</a>.</dd>
<dd><a href=#palpable-content>Palpable content</a>.</dd>
<dt><a href=#element-dfn-contexts title=element-dfn-contexts>Contexts in which this element can be used</a>:</dt>
<dd>When the element only contains <a href=#phrasing-content>phrasing content</a>: where <a href=#phrasing-content>phrasing content</a> is expected.</dd>
<dd>Otherwise: where <a href=#flow-content>flow content</a> is expected.</dd>
<dd>Where <a href=#phrasing-content>phrasing content</a> is expected.</dd>
<dt><a href=#element-dfn-content-model title=element-dfn-content-model>Content model</a>:</dt>
<dd><a href=#transparent>Transparent</a>.</dd>
<dt><a href=#element-dfn-attributes title=element-dfn-attributes>Content attributes</a>:</dt>
Expand Down Expand Up @@ -23331,10 +23329,9 @@ <h4 id=the-del-element><span class=secno>4.7.2 </span>The <dfn><code>del</code><

<dl class=element><dt><a href=#element-dfn-categories title=element-dfn-categories>Categories</a>:</dt>
<dd><a href=#flow-content>Flow content</a>.</dd>
<dd>When the element only contains <a href=#phrasing-content>phrasing content</a>: <a href=#phrasing-content>phrasing content</a>.</dd>
<dd><a href=#phrasing-content>Phrasing content</a>.</dd>
<dt><a href=#element-dfn-contexts title=element-dfn-contexts>Contexts in which this element can be used</a>:</dt>
<dd>When the element only contains <a href=#phrasing-content>phrasing content</a>: where <a href=#phrasing-content>phrasing content</a> is expected.</dd>
<dd>Otherwise: where <a href=#flow-content>flow content</a> is expected.</dd>
<dd>Where <a href=#phrasing-content>phrasing content</a> is expected.</dd>
<dt><a href=#element-dfn-content-model title=element-dfn-content-model>Content model</a>:</dt>
<dd><a href=#transparent>Transparent</a>.</dd>
<dt><a href=#element-dfn-attributes title=element-dfn-attributes>Content attributes</a>:</dt>
Expand Down Expand Up @@ -41351,11 +41348,10 @@ <h4 id=the-map-element><span class=secno>4.8.12 </span>The <dfn><code>map</code>

<dl class=element><dt><a href=#element-dfn-categories title=element-dfn-categories>Categories</a>:</dt>
<dd><a href=#flow-content>Flow content</a>.</dd>
<dd>When the element only contains <a href=#phrasing-content>phrasing content</a>: <a href=#phrasing-content>phrasing content</a>.</dd>
<dd><a href=#phrasing-content>Phrasing content</a>.</dd>
<dd><a href=#palpable-content>Palpable content</a>.</dd>
<dt><a href=#element-dfn-contexts title=element-dfn-contexts>Contexts in which this element can be used</a>:</dt>
<dd>When the element only contains <a href=#phrasing-content>phrasing content</a>: where <a href=#phrasing-content>phrasing content</a> is expected.</dd>
<dd>Otherwise: where <a href=#flow-content>flow content</a> is expected.</dd>
<dd>Where <a href=#phrasing-content>phrasing content</a> is expected.</dd>
<dt><a href=#element-dfn-content-model title=element-dfn-content-model>Content model</a>:</dt>
<dd><a href=#transparent>Transparent</a>.</dd>
<dt><a href=#element-dfn-attributes title=element-dfn-attributes>Content attributes</a>:</dt>
Expand Down Expand Up @@ -102365,9 +102361,7 @@ <h3 class=no-num id=element-content-categories>Element content categories</h3>
<code><a href=#the-cite-element>cite</a></code>;
<code><a href=#the-code-element>code</a></code>;
<code><a href=#the-command-element>command</a></code>;
<!--DATA--><!--FORK-->
<code><a href=#the-data-element>data</a></code>;
<!--DATA--><!--FORK-->
<code><a href=#the-datalist-element>datalist</a></code>;
<code><a href=#the-del-element>del</a></code>;
<code><a href=#the-details-element>details</a></code>;
Expand Down Expand Up @@ -102435,10 +102429,8 @@ <h3 class=no-num id=element-content-categories>Element content categories</h3>
<a href=#text-content title="text content">Text</a>
<td>
<code><a href=#the-area-element>area</a></code> (if it is a descendant of a <code><a href=#the-map-element>map</a></code> element);
<!--MD-->
<code><a href=#the-link-element>link</a></code> (if the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present);
<code><a href=#the-meta-element>meta</a></code> (if the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present);
<!--MD-->
<code><a href=#the-style-element>style</a></code> (if the <code title=attr-style-scoped><a href=#attr-style-scoped>scoped</a></code> attribute is present)

<tr><td> <a href=#sectioning-content>Sectioning content</a>
Expand All @@ -102464,6 +102456,7 @@ <h3 class=no-num id=element-content-categories>Element content categories</h3>

<tr><td> <a href=#phrasing-content>Phrasing content</a>
<td>
<code><a href=#the-a-element>a</a></code>;
<code><a href=#the-abbr-element>abbr</a></code>;
<code><a href=#the-audio-element>audio</a></code>;
<code><a href=#the-b-element>b</a></code>;
Expand All @@ -102475,20 +102468,21 @@ <h3 class=no-num id=element-content-categories>Element content categories</h3>
<code><a href=#the-cite-element>cite</a></code>;
<code><a href=#the-code-element>code</a></code>;
<code><a href=#the-command-element>command</a></code>;
<!--DATA--><!--FORK-->
<code><a href=#the-data-element>data</a></code>;
<!--DATA--><!--FORK-->
<code><a href=#the-datalist-element>datalist</a></code>;
<code><a href=#the-del-element>del</a></code>;
<code><a href=#the-dfn-element>dfn</a></code>;
<code><a href=#the-em-element>em</a></code>;
<code><a href=#the-embed-element>embed</a></code>;
<code><a href=#the-i-element>i</a></code>;
<code><a href=#the-iframe-element>iframe</a></code>;
<code><a href=#the-img-element>img</a></code>;
<code><a href=#the-input-element>input</a></code>;
<code><a href=#the-ins-element>ins</a></code>;
<code><a href=#the-kbd-element>kbd</a></code>;
<code><a href=#the-keygen-element>keygen</a></code>;
<code><a href=#the-label-element>label</a></code>;
<code><a href=#the-map-element>map</a></code>;
<code><a href=#the-mark-element>mark</a></code>;
<code><a href=#math>math</a></code>;
<code><a href=#the-meter-element>meter</a></code>;
Expand Down Expand Up @@ -102516,18 +102510,9 @@ <h3 class=no-num id=element-content-categories>Element content categories</h3>
<code><a href=#the-wbr-element>wbr</a></code>;
<a href=#text-content title="text content">Text</a>
<td>
<code><a href=#the-a-element>a</a></code> (if it contains only <a href=#phrasing-content>phrasing content</a>);
<code><a href=#the-area-element>area</a></code> (if it is a descendant of a <code><a href=#the-map-element>map</a></code> element);
<code><a href=#the-del-element>del</a></code> (if it contains only <a href=#phrasing-content>phrasing content</a>);
<code><a href=#the-ins-element>ins</a></code> (if it contains only <a href=#phrasing-content>phrasing content</a>);
<!--MD-->
<code><a href=#the-link-element>link</a></code> (if the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present);
<!--MD-->
<code><a href=#the-map-element>map</a></code> (if it contains only <a href=#phrasing-content>phrasing content</a>)<!--
--><!--MD--><!--
-->; <code><a href=#the-meta-element>meta</a></code> (if the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present)<!--
--><!--MD--><!--
-->
<code><a href=#the-meta-element>meta</a></code> (if the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present)

<tr><td> <a href=#embedded-content>Embedded content</a>
<td>
Expand Down Expand Up @@ -102650,9 +102635,7 @@ <h3 class=no-num id=element-content-categories>Element content categories</h3>
<code><a href=#the-canvas-element>canvas</a></code>;
<code><a href=#the-cite-element>cite</a></code>;
<code><a href=#the-code-element>code</a></code>;
<!--DATA--><!--FORK-->
<code><a href=#the-data-element>data</a></code>;
<!--DATA--><!--FORK-->
<code><a href=#the-details-element>details</a></code>;
<code><a href=#the-dfn-element>dfn</a></code>;
<code><a href=#the-div-element>div</a></code>;
Expand Down

0 comments on commit 1652c20

Please sign in to comment.