W3C home > Mailing lists > Public > public-html-commits@w3.org > August 2009

html5/spec Overview.html,1.2870,1.2871

From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
Date: Sat, 29 Aug 2009 00:48:37 +0000
To: public-html-commits@w3.org
Message-Id: <E1MhC7R-0005B9-OI@lionel-hutz.w3.org>
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv19893

Modified Files:
	Overview.html 
Log Message:
Prevent nesting <time>, <meter>, <progress>. (whatwg r3692)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.2870
retrieving revision 1.2871
diff -u -d -r1.2870 -r1.2871
--- Overview.html	29 Aug 2009 00:47:10 -0000	1.2870
+++ Overview.html	29 Aug 2009 00:48:34 -0000	1.2871
@@ -13307,7 +13307,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>
@@ -13871,7 +13871,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>
@@ -14026,13 +14026,13 @@
   attribute must return &minus;1. Otherwise, it must return the result of
   dividing the current value by the maximum value.</p>
 
-  </div><h4 id="the-meter-element"><span class="secno">4.6.18 </span>The <dfn><code>meter</code></dfn> element</h4><p class="XXX annotation"><b>Status: </b><i>Working draft</i></p><!-- Keep this after <progress> and NOT close to <time> --><dl class="element"><dt>Categories</dt>
+  </div><h4 id="the-meter-element"><span class="secno">4.6.18 </span>The <dfn><code>meter</code></dfn> element</h4><p class="XXX annotation"><b>Status: </b><i>Working draft</i></p><!-- 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>
    <dd><a href="#phrasing-content">Phrasing content</a>.</dd>
    <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>
@@ -14429,7 +14429,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>
@@ -15335,7 +15335,7 @@
  &lt;legend&gt;The castle through the ages: 1423, 1858, and 1999 respectively.&lt;/legend&gt;
 &lt;/figure&gt;</pre>
 
-  </div><h4 id="the-img-element"><span class="secno">4.8.2 </span>The <dfn><code>img</code></dfn> element</h4><p class="XXX annotation"><b>Status: </b><i>Last call for comments. </i><span><a href="http://www.w3.org/html/wg/tracker/issues/30">ISSUE-30</a> (longdesc) and <a href="http://www.w3.org/html/wg/tracker/issues/66">ISSUE-66</a> (image-analysis) block progress to Last Call</span><dl class="element"><dt>Categories</dt>
+  </div><h4 id="the-img-element"><span class="secno">4.8.2 </span>The <dfn><code>img</code></dfn> element</h4><p class="XXX annotation"><b>Status: </b><i>Last call for comments. </i><span><a href="http://www.w3.org/html/wg/tracker/issues/66">ISSUE-66</a> (image-analysis) and <a href="http://www.w3.org/html/wg/tracker/issues/30">ISSUE-30</a> (longdesc) block progress to Last Call</span><dl class="element"><dt>Categories</dt>
    <dd><a href="#flow-content">Flow content</a>.</dd>
    <dd><a href="#phrasing-content">Phrasing content</a>.</dd>
    <dd><a href="#embedded-content">Embedded content</a>.</dd>
@@ -17589,7 +17589,7 @@
   <a href="#reflect">reflect</a> the respective content attributes of the same
   name.</p>
 
-  </div><h4 id="video"><span class="secno">4.8.7 </span>The <dfn><code>video</code></dfn> element</h4><p class="XXX annotation"><b>Status: </b><i>Last call for comments. </i><span><a href="http://www.w3.org/html/wg/tracker/issues/7">ISSUE-7</a> (video-codecs), <a href="http://www.w3.org/html/wg/tracker/issues/9">ISSUE-9</a> (video-synchronization) and <a href="http://www.w3.org/html/wg/tracker/issues/10">ISSUE-10</a> (video-smil) block progress to Last Call</span><dl class="element"><dt>Categories</dt>
+  </div><h4 id="video"><span class="secno">4.8.7 </span>The <dfn><code>video</code></dfn> element</h4><p class="XXX annotation"><b>Status: </b><i>Last call for comments. </i><span><a href="http://www.w3.org/html/wg/tracker/issues/9">ISSUE-9</a> (video-synchronization), <a href="http://www.w3.org/html/wg/tracker/issues/10">ISSUE-10</a> (video-smil) and <a href="http://www.w3.org/html/wg/tracker/issues/7">ISSUE-7</a> (video-codecs) block progress to Last Call</span><dl class="element"><dt>Categories</dt>
    <dd><a href="#flow-content">Flow content</a>.</dd>
    <dd><a href="#phrasing-content">Phrasing content</a>.</dd>
    <dd><a href="#embedded-content">Embedded content</a>.</dd>
Received on Saturday, 29 August 2009 00:48:51 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Saturday, 29 August 2009 00:48:51 GMT