[html5] r3692 - [c] (0) Prevent nesting <time>, <meter>, <progress>.

[whatwg at whatwg.org]

Author: ianh
Date: 2009-08-28 17:50:31 -0700 (Fri, 28 Aug 2009)
New Revision: 3692

Modified:
   index
   source
Log:
[c] (0) Prevent nesting <time>, <meter>, <progress>.

Modified: index
===================================================================
--- index	2009-08-29 00:49:07 UTC (rev 3691)
+++ index	2009-08-29 00:50:31 UTC (rev 3692)
@@ -15181,7 +15181,7 @@
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <a href=#phrasing-content>phrasing content</a> is expected.</dd>
    <dt>Content model:</dt>
-   <dd><a href=#phrasing-content>Phrasing content</a>, but there must be no descendant <code><a href=#the-dfn-element>dfn</a></code> elements.</dd>
+   <dd><a href=#phrasing-content>Phrasing content</a>, but there must be no <code><a href=#the-dfn-element>dfn</a></code> element descendants.</dd>
    <dt>Content attributes:</dt>
    <dd><a href=#global-attributes>Global attributes</a></dd>
    <dd>Also, the <code title=attr-dfn-title><a href=#attr-dfn-title>title</a></code> attribute has special semantics on this element.</dd>
@@ -15899,7 +15899,7 @@
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <a href=#phrasing-content>phrasing content</a> is expected.</dd>
    <dt>Content model:</dt>
-   <dd><a href=#phrasing-content>Phrasing content</a>.</dd>
+   <dd><a href=#phrasing-content>Phrasing content</a>, but there must be no <code><a href=#the-progress-element>progress</a></code> element descendants.</dd>
    <dt>Content attributes:</dt>
    <dd><a href=#global-attributes>Global attributes</a></dd>
    <dd><code title=attr-progress-value><a href=#attr-progress-value>value</a></code></dd>
@@ -16074,7 +16074,7 @@
 
 
   <h4 id=the-meter-element><span class=secno>4.6.18 </span>The <dfn><code>meter</code></dfn> element</h4>
-  <!-- Keep this after <progress> and NOT close to <time> -->
+  <!-- XXX Keep this after <progress> and NOT close to <time> -->
 
   <dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content>Flow content</a>.</dd>
@@ -16082,7 +16082,7 @@
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <a href=#phrasing-content>phrasing content</a> is expected.</dd>
    <dt>Content model:</dt>
-   <dd><a href=#phrasing-content>Phrasing content</a>.</dd>
+   <dd><a href=#phrasing-content>Phrasing content</a>, but there must be no <code><a href=#the-meter-element>meter</a></code> element descendants.</dd>
    <dt>Content attributes:</dt>
    <dd><a href=#global-attributes>Global attributes</a></dd>
    <dd><code title=attr-meter-value><a href=#attr-meter-value>value</a></code></dd>
@@ -16514,7 +16514,7 @@
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <a href=#phrasing-content>phrasing content</a> is expected.</dd>
    <dt>Content model:</dt>
-   <dd><a href=#phrasing-content>Phrasing content</a>.</dd>
+   <dd><a href=#phrasing-content>Phrasing content</a>, but there must be no <code><a href=#the-time-element>time</a></code> element descendants.</dd>
    <dt>Content attributes:</dt>
    <dd><a href=#global-attributes>Global attributes</a></dd>
    <dd><code title=attr-time-datetime><a href=#attr-time-datetime>datetime</a></code></dd>

Modified: source
===================================================================
--- source	2009-08-29 00:49:07 UTC (rev 3691)
+++ source	2009-08-29 00:50:31 UTC (rev 3692)
@@ -16251,7 +16251,7 @@
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <span>phrasing content</span> is expected.</dd>
    <dt>Content model:</dt>
-   <dd><span>Phrasing content</span>, but there must be no descendant <code>dfn</code> elements.</dd>
+   <dd><span>Phrasing content</span>, but there must be no <code>dfn</code> element descendants.</dd>
    <dt>Content attributes:</dt>
    <dd><span>Global attributes</span></dd>
    <dd>Also, the <code title="attr-dfn-title">title</code> attribute has special semantics on this element.</dd>
@@ -17012,7 +17012,7 @@
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <span>phrasing content</span> is expected.</dd>
    <dt>Content model:</dt>
-   <dd><span>Phrasing content</span>.</dd>
+   <dd><span>Phrasing content</span>, but there must be no <code>progress</code> element descendants.</dd>
    <dt>Content attributes:</dt>
    <dd><span>Global attributes</span></dd>
    <dd><code title="attr-progress-value">value</code></dd>
@@ -17206,7 +17206,7 @@
 
 
   <h4>The <dfn><code>meter</code></dfn> element</h4>
-  <!-- Keep this after <progress> and NOT close to <time> -->
+  <!-- XXX Keep this after <progress> and NOT close to <time> -->
 
   <dl class="element">
    <dt>Categories</dt>
@@ -17215,7 +17215,7 @@
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <span>phrasing content</span> is expected.</dd>
    <dt>Content model:</dt>
-   <dd><span>Phrasing content</span>.</dd>
+   <dd><span>Phrasing content</span>, but there must be no <code>meter</code> element descendants.</dd>
    <dt>Content attributes:</dt>
    <dd><span>Global attributes</span></dd>
    <dd><code title="attr-meter-value">value</code></dd>
@@ -17704,7 +17704,7 @@
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <span>phrasing content</span> is expected.</dd>
    <dt>Content model:</dt>
-   <dd><span>Phrasing content</span>.</dd>
+   <dd><span>Phrasing content</span>, but there must be no <code>time</code> element descendants.</dd>
    <dt>Content attributes:</dt>
    <dd><span>Global attributes</span></dd>
    <dd><code title="attr-time-datetime">datetime</code></dd>