- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Thu, 15 Apr 2010 07:17:25 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec-author-view
In directory hutz:/tmp/cvs-serv20491
Modified Files:
Overview.html grouping-content.html index.html spec.html
Log Message:
Make <figcaption> accept flow again. Also clarify an exception handling case that was ambiguous. (whatwg r5054)
[updated by splitter]
Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/Overview.html,v
retrieving revision 1.894
retrieving revision 1.895
diff -u -d -r1.894 -r1.895
--- Overview.html 14 Apr 2010 22:57:16 -0000 1.894
+++ Overview.html 15 Apr 2010 07:17:22 -0000 1.895
@@ -287,7 +287,7 @@
<h1>HTML5 (Author Edition)</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
- <h2 class="no-num no-toc" id="editor-s-draft-14-april-2010">Editor's Draft 14 April 2010</h2>
+ <h2 class="no-num no-toc" id="editor-s-draft-15-april-2010">Editor's Draft 15 April 2010</h2>
<dl><dt>Latest Published Version:</dt>
<dd><a href="http://www.w3.org/TR/html5/">http://www.w3.org/TR/html5/</a></dd>
<dt>Latest Editor's Draft:</dt>
@@ -305,7 +305,7 @@
</dl><p>This specification is available in the following formats:
<a href="spec.html">single page HTML</a>,
<a href="Overview.html">multipage HTML</a>.
-This is revision 1.4060.
+This is revision 1.4061.
</p>
<p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a>
© 2010 <a href="http://www.w3.org/"><abbr title="World Wide
@@ -394,7 +394,7 @@
specification's progress along the W3C Recommendation
track.
- This specification is the 14 April 2010 Editor's Draft.
+ This specification is the 15 April 2010 Editor's Draft.
</p><!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!-- relationship to other work (required) --><p>The contents of this specification are also part of <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/">a
specification</a> published by the <a href="http://www.whatwg.org/">WHATWG</a>, which is available under a
license that permits reuse of the specification text.</p><!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!-- required patent boilerplate --><p>This document was produced by a group operating under the <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5
Index: grouping-content.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/grouping-content.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- grouping-content.html 14 Apr 2010 22:27:38 -0000 1.35
+++ grouping-content.html 15 Apr 2010 07:17:22 -0000 1.36
@@ -1059,7 +1059,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="content-models.html#phrasing-content">Phrasing content</a>.</dd>
+ <dd><a href="content-models.html#flow-content">Flow content</a>.</dd>
<dt>Content attributes:</dt>
<dd><a href="elements.html#global-attributes">Global attributes</a></dd>
<dt>DOM interface:</dt>
Index: index.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/index.html,v
retrieving revision 1.592
retrieving revision 1.593
diff -u -d -r1.592 -r1.593
--- index.html 13 Apr 2010 09:57:28 -0000 1.592
+++ index.html 15 Apr 2010 07:17:22 -0000 1.593
@@ -653,7 +653,7 @@
<td>Caption for <code><a href="grouping-content.html#the-figure-element">figure</a></code></td>
<td>none</td>
<td><code><a href="grouping-content.html#the-figure-element">figure</a></code></td>
- <td><a href="content-models.html#phrasing-content" title="Phrasing content">phrasing</a></td>
+ <td><a href="content-models.html#flow-content" title="Flow content">flow</a></td>
<td><a href="elements.html#global-attributes" title="global attributes">globals</a></td>
<td><code><a href="elements.html#htmlelement">HTMLElement</a></code></td>
</tr><tr><th><code><a href="grouping-content.html#the-figure-element">figure</a></code></th>
Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/spec.html,v
retrieving revision 1.902
retrieving revision 1.903
diff -u -d -r1.902 -r1.903
--- spec.html 14 Apr 2010 22:57:16 -0000 1.902
+++ spec.html 15 Apr 2010 07:17:23 -0000 1.903
@@ -285,7 +285,7 @@
<h1>HTML5 (Author Edition)</h1>
<h2 class="no-num no-toc" id=a-vocabulary-and-associated-apis-for-html-and-xhtml>A vocabulary and associated APIs for HTML and XHTML</h2>
- <h2 class="no-num no-toc" id=editor-s-draft-14-april-2010>Editor's Draft 14 April 2010</h2>
+ <h2 class="no-num no-toc" id=editor-s-draft-15-april-2010>Editor's Draft 15 April 2010</h2>
<dl><dt>Latest Published Version:</dt>
<dd><a href=http://www.w3.org/TR/html5/>http://www.w3.org/TR/html5/</a></dd>
<dt>Latest Editor's Draft:</dt>
@@ -303,7 +303,7 @@
</dl><p>This specification is available in the following formats:
<a href=spec.html>single page HTML</a>,
<a href=Overview.html>multipage HTML</a>.
-This is revision 1.4060.
+This is revision 1.4061.
</p>
<p class=copyright><a href=http://www.w3.org/Consortium/Legal/ipr-notice#Copyright>Copyright</a>
© 2010 <a href=http://www.w3.org/><abbr title="World Wide
@@ -392,7 +392,7 @@
specification's progress along the W3C Recommendation
track.
- This specification is the 14 April 2010 Editor's Draft.
+ This specification is the 15 April 2010 Editor's Draft.
</p><!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!-- relationship to other work (required) --><p>The contents of this specification are also part of <a href=http://www.whatwg.org/specs/web-apps/current-work/multipage/>a
specification</a> published by the <a href=http://www.whatwg.org/>WHATWG</a>, which is available under a
license that permits reuse of the specification text.</p><!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!-- required patent boilerplate --><p>This document was produced by a group operating under the <a href=http://www.w3.org/Consortium/Patent-Policy-20040205/>5
@@ -7896,7 +7896,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>
@@ -27097,7 +27097,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><tr><th><code><a href=#the-figure-element>figure</a></code></th>
Received on Thursday, 15 April 2010 07:17:27 UTC