[html5] r5054 - [acgiow] (0) Make <figcaption> accept flow again. Also clarify an exception hand [...]
whatwg at whatwg.org
whatwg at whatwg.org
Thu Apr 15 00:12:16 PDT 2010
Author: ianh
Date: 2010-04-15 00:12:14 -0700 (Thu, 15 Apr 2010)
New Revision: 5054
Modified:
complete.html
index
source
Log:
[acgiow] (0) Make <figcaption> accept flow again. Also clarify an exception handling case that was ambiguous.
Modified: complete.html
===================================================================
--- complete.html 2010-04-15 01:06:05 UTC (rev 5053)
+++ complete.html 2010-04-15 07:12:14 UTC (rev 5054)
@@ -17140,7 +17140,7 @@
<dt>Contexts in which this element may be used:</dt>
<dd>As the first or last child of a <code><a href=#the-figure-element>figure</a></code> element.</dd>
<dt>Content model:</dt>
- <dd><a href=#phrasing-content>Phrasing content</a>.</dd>
+ <dd><a href=#flow-content>Flow content</a>.</dd>
<dt>Content attributes:</dt>
<dd><a href=#global-attributes>Global attributes</a></dd>
<dt>DOM interface:</dt>
@@ -68751,8 +68751,9 @@
<p>The <dfn id=dom-websocket-send title=dom-WebSocket-send><code>send(<var title="">data</var>)</code></dfn> method transmits data using the
connection. If the <code title=dom-WebSocket-readyState><a href=#dom-websocket-readystate>readyState</a></code> attribute is
<code title=dom-WebSocket-CONNECTING><a href=#dom-websocket-connecting>CONNECTING</a></code>, it must
- raise an <code><a href=#invalid_state_err>INVALID_STATE_ERR</a></code> exception. If the <var title="">data</var> argument has any unpaired surrogates, then it
- must raise <code><a href=#syntax_err>SYNTAX_ERR</a></code>. If the connection is
+ raise an <code><a href=#invalid_state_err>INVALID_STATE_ERR</a></code> exception. Otherwise, if the
+ <var title="">data</var> argument has any unpaired surrogates, then
+ it must raise <code><a href=#syntax_err>SYNTAX_ERR</a></code>. If the connection is
established, and the string has no unpaired surrogates, and <a href=#the-websocket-closing-handshake-has-started title="the WebSocket closing handshake has started">the WebSocket
closing handshake has not yet started</a>, then the user agent
must <a href=#send-data-using-the-websocket>send <var title="">data</var> using the
@@ -86885,7 +86886,7 @@
<td>Caption for <code><a href=#the-figure-element>figure</a></code></td>
<td>none</td>
<td><code><a href=#the-figure-element>figure</a></code></td>
- <td><a href=#phrasing-content title="Phrasing content">phrasing</a></td>
+ <td><a href=#flow-content title="Flow content">flow</a></td>
<td><a href=#global-attributes title="global attributes">globals</a></td>
<td><code><a href=#htmlelement>HTMLElement</a></code></td>
<tr><th><code><a href=#the-figure-element>figure</a></code></th>
Modified: index
===================================================================
--- index 2010-04-15 01:06:05 UTC (rev 5053)
+++ index 2010-04-15 07:12:14 UTC (rev 5054)
@@ -190,7 +190,7 @@
<header class=head id=head><p><a class=logo href=http://www.whatwg.org/ rel=home><img alt=WHATWG src=/images/logo></a></p>
<hgroup><h1>HTML5 (including next generation additions still in development)</h1>
- <h2 class="no-num no-toc">Draft Standard — 14 April 2010</h2>
+ <h2 class="no-num no-toc">Draft Standard — 15 April 2010</h2>
</hgroup><p>You can take part in this work. <a href=http://www.whatwg.org/mailing-list>Join the working group's discussion list.</a></p>
<p><strong>Web designers!</strong> We have a <a href=http://blog.whatwg.org/faq/>FAQ</a>, a <a href=http://forums.whatwg.org/>forum</a>, and a <a href=http://www.whatwg.org/mailing-list#help>help mailing list</a> for you!</p>
<!--<p class="impl"><strong>Implementors!</strong> We have a <a href="http://www.whatwg.org/mailing-list#implementors">mailing list</a> for you too!</p>-->
@@ -17038,7 +17038,7 @@
<dt>Contexts in which this element may be used:</dt>
<dd>As the first or last child of a <code><a href=#the-figure-element>figure</a></code> element.</dd>
<dt>Content model:</dt>
- <dd><a href=#phrasing-content>Phrasing content</a>.</dd>
+ <dd><a href=#flow-content>Flow content</a>.</dd>
<dt>Content attributes:</dt>
<dd><a href=#global-attributes>Global attributes</a></dd>
<dt>DOM interface:</dt>
@@ -80141,7 +80141,7 @@
<td>Caption for <code><a href=#the-figure-element>figure</a></code></td>
<td>none</td>
<td><code><a href=#the-figure-element>figure</a></code></td>
- <td><a href=#phrasing-content title="Phrasing content">phrasing</a></td>
+ <td><a href=#flow-content title="Flow content">flow</a></td>
<td><a href=#global-attributes title="global attributes">globals</a></td>
<td><code><a href=#htmlelement>HTMLElement</a></code></td>
<tr><th><code><a href=#the-figure-element>figure</a></code></th>
Modified: source
===================================================================
--- source 2010-04-15 01:06:05 UTC (rev 5053)
+++ source 2010-04-15 07:12:14 UTC (rev 5054)
@@ -18103,7 +18103,7 @@
<dt>Contexts in which this element may be used:</dt>
<dd>As the first or last child of a <code>figure</code> element.</dd>
<dt>Content model:</dt>
- <dd><span>Phrasing content</span>.</dd>
+ <dd><span>Flow content</span>.</dd>
<dt>Content attributes:</dt>
<dd><span>Global attributes</span></dd>
<dt>DOM interface:</dt>
@@ -77116,9 +77116,9 @@
connection. If the <code
title="dom-WebSocket-readyState">readyState</code> attribute is
<code title="dom-WebSocket-CONNECTING">CONNECTING</code>, it must
- raise an <code>INVALID_STATE_ERR</code> exception. If the <var
- title="">data</var> argument has any unpaired surrogates, then it
- must raise <code>SYNTAX_ERR</code>. If the connection is
+ raise an <code>INVALID_STATE_ERR</code> exception. Otherwise, if the
+ <var title="">data</var> argument has any unpaired surrogates, then
+ it must raise <code>SYNTAX_ERR</code>. If the connection is
established, and the string has no unpaired surrogates, and <span
title="the WebSocket closing handshake has started">the WebSocket
closing handshake has not yet started</span>, then the user agent
@@ -99075,7 +99075,7 @@
<td>Caption for <code>figure</code></td>
<td>none</td>
<td><code>figure</code></td>
- <td><span title="Phrasing content">phrasing</span></td>
+ <td><span title="Flow content">flow</span></td>
<td><span title="global attributes">globals</span></td>
<td><code>HTMLElement</code></td>
</tr>
More information about the Commit-Watchers
mailing list