[html5] r7238 - [e] (0) Clean up content model descriptions. Affected topics: HTML

whatwg at whatwg.org whatwg at whatwg.org
Thu Aug 9 16:03:07 PDT 2012


Author: ianh
Date: 2012-08-09 16:03:05 -0700 (Thu, 09 Aug 2012)
New Revision: 7238

Modified:
   complete.html
   index
   source
Log:
[e] (0) Clean up content model descriptions.
Affected topics: HTML

Modified: complete.html
===================================================================
--- complete.html	2012-08-09 22:25:56 UTC (rev 7237)
+++ complete.html	2012-08-09 23:03:05 UTC (rev 7238)
@@ -12451,7 +12451,7 @@
   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>
@@ -12468,7 +12468,7 @@
    <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>
@@ -12476,14 +12476,14 @@
    <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-->
@@ -20736,12 +20736,11 @@
 
   <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>
@@ -23245,11 +23244,10 @@
 
   <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>
@@ -23331,10 +23329,9 @@
 
   <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>
@@ -41351,11 +41348,10 @@
 
   <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>
@@ -102365,9 +102361,7 @@
       <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>;
@@ -102435,10 +102429,8 @@
       <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>
@@ -102464,6 +102456,7 @@
 
     <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>;
@@ -102475,10 +102468,9 @@
       <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>;
@@ -102486,9 +102478,11 @@
       <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>;
@@ -102516,18 +102510,9 @@
       <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>
@@ -102650,9 +102635,7 @@
       <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>;

Modified: index
===================================================================
--- index	2012-08-09 22:25:56 UTC (rev 7237)
+++ index	2012-08-09 23:03:05 UTC (rev 7238)
@@ -12451,7 +12451,7 @@
   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>
@@ -12468,7 +12468,7 @@
    <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>
@@ -12476,14 +12476,14 @@
    <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-->
@@ -20736,12 +20736,11 @@
 
   <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>
@@ -23245,11 +23244,10 @@
 
   <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>
@@ -23331,10 +23329,9 @@
 
   <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>
@@ -41351,11 +41348,10 @@
 
   <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>
@@ -102365,9 +102361,7 @@
       <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>;
@@ -102435,10 +102429,8 @@
       <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>
@@ -102464,6 +102456,7 @@
 
     <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>;
@@ -102475,10 +102468,9 @@
       <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>;
@@ -102486,9 +102478,11 @@
       <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>;
@@ -102516,18 +102510,9 @@
       <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>
@@ -102650,9 +102635,7 @@
       <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>;

Modified: source
===================================================================
--- source	2012-08-09 22:25:56 UTC (rev 7237)
+++ source	2012-08-09 23:03:05 UTC (rev 7238)
@@ -13004,7 +13004,7 @@
 
   <!-- when updating this also update the category index -->
   <ul class="brief category-list">
-   <li><code>a</code> (if it contains only <span>phrasing content</span>)</li>
+   <li><code>a</code></li>
    <li><code>abbr</code></li>
    <li><code>area</code> (if it is a descendant of a <code>map</code> element)</li>
    <li><code>audio</code></li>
@@ -13021,7 +13021,7 @@
    <li><code>data</code></li>
 <!--START w3c-html--><!--DATA--><!--FORK-->
    <li><code>datalist</code></li>
-   <li><code>del</code> (if it contains only <span>phrasing content</span>)</li>
+   <li><code>del</code></li>
    <li><code>dfn</code></li>
    <li><code>em</code></li>
    <li><code>embed</code></li>
@@ -13029,14 +13029,14 @@
    <li><code>iframe</code></li>
    <li><code>img</code></li>
    <li><code>input</code></li>
-   <li><code>ins</code> (if it contains only <span>phrasing content</span>)</li>
+   <li><code>ins</code></li>
    <li><code>kbd</code></li>
    <li><code>keygen</code></li>
    <li><code>label</code></li>
 <!--END w3c-html--><!--MD-->
    <li><code>link</code> (if the <code title="attr-itemprop">itemprop</code> attribute is present)</li>
 <!--START w3c-html--><!--MD-->
-   <li><code>map</code> (if it contains only <span>phrasing content</span>)</li>
+   <li><code>map</code></li>
    <li><code>mark</code></li>
    <li><code>math</code></li>
 <!--END w3c-html--><!--MD-->
@@ -22221,12 +22221,11 @@
   <dl class="element">
    <dt><span title="element-dfn-categories">Categories</span>:</dt>
    <dd><span>Flow content</span>.</dd>
-   <dd>When the element only contains <span>phrasing content</span>: <span>phrasing content</span>.</dd>
+   <dd><span>Phrasing content</span>.</dd>
    <dd><span>Interactive content</span>.</dd>
    <dd><span>Palpable content</span>.</dd>
    <dt><span title="element-dfn-contexts">Contexts in which this element can be used</span>:</dt>
-   <dd>When the element only contains <span>phrasing content</span>: where <span>phrasing content</span> is expected.</dd>
-   <dd>Otherwise: where <span>flow content</span> is expected.</dd>
+   <dd>Where <span>phrasing content</span> is expected.</dd>
    <dt><span title="element-dfn-content-model">Content model</span>:</dt>
    <dd><span>Transparent</span>, but there must be no <span>interactive content</span> descendant.</dd>
    <dt><span title="element-dfn-attributes">Content attributes</span>:</dt>
@@ -24932,11 +24931,10 @@
   <dl class="element">
    <dt><span title="element-dfn-categories">Categories</span>:</dt>
    <dd><span>Flow content</span>.</dd>
-   <dd>When the element only contains <span>phrasing content</span>: <span>phrasing content</span>.</dd>
+   <dd><span>Phrasing content</span>.</dd>
    <dd><span>Palpable content</span>.</dd>
    <dt><span title="element-dfn-contexts">Contexts in which this element can be used</span>:</dt>
-   <dd>When the element only contains <span>phrasing content</span>: where <span>phrasing content</span> is expected.</dd>
-   <dd>Otherwise: where <span>flow content</span> is expected.</dd>
+   <dd>Where <span>phrasing content</span> is expected.</dd>
    <dt><span title="element-dfn-content-model">Content model</span>:</dt>
    <dd><span>Transparent</span>.</dd>
    <dt><span title="element-dfn-attributes">Content attributes</span>:</dt>
@@ -25022,10 +25020,9 @@
   <dl class="element">
    <dt><span title="element-dfn-categories">Categories</span>:</dt>
    <dd><span>Flow content</span>.</dd>
-   <dd>When the element only contains <span>phrasing content</span>: <span>phrasing content</span>.</dd>
+   <dd><span>Phrasing content</span>.</dd>
    <dt><span title="element-dfn-contexts">Contexts in which this element can be used</span>:</dt>
-   <dd>When the element only contains <span>phrasing content</span>: where <span>phrasing content</span> is expected.</dd>
-   <dd>Otherwise: where <span>flow content</span> is expected.</dd>
+   <dd>Where <span>phrasing content</span> is expected.</dd>
    <dt><span title="element-dfn-content-model">Content model</span>:</dt>
    <dd><span>Transparent</span>.</dd>
    <dt><span title="element-dfn-attributes">Content attributes</span>:</dt>
@@ -48283,11 +48280,10 @@
   <dl class="element">
    <dt><span title="element-dfn-categories">Categories</span>:</dt>
    <dd><span>Flow content</span>.</dd>
-   <dd>When the element only contains <span>phrasing content</span>: <span>phrasing content</span>.</dd>
+   <dd><span>Phrasing content</span>.</dd>
    <dd><span>Palpable content</span>.</dd>
    <dt><span title="element-dfn-contexts">Contexts in which this element can be used</span>:</dt>
-   <dd>When the element only contains <span>phrasing content</span>: where <span>phrasing content</span> is expected.</dd>
-   <dd>Otherwise: where <span>flow content</span> is expected.</dd>
+   <dd>Where <span>phrasing content</span> is expected.</dd>
    <dt><span title="element-dfn-content-model">Content model</span>:</dt>
    <dd><span>Transparent</span>.</dd>
    <dt><span title="element-dfn-attributes">Content attributes</span>:</dt>
@@ -119801,9 +119797,7 @@
       <code>cite</code>;
       <code>code</code>;
       <code>command</code>;
-<!--END w3c-html--><!--DATA--><!--FORK-->
       <code>data</code>;
-<!--START w3c-html--><!--DATA--><!--FORK-->
       <code>datalist</code>;
       <code>del</code>;
       <code>details</code>;
@@ -119871,10 +119865,8 @@
       <span title="text content">Text</span>
      <td>
       <code>area</code> (if it is a descendant of a <code>map</code> element);
-      <!--END w3c-html--><!--MD-->
       <code>link</code> (if the <code title="attr-itemprop">itemprop</code> attribute is present);
       <code>meta</code> (if the <code title="attr-itemprop">itemprop</code> attribute is present);
-      <!--START w3c-html--><!--MD-->
       <code>style</code> (if the <code title="attr-style-scoped">scoped</code> attribute is present)
 
     <tr>
@@ -119903,6 +119895,7 @@
     <tr>
      <td> <span>Phrasing content</span>
      <td>
+      <code>a</code>;
       <code>abbr</code>;
       <code>audio</code>;
       <code>b</code>;
@@ -119914,10 +119907,9 @@
       <code>cite</code>;
       <code>code</code>;
       <code>command</code>;
-<!--END w3c-html--><!--DATA--><!--FORK-->
       <code>data</code>;
-<!--START w3c-html--><!--DATA--><!--FORK-->
       <code>datalist</code>;
+      <code>del</code>;
       <code>dfn</code>;
       <code>em</code>;
       <code>embed</code>;
@@ -119925,9 +119917,11 @@
       <code>iframe</code>;
       <code>img</code>;
       <code>input</code>;
+      <code>ins</code>;
       <code>kbd</code>;
       <code>keygen</code>;
       <code>label</code>;
+      <code>map</code>;
       <code>mark</code>;
       <code>math</code>;
       <code>meter</code>;
@@ -119955,18 +119949,9 @@
       <code>wbr</code>;
       <span title="text content">Text</span>
      <td>
-      <code>a</code> (if it contains only <span>phrasing content</span>);
       <code>area</code> (if it is a descendant of a  <code>map</code> element);
-      <code>del</code> (if it contains only <span>phrasing content</span>);
-      <code>ins</code> (if it contains only <span>phrasing content</span>);
-      <!--END w3c-html--><!--MD-->
       <code>link</code> (if the <code title="attr-itemprop">itemprop</code> attribute is present);
-      <!--START w3c-html--><!--MD-->
-      <code>map</code> (if it contains only <span>phrasing content</span>)<!--
-      --><!--END w3c-html--><!--MD--><!--
-      -->; <code>meta</code> (if the <code title="attr-itemprop">itemprop</code> attribute is present)<!--
-      --><!--START w3c-html--><!--MD--><!--
-      -->
+      <code>meta</code> (if the <code title="attr-itemprop">itemprop</code> attribute is present)
 
     <tr>
      <td> <span>Embedded content</span>
@@ -120098,9 +120083,7 @@
       <code>canvas</code>;
       <code>cite</code>;
       <code>code</code>;
-<!--END w3c-html--><!--DATA--><!--FORK-->
       <code>data</code>;
-<!--START w3c-html--><!--DATA--><!--FORK-->
       <code>details</code>;
       <code>dfn</code>;
       <code>div</code>;




More information about the Commit-Watchers mailing list