- From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 23 Sep 2011 23:42:57 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv12619
Modified Files:
Overview.html
Log Message:
kill the 'formatBlock candidates' category (whatwg r6587)
Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.5280
retrieving revision 1.5281
diff -u -d -r1.5280 -r1.5281
--- Overview.html 23 Sep 2011 23:38:48 -0000 1.5280
+++ Overview.html 23 Sep 2011 23:42:53 -0000 1.5281
@@ -13767,7 +13767,6 @@
</div><h4 id="the-section-element"><span class="secno">4.4.2 </span>The <dfn><code>section</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
<dd><a href="#flow-content">Flow content</a>.</dd>
<dd><a href="#sectioning-content">Sectioning content</a>.</dd>
- <dd><a href="#formatblock-candidate"><code title="">formatBlock</code> candidate</a>.</dd>
<dt>Contexts in which this element can be used:</dt>
<dd>Where <a href="#flow-content">flow content</a> is expected.</dd>
<dt>Content model:</dt>
@@ -13873,7 +13872,6 @@
</div><h4 id="the-nav-element"><span class="secno">4.4.3 </span>The <dfn><code>nav</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
<dd><a href="#flow-content">Flow content</a>.</dd>
<dd><a href="#sectioning-content">Sectioning content</a>.</dd>
- <dd><a href="#formatblock-candidate"><code title="">formatBlock</code> candidate</a>.</dd>
<dt>Contexts in which this element can be used:</dt>
<dd>Where <a href="#flow-content">flow content</a> is expected.</dd>
<dt>Content model:</dt>
@@ -14018,7 +14016,6 @@
</div><h4 id="the-article-element"><span class="secno">4.4.4 </span>The <dfn><code>article</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
<dd><a href="#flow-content">Flow content</a>.</dd>
<dd><a href="#sectioning-content">Sectioning content</a>.</dd>
- <dd><a href="#formatblock-candidate"><code title="">formatBlock</code> candidate</a>.</dd>
<dt>Contexts in which this element can be used:</dt>
<dd>Where <a href="#flow-content">flow content</a> is expected.</dd>
<dt>Content model:</dt>
@@ -14105,7 +14102,6 @@
</div><h4 id="the-aside-element"><span class="secno">4.4.5 </span>The <dfn><code>aside</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
<dd><a href="#flow-content">Flow content</a>.</dd>
<dd><a href="#sectioning-content">Sectioning content</a>.</dd>
- <dd><a href="#formatblock-candidate"><code title="">formatBlock</code> candidate</a>.</dd>
<dt>Contexts in which this element can be used:</dt>
<dd>Where <a href="#flow-content">flow content</a> is expected.</dd>
<dt>Content model:</dt>
@@ -14236,7 +14232,6 @@
</div><h4 id="the-h1-h2-h3-h4-h5-and-h6-elements"><span class="secno">4.4.6 </span>The <dfn id="the-h1-element"><code>h1</code></dfn>, <dfn id="the-h2-element"><code>h2</code></dfn>, <dfn id="the-h3-element"><code>h3</code></dfn>, <dfn id="the-h4-element"><code>h4</code></dfn>, <dfn id="the-h5-element"><code>h5</code></dfn>, and <dfn id="the-h6-element"><code>h6</code></dfn> elements</h4><dl class="element"><dt>Categories</dt>
<dd><a href="#flow-content">Flow content</a>.</dd>
<dd><a href="#heading-content">Heading content</a>.</dd>
- <dd><a href="#formatblock-candidate"><code title="">formatBlock</code> candidate</a>.</dd>
<dt>Contexts in which this element can be used:</dt>
<dd>As a child of an <code><a href="#the-hgroup-element">hgroup</a></code> element.</dd>
<dd>Where <a href="#flow-content">flow content</a> is expected.</dd>
@@ -14288,7 +14283,6 @@
</div><h4 id="the-hgroup-element"><span class="secno">4.4.7 </span>The <dfn><code>hgroup</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
<dd><a href="#flow-content">Flow content</a>.</dd>
<dd><a href="#heading-content">Heading content</a>.</dd>
- <dd><a href="#formatblock-candidate"><code title="">formatBlock</code> candidate</a>.</dd>
<dt>Contexts in which this element can be used:</dt>
<dd>Where <a href="#flow-content">flow content</a> is expected.</dd>
<dt>Content model:</dt>
@@ -14337,7 +14331,6 @@
from the <a href="#outline">outline</a> algorithm.</p>
</div><h4 id="the-header-element"><span class="secno">4.4.8 </span>The <dfn><code>header</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
<dd><a href="#flow-content">Flow content</a>.</dd>
- <dd><a href="#formatblock-candidate"><code title="">formatBlock</code> candidate</a>.</dd>
<dt>Contexts in which this element can be used:</dt>
<dd>Where <a href="#flow-content">flow content</a> is expected.</dd>
<dt>Content model:</dt>
@@ -14420,7 +14413,6 @@
</div><h4 id="the-footer-element"><span class="secno">4.4.9 </span>The <dfn><code>footer</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
<dd><a href="#flow-content">Flow content</a>.</dd>
- <dd><a href="#formatblock-candidate"><code title="">formatBlock</code> candidate</a>.</dd>
<dt>Contexts in which this element can be used:</dt>
<dd>Where <a href="#flow-content">flow content</a> is expected.</dd>
<dt>Content model:</dt>
@@ -14546,7 +14538,6 @@
</div><h4 id="the-address-element"><span class="secno">4.4.10 </span>The <dfn><code>address</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
<dd><a href="#flow-content">Flow content</a>.</dd>
- <dd><a href="#formatblock-candidate"><code title="">formatBlock</code> candidate</a>.</dd>
<dt>Contexts in which this element can be used:</dt>
<dd>Where <a href="#flow-content">flow content</a> is expected.</dd>
<dt>Content model:</dt>
@@ -15115,7 +15106,6 @@
</div><h3 id="grouping-content"><span class="secno">4.5 </span>Grouping content</h3><h4 id="the-p-element"><span class="secno">4.5.1 </span>The <dfn><code>p</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
<dd><a href="#flow-content">Flow content</a>.</dd>
- <dd><a href="#formatblock-candidate"><code title="">formatBlock</code> candidate</a>.</dd>
<dt>Contexts in which this element can be used:</dt>
<dd>Where <a href="#flow-content">flow content</a> is expected.</dd>
<dt>Content model:</dt>
@@ -15271,7 +15261,6 @@
</div><p class="note">The <code><a href="#the-hr-element">hr</a></code> element does not affect the
document's <a href="#outline">outline</a>.<h4 id="the-pre-element"><span class="secno">4.5.3 </span>The <dfn><code>pre</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
<dd><a href="#flow-content">Flow content</a>.</dd>
- <dd><a href="#formatblock-candidate"><code title="">formatBlock</code> candidate</a>.</dd>
<dt>Contexts in which this element can be used:</dt>
<dd>Where <a href="#flow-content">flow content</a> is expected.</dd>
<dt>Content model:</dt>
@@ -15365,7 +15354,6 @@
</div><h4 id="the-blockquote-element"><span class="secno">4.5.4 </span>The <dfn><code>blockquote</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
<dd><a href="#flow-content">Flow content</a>.</dd>
<dd><a href="#sectioning-root">Sectioning root</a>.</dd>
- <dd><a href="#formatblock-candidate"><code title="">formatBlock</code> candidate</a>.</dd>
<dt>Contexts in which this element can be used:</dt>
<dd>Where <a href="#flow-content">flow content</a> is expected.</dd>
<dt>Content model:</dt>
@@ -16054,7 +16042,6 @@
<code><a href="#the-figcaption-element">figcaption</a></code> element's parent <code><a href="#the-figure-element">figure</a></code>
element<span class="impl">, if any</span>.<h4 id="the-div-element"><span class="secno">4.5.13 </span>The <dfn><code>div</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
<dd><a href="#flow-content">Flow content</a>.</dd>
- <dd><a href="#formatblock-candidate"><code title="">formatBlock</code> candidate</a>.</dd>
<dt>Contexts in which this element can be used:</dt>
<dd>Where <a href="#flow-content">flow content</a> is expected.</dd>
<dt>Content model:</dt>
@@ -52854,7 +52841,7 @@
methods are defined in the HTML Editing APIs specification. Text
selections are defined in the DOM Range specification. The
interaction of editing and the undo/redo features in user agents is
- defined by the UndoManager and DOM Transaction specification. <a href="#refsEDITING">[EDITING]</a> <a href="#refsDOMRANGE">[DOMRANGE]</a> <a href="#refsUNDO">[UNDO]</a><p class="XXX">Need to decide what to do with the <dfn id="formatblock-candidate"><code title="">formatBlock</code> candidate</dfn> category.<p class="XXX"><dfn id="undo-transaction-history">undo transaction history</dfn> is currently
+ defined by the UndoManager and DOM Transaction specification. <a href="#refsEDITING">[EDITING]</a> <a href="#refsDOMRANGE">[DOMRANGE]</a> <a href="#refsUNDO">[UNDO]</a><p class="XXX"><dfn id="undo-transaction-history">undo transaction history</dfn> is currently
defined in <a href="#refsUNDO">[UNDO]</a> but this spec hasn't been
updated to make sense with the new definition</p><h4 id="spelling-and-grammar-checking"><span class="secno">7.5.6 </span>Spelling and grammar checking</h4><div class="impl">
@@ -69037,8 +69024,7 @@
<td><code><a href="#htmlelement">HTMLElement</a></code></td>
<tr><th><code><a href="#the-address-element">address</a></code></th>
<td>Contact information for a page or <code><a href="#the-article-element">article</a></code> element</td>
- <td><a href="#flow-content" title="Flow content">flow</a>;
- <a href="#formatblock-candidate" title="formatBlock candidate"><code title="">formatBlock</code> candidate</a></td>
+ <td><a href="#flow-content" title="Flow content">flow</a></td>
<td><a href="#flow-content" title="Flow content">flow</a></td>
<td><a href="#flow-content" title="Flow content">flow</a>*</td>
<td><a href="#global-attributes" title="global attributes">globals</a></td>
@@ -69063,8 +69049,7 @@
<tr><th><code><a href="#the-article-element">article</a></code></th>
<td>Self-contained syndicatable or reusable composition</td>
<td><a href="#flow-content" title="Flow content">flow</a>;
- <a href="#sectioning-content" title="Sectioning content">sectioning</a>;
- <a href="#formatblock-candidate" title="formatBlock candidate"><code title="">formatBlock</code> candidate</a></td>
+ <a href="#sectioning-content" title="Sectioning content">sectioning</a></td>
<td><a href="#flow-content" title="Flow content">flow</a></td>
<td><a href="#flow-content" title="Flow content">flow</a></td>
<td><a href="#global-attributes" title="global attributes">globals</a></td>
@@ -69072,8 +69057,7 @@
<tr><th><code><a href="#the-aside-element">aside</a></code></th>
<td>Sidebar for tangentially related content</td>
<td><a href="#flow-content" title="Flow content">flow</a>;
- <a href="#sectioning-content" title="Sectioning content">sectioning</a>;
- <a href="#formatblock-candidate" title="formatBlock candidate"><code title="">formatBlock</code> candidate</a></td>
+ <a href="#sectioning-content" title="Sectioning content">sectioning</a></td>
<td><a href="#flow-content" title="Flow content">flow</a></td>
<td><a href="#flow-content" title="Flow content">flow</a></td>
<td><a href="#global-attributes" title="global attributes">globals</a></td>
@@ -69133,8 +69117,7 @@
<tr><th><code><a href="#the-blockquote-element">blockquote</a></code></th>
<td>A section quoted from another source</td>
<td><a href="#flow-content" title="Flow content">flow</a>;
- <a href="#sectioning-root" title="Sectioning root">sectioning root</a>;
- <a href="#formatblock-candidate" title="formatBlock candidate"><code title="">formatBlock</code> candidate</a></td>
+ <a href="#sectioning-root" title="Sectioning root">sectioning root</a></td>
<td><a href="#flow-content" title="Flow content">flow</a></td>
<td><a href="#flow-content" title="Flow content">flow</a></td>
<td><a href="#global-attributes" title="global attributes">globals</a>;
@@ -69310,8 +69293,7 @@
<td><code><a href="#htmlelement">HTMLElement</a></code></td>
<tr><th><code><a href="#the-div-element">div</a></code></th>
<td>Generic flow container</td>
- <td><a href="#flow-content" title="Flow content">flow</a>;
- <a href="#formatblock-candidate" title="formatBlock candidate"><code title="">formatBlock</code> candidate</a></td>
+ <td><a href="#flow-content" title="Flow content">flow</a></td>
<td><a href="#flow-content" title="Flow content">flow</a></td>
<td><a href="#flow-content" title="Flow content">flow</a></td>
<td><a href="#global-attributes" title="global attributes">globals</a></td>
@@ -69386,8 +69368,7 @@
<td><code><a href="#htmlelement">HTMLElement</a></code></td>
<tr><th><code><a href="#the-footer-element">footer</a></code></th>
<td>Footer for a page or section</td>
- <td><a href="#flow-content" title="Flow content">flow</a>;
- <a href="#formatblock-candidate" title="formatBlock candidate"><code title="">formatBlock</code> candidate</a></td>
+ <td><a href="#flow-content" title="Flow content">flow</a></td>
<td><a href="#flow-content" title="Flow content">flow</a></td>
<td><a href="#flow-content" title="Flow content">flow</a>*</td>
<td><a href="#global-attributes" title="global attributes">globals</a></td>
@@ -69410,8 +69391,7 @@
<tr><th><code><a href="#the-h1-h2-h3-h4-h5-and-h6-elements">h1</a></code>, <code><a href="#the-h1-h2-h3-h4-h5-and-h6-elements">h2</a></code>, <code><a href="#the-h1-h2-h3-h4-h5-and-h6-elements">h3</a></code>, <code><a href="#the-h1-h2-h3-h4-h5-and-h6-elements">h4</a></code>, <code><a href="#the-h1-h2-h3-h4-h5-and-h6-elements">h5</a></code>, <code><a href="#the-h1-h2-h3-h4-h5-and-h6-elements">h6</a></code></th>
<td>Section heading</td>
<td><a href="#flow-content" title="Flow content">flow</a>;
- <a href="#heading-content" title="Heading content">heading</a>;
- <a href="#formatblock-candidate" title="formatBlock candidate"><code title="">formatBlock</code> candidate</a></td>
+ <a href="#heading-content" title="Heading content">heading</a></td>
<td><code><a href="#the-hgroup-element">hgroup</a></code>;
<a href="#flow-content" title="Flow content">flow</a></td>
<td><a href="#phrasing-content" title="Phrasing content">phrasing</a></td>
@@ -69426,8 +69406,7 @@
<td><code><a href="#htmlheadelement">HTMLHeadElement</a></code></td>
<tr><th><code><a href="#the-header-element">header</a></code></th>
<td>Introductory or navigational aids for a page or section</td>
- <td><a href="#flow-content" title="Flow content">flow</a>;
- <a href="#formatblock-candidate" title="formatBlock candidate"><code title="">formatBlock</code> candidate</a></td>
+ <td><a href="#flow-content" title="Flow content">flow</a></td>
<td><a href="#flow-content" title="Flow content">flow</a></td>
<td><a href="#flow-content" title="Flow content">flow</a>*</td>
<td><a href="#global-attributes" title="global attributes">globals</a></td>
@@ -69435,8 +69414,7 @@
<tr><th><code><a href="#the-hgroup-element">hgroup</a></code></th>
<td>heading group</td>
<td><a href="#flow-content" title="Flow content">flow</a>;
- <a href="#heading-content" title="Heading content">heading</a>;
- <a href="#formatblock-candidate" title="formatBlock candidate"><code title="">formatBlock</code> candidate</a></td>
+ <a href="#heading-content" title="Heading content">heading</a></td>
<td><a href="#flow-content" title="Flow content">flow</a></td>
<td>One or more <code><a href="#the-h1-h2-h3-h4-h5-and-h6-elements">h1</a></code>, <code><a href="#the-h1-h2-h3-h4-h5-and-h6-elements">h2</a></code>, <code><a href="#the-h1-h2-h3-h4-h5-and-h6-elements">h3</a></code>, <code><a href="#the-h1-h2-h3-h4-h5-and-h6-elements">h4</a></code>, <code><a href="#the-h1-h2-h3-h4-h5-and-h6-elements">h5</a></code>, and/or <code><a href="#the-h1-h2-h3-h4-h5-and-h6-elements">h6</a></code></td>
<td><a href="#global-attributes" title="global attributes">globals</a></td>
@@ -69688,8 +69666,7 @@
<tr><th><code><a href="#the-nav-element">nav</a></code></th>
<td>Section with navigational links</td>
<td><a href="#flow-content" title="Flow content">flow</a>;
- <a href="#sectioning-content" title="Sectioning content">sectioning</a>;
- <a href="#formatblock-candidate" title="formatBlock candidate"><code title="">formatBlock</code> candidate</a></td>
+ <a href="#sectioning-content" title="Sectioning content">sectioning</a></td>
<td><a href="#flow-content" title="Flow content">flow</a></td>
<td><a href="#flow-content" title="Flow content">flow</a></td>
<td><a href="#global-attributes" title="global attributes">globals</a></td>
@@ -69774,8 +69751,7 @@
<td><code><a href="#htmloutputelement">HTMLOutputElement</a></code></td>
<tr><th><code><a href="#the-p-element">p</a></code></th>
<td>Paragraph</td>
- <td><a href="#flow-content" title="Flow content">flow</a>;
- <a href="#formatblock-candidate" title="formatBlock candidate"><code title="">formatBlock</code> candidate</a></td>
+ <td><a href="#flow-content" title="Flow content">flow</a></td>
<td><a href="#flow-content" title="Flow content">flow</a></td>
<td><a href="#phrasing-content" title="Phrasing content">phrasing</a></td>
<td><a href="#global-attributes" title="global attributes">globals</a></td>
@@ -69791,8 +69767,7 @@
<td><code><a href="#htmlparamelement">HTMLParamElement</a></code></td>
<tr><th><code><a href="#the-pre-element">pre</a></code></th>
<td>Block of preformatted text</td>
- <td><a href="#flow-content" title="Flow content">flow</a>;
- <a href="#formatblock-candidate" title="formatBlock candidate"><code title="">formatBlock</code> candidate</a></td>
+ <td><a href="#flow-content" title="Flow content">flow</a></td>
<td><a href="#flow-content" title="Flow content">flow</a></td>
<td><a href="#phrasing-content" title="Phrasing content">phrasing</a></td>
<td><a href="#global-attributes" title="global attributes">globals</a></td>
@@ -69876,8 +69851,7 @@
<tr><th><code><a href="#the-section-element">section</a></code></th>
<td>Generic document or application section</td>
<td><a href="#flow-content" title="Flow content">flow</a>;
- <a href="#sectioning-content" title="Sectioning content">sectioning</a>;
- <a href="#formatblock-candidate" title="formatBlock candidate"><code title="">formatBlock</code> candidate</a></td>
+ <a href="#sectioning-content" title="Sectioning content">sectioning</a></td>
<td><a href="#flow-content" title="Flow content">flow</a></td>
<td><a href="#flow-content" title="Flow content">flow</a></td>
<td><a href="#global-attributes" title="global attributes">globals</a></td>
@@ -70442,29 +70416,6 @@
<td>
—
- <tr><td> <a href="#formatblock-candidate" title="formatBlock candidate"><code title="">formatBlock</code> candidates</a>
- <td>
- <code><a href="#the-section-element">section</a></code>;
- <code><a href="#the-nav-element">nav</a></code>;
- <code><a href="#the-article-element">article</a></code>;
- <code><a href="#the-aside-element">aside</a></code>;
- <code><a href="#the-h1-h2-h3-h4-h5-and-h6-elements">h1</a></code>;
- <code><a href="#the-h1-h2-h3-h4-h5-and-h6-elements">h2</a></code>;
- <code><a href="#the-h1-h2-h3-h4-h5-and-h6-elements">h3</a></code>;
- <code><a href="#the-h1-h2-h3-h4-h5-and-h6-elements">h4</a></code>;
- <code><a href="#the-h1-h2-h3-h4-h5-and-h6-elements">h5</a></code>;
- <code><a href="#the-h1-h2-h3-h4-h5-and-h6-elements">h6</a></code>;
- <code><a href="#the-hgroup-element">hgroup</a></code>;
- <code><a href="#the-header-element">header</a></code>;
- <code><a href="#the-footer-element">footer</a></code>;
- <code><a href="#the-address-element">address</a></code>;
- <code><a href="#the-p-element">p</a></code>;
- <code><a href="#the-pre-element">pre</a></code>;
- <code><a href="#the-blockquote-element">blockquote</a></code>;
- <code><a href="#the-div-element">div</a></code>
- <td>
- —
-
</table><h3 class="no-num" id="attributes-1">Attributes</h3><p><i>This section is non-normative.</i><table><caption>List of attributes (excluding event handler content attributes)</caption>
<thead><tr><th> Attribute
<th> Element(s)
Received on Friday, 23 September 2011 23:42:59 UTC