[html5] r4553 - [e] (0) Merge core and vocab specs back together. Fixing http://www.w3.org/Bugs/ [...]
whatwg at whatwg.org
whatwg at whatwg.org
Sat Jan 9 00:52:26 PST 2010
Author: ianh
Date: 2010-01-09 00:52:24 -0800 (Sat, 09 Jan 2010)
New Revision: 4553
Modified:
source
Log:
[e] (0) Merge core and vocab specs back together.
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=8365
Modified: source
===================================================================
--- source 2010-01-09 01:10:21 UTC (rev 4552)
+++ source 2010-01-09 08:52:24 UTC (rev 4553)
@@ -1,5 +1,5 @@
<!--START complete-->
-<!--START html--><!--START html-intro-->
+<!--START html--><!--START w3c-html-->
<h2 id="introduction">Introduction</h2>
@@ -269,7 +269,7 @@
HTML syntax or in XML.</p>
-<!--END html-intro-->
+<!--END w3c-html-->
<h3>Structure of this specification</h3>
<p><i>This section is non-normative.</i></p>
@@ -354,7 +354,7 @@
<!--START html-->
</dd>
-<!--START html-intro-->
+<!--START w3c-html-->
<dt><a href="#syntax">The HTML Syntax</a></dt>
@@ -374,7 +374,7 @@
considerations</a>.</p>
-<!--END html-intro-->
+<!--END w3c-html-->
<h4>How to read this specification</h4>
@@ -384,7 +384,7 @@
picking random sections from the contents list and following all the
cross-references.</p>
-<!--START html-intro-->
+<!--START w3c-html-->
<h4>Typographic conventions</h4>
@@ -675,10 +675,10 @@
<!--PUB-Y--> <p>For the list of HTML5 modules, please see: <a href="http://www.w3.org/TR/">http://www.w3.org/TR/</a></p>
<!--PUB-N--> <p>For the list of HTML5 modules, please see: <a href="http://dev.w3.org/html5/">http://dev.w3.org/html5/</a></p>
-<!--END html-intro-->
+<!--END w3c-html-->
-<!--START complete--><!--START html--><!--START html-core-->
+<!--START complete--><!--START html--><!--START w3c-html-->
<h2 id="infrastructure">Common infrastructure</h2>
@@ -3847,13 +3847,13 @@
<hr>
- <!--END html-core-->
+ <!--END w3c-html-->
<p class="note">The <span title="canvas-context-2d">2D graphics
context</span> has a separate color syntax that also handles
opacity.</p>
- <!--START html-core-->
+ <!--START w3c-html-->
<h4>Space-separated tokens</h4>
@@ -5637,7 +5637,7 @@
</div>
-<!--END html-core--><!--START microdata-->
+<!--END w3c-html--><!--START microdata-->
<h5>HTMLPropertiesCollection</h5>
<p>The <code>HTMLPropertiesCollection</code> interface represents a
@@ -5738,7 +5738,7 @@
elements represented by the object, in <span>tree order</span>.</p>
</div>
-<!--END microdata--><!--START html-core-->
+<!--END microdata--><!--START w3c-html-->
<h4>DOMTokenList</h4>
@@ -6313,8 +6313,8 @@
</div>
-<!--END html-core-->
-<!--START html-vocab-->
+<!--END w3c-html-->
+<!--START w3c-html-->
<h2 id="dom">Semantics, structure, and APIs of HTML documents</h2>
@@ -6405,8 +6405,8 @@
readonly attribute <span>HTMLCollection</span> <span title="dom-document-scripts">scripts</span>;
NodeList <span title="dom-document-getElementsByName">getElementsByName</span>(in DOMString elementName);
NodeList <span title="dom-document-getElementsByClassName">getElementsByClassName</span>(in DOMString classNames);
-<!--END html-vocab--> NodeList <span title="dom-document-getItems">getItems</span>(in optional DOMString typeNames); // <span>microdata</span> <!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION-->
-<!--START html-vocab-->
+<!--END w3c-html--> NodeList <span title="dom-document-getItems">getItems</span>(in optional DOMString typeNames); // <span>microdata</span> <!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION-->
+<!--START w3c-html-->
// <span>dynamic markup insertion</span>
attribute DOMString <span title="dom-innerHTML">innerHTML</span>;
@@ -7497,7 +7497,7 @@
readonly attribute <span>DOMTokenList</span> <span title="dom-classList">classList</span>;
readonly attribute <span>DOMStringMap</span> <span title="dom-dataset">dataset</span>;
-<!--END html-vocab--> // <span>microdata</span> <!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION-->
+<!--END w3c-html--> // <span>microdata</span> <!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION-->
attribute boolean <span title="dom-itemScope">itemScope</span>;
attribute DOMString <span title="dom-itemType">itemType</span>;
attribute DOMString <span title="dom-itemId">itemId</span>;
@@ -7505,7 +7505,7 @@
[PutForwards=<span title="dom-DOMSettableTokenList-value">value</span>] readonly attribute <span>DOMSettableTokenList</span> <span title="dom-itemProp">itemProp</span>;
readonly attribute <span>HTMLPropertiesCollection</span> <span title="dom-properties">properties</span>;
attribute any <span title="dom-itemValue">itemValue</span>;
-<!--START html-vocab-->
+<!--START w3c-html-->
// <span>user interaction</span>
attribute boolean <span title="dom-hidden">hidden</span>;
void <span title="dom-click">click</span>();
@@ -7622,13 +7622,13 @@
<li><code title="attr-draggable">draggable</code></li>
<li><code title="attr-hidden">hidden</code></li>
<li><code title="attr-id">id</code></li>
-<!--END html-vocab--><!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION -->
+<!--END w3c-html--><!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION -->
<li><code title="attr-itemid">itemid</code></li>
<li><code title="attr-itemprop">itemprop</code></li>
<li><code title="attr-itemref">itemref</code></li>
<li><code title="attr-itemscope">itemscope</code></li>
<li><code title="attr-itemtype">itemtype</code></li>
-<!--START html-vocab-->
+<!--START w3c-html-->
<li><code title="attr-lang">lang</code></li>
<li><code title="attr-spellcheck">spellcheck</code></li>
<li><code title="attr-style">style</code></li>
@@ -8602,16 +8602,16 @@
<li><code>kbd</code></li>
<li><code>keygen</code></li>
<li><code>label</code></li>
-<!--END html-vocab-->
+<!--END w3c-html-->
<li><code>link</code> (if the <code title="attr-itemprop">itemprop</code> attribute is present)</li>
-<!--START html-vocab-->
+<!--START w3c-html-->
<li><code>map</code></li>
<li><code>mark</code></li>
<li><code>math</code></li>
<li><code>menu</code></li>
-<!--END html-vocab-->
+<!--END w3c-html-->
<li><code>meta</code> (if the <code title="attr-itemprop">itemprop</code> attribute is present)</li>
-<!--START html-vocab-->
+<!--START w3c-html-->
<li><code>meter</code></li>
<li><code>nav</code></li>
<li><code>noscript</code></li>
@@ -8732,15 +8732,15 @@
<li><code>kbd</code></li>
<li><code>keygen</code></li>
<li><code>label</code></li>
-<!--END html-vocab-->
+<!--END w3c-html-->
<li><code>link</code> (if the <code title="attr-itemprop">itemprop</code> attribute is present)</li>
-<!--START html-vocab-->
+<!--START w3c-html-->
<li><code>map</code> (if it contains only <span>phrasing content</span>)</li>
<li><code>mark</code></li>
<li><code>math</code></li>
-<!--END html-vocab-->
+<!--END w3c-html-->
<li><code>meta</code> (if the <code title="attr-itemprop">itemprop</code> attribute is present)</li>
-<!--START html-vocab-->
+<!--START w3c-html-->
<li><code>meter</code></li>
<li><code>noscript</code></li>
<li><code>object</code></li>
@@ -10991,16 +10991,16 @@
<dl class="element">
<dt>Categories</dt>
<dd><span>Metadata content</span>.</dd>
-<!--END html-vocab-->
+<!--END w3c-html-->
<dd>If the <code title="attr-itemprop">itemprop</code> attribute is present: <span>flow content</span>.</dd>
<dd>If the <code title="attr-itemprop">itemprop</code> attribute is present: <span>phrasing content</span>.</dd>
-<!--START html-vocab-->
+<!--START w3c-html-->
<dt>Contexts in which this element may be used:</dt>
<dd>Where <span>metadata content</span> is expected.</dd>
<dd>In a <code>noscript</code> element that is a child of a <code>head</code> element.</dd>
-<!--END html-vocab-->
+<!--END w3c-html-->
<dd>If the <code title="attr-itemprop">itemprop</code> attribute is present: where <span>phrasing content</span> is expected.</dd>
-<!--START html-vocab-->
+<!--START w3c-html-->
<dt>Content model:</dt>
<dd>Empty.</dd>
<dt>Content attributes:</dt>
@@ -11038,11 +11038,11 @@
attribute is absent, then the element does not define a
link.</span></p>
-<!--END html-vocab-->
+<!--END w3c-html-->
<p>A <code>link</code> element must have either a <code
title="attr-link-rel">rel</code> attribute, or an <code
title="attr-itemprop">itemprop</code> attribute, or both.</p>
-<!--START html-vocab--><!--END html--><!--END complete-->
+<!--START w3c-html--><!--END html--><!--END complete-->
<p>A <code>link</code> element must have <code
title="attr-link-rel">rel</code> attribute.</p>
<!--START html--><!--START complete-->
@@ -11411,19 +11411,19 @@
<dl class="element">
<dt>Categories</dt>
<dd><span>Metadata content</span>.</dd>
-<!--END html-vocab-->
+<!--END w3c-html-->
<dd>If the <code title="attr-itemprop">itemprop</code> attribute is present: <span>flow content</span>.</dd>
<dd>If the <code title="attr-itemprop">itemprop</code> attribute is present: <span>phrasing content</span>.</dd>
-<!--START html-vocab-->
+<!--START w3c-html-->
<dt>Contexts in which this element may be used:</dt>
<dd>If the <code title="attr-meta-charset">charset</code> attribute is present, or if the element's <code title="attr-meta-http-equiv">http-equiv</code> attribute is in the <span title="attr-meta-http-equiv-content-type">Encoding declaration state</span>: in a <code>head</code> element.</dd>
<dd>If the <code title="attr-meta-http-equiv">http-equiv</code> attribute is present but not in the <span title="attr-meta-http-equiv-content-type">Encoding declaration state</span>: in a <code>head</code> element.</dd>
<dd>If the <code title="attr-meta-http-equiv">http-equiv</code> attribute is present but not in the <span title="attr-meta-http-equiv-content-type">Encoding declaration state</span>: in a <code>noscript</code> element that is a child of a <code>head</code> element.</dd>
<dd>If the <code title="attr-meta-name">name</code> attribute is present: where <span>metadata content</span> is expected.</dd>
-<!--END html-vocab-->
+<!--END w3c-html-->
<dd>If the <code title="attr-itemprop">itemprop</code> attribute is present: where <span>metadata content</span> is expected.</dd>
<dd>If the <code title="attr-itemprop">itemprop</code> attribute is present: where <span>phrasing content</span> is expected.</dd>
-<!--START html-vocab-->
+<!--START w3c-html-->
<dt>Content model:</dt>
<dd>Empty.</dd>
<dt>Content attributes:</dt>
@@ -11456,7 +11456,7 @@
the network or for disk storage) with the <code
title="attr-meta-charset">charset</code> attribute.</p>
-<!--END html-vocab-->
+<!--END w3c-html-->
<p>Exactly one of the <code title="attr-meta-name">name</code>,
<code title="attr-meta-http-equiv">http-equiv</code>, <code
title="attr-meta-charset">charset</code>, and <code
@@ -11469,7 +11469,7 @@
title="attr-meta-content">content</code> attribute must also be
specified. Otherwise, it must be omitted.</p>
<!--END html--><!--END complete-->
-<!--START html-vocab-->
+<!--START w3c-html-->
<p>Exactly one of the <code title="attr-meta-name">name</code>,
<code title="attr-meta-http-equiv">http-equiv</code>, and <code
title="attr-meta-charset">charset</code> attributes must be
@@ -25915,7 +25915,7 @@
</dl>
- <!--END html-vocab-->
+ <!--END w3c-html-->
<p>This specification only defines one context, with the name "<code
title="canvas-context-2d">2d</code>". <span class="impl">If <code
@@ -25926,7 +25926,7 @@
define their own contexts, which would return different
objects.</span></p>
- <!--START html-vocab-->
+ <!--START w3c-html-->
<!--END complete--><!--END html-->
<p>Contexts are defined by other specifications.</p>
<!--START complete--><!--START html-->
@@ -26050,7 +26050,7 @@
</div>
- <!--END html-vocab-->
+ <!--END w3c-html-->
<h5>The 2D context</h5>
@@ -29445,7 +29445,7 @@
</script></pre>
<!--END 2dcontext-->
- <!--START html-vocab-->
+ <!--START w3c-html-->
<div class="impl">
@@ -48875,7 +48875,7 @@
</div>
-<!--END html-vocab-->
+<!--END w3c-html-->
<!--START html-device-->
<h4 id="devices">The <dfn><code>device</code></dfn> element</h4>
@@ -49006,7 +49006,7 @@
<!--END html-device-->
-<!--START html-vocab-->
+<!--START w3c-html-->
@@ -49626,7 +49626,7 @@
</div>
-<!--END html-vocab-->
+<!--END w3c-html-->
<h2 id="microdata"><dfn>Microdata</dfn></h2>
@@ -54291,13 +54291,13 @@
<!--END vocabs-->
- <!--START html-vocab-->
+ <!--START w3c-html-->
<div class="impl">
<h3>Converting HTML to other formats</h3>
- <!--END html-vocab-->
+ <!--END w3c-html-->
<h4>JSON</h4>
@@ -54710,7 +54710,7 @@
</ol>
- <!--END microdata--><!--START html-vocab-->
+ <!--END microdata--><!--START w3c-html-->
<h4>Atom</h4>
@@ -55274,10 +55274,10 @@
<!--END microdata-->
-<!--END html-vocab-->
+<!--END w3c-html-->
-<!--START html-core-->
+<!--START w3c-html-->
<h2 id="browsers">Web browsers</h2>
@@ -55956,10 +55956,10 @@
void <span title="dom-print">print</span>();
any <span title="dom-showModalDialog">showModalDialog</span>(in DOMString url, in optional any argument<!--, in optional DOMString features-->);
-<!--END html-core--> // <span>cross-document messaging</span>
+<!--END w3c-html--> // <span>cross-document messaging</span>
void <span title="dom-window-postMessage-2">postMessage</span>(in any message, in DOMString targetOrigin);
void <span title="dom-window-postMessage-3">postMessage</span>(in any message, in <span>MessagePortArray</span> ports, in DOMString targetOrigin);
-<!--START html-core-->
+<!--START w3c-html-->
// <span>event handler IDL attributes</span>
attribute <span>Function</span> <span title="handler-onabort">onabort</span>;
attribute <span>Function</span> <span title="handler-window-onafterprint">onafterprint</span>;
@@ -65835,7 +65835,7 @@
href="#refsWHATWGWIKI">[WHATWGWIKI]</a></p>
-<!--END html--><!--END html-core-->
+<!--END html--><!--END w3c-html-->
<!--END complete-->
<h2 id="storage-and-database">Structured client-side storage APIs</h2>
@@ -67762,7 +67762,7 @@
<!--START complete-->
<!--FIXUP +1-->
- <!--START html--><!--START html-core-->
+ <!--START html--><!--START w3c-html-->
<h2 id="editing"><dfn>User Interaction</dfn></h2>
@@ -70531,7 +70531,7 @@
</li>
-<!--END html-core-->
+<!--END w3c-html-->
<li>
@@ -70546,7 +70546,7 @@
</li>
<!--END complete--><!--END html-->
-<!--START html-core-->
+<!--START w3c-html-->
<li>Perform <dfn>drag-and-drop initialization steps</dfn> defined
in other relevant specificaations.</li>
@@ -72205,7 +72205,7 @@
-->
-<!--END html--><!--END html-core-->
+<!--END html--><!--END w3c-html-->
<h2 id="workers">Web Workers</h2>
@@ -78152,7 +78152,7 @@
<!--END postmsg-->
-<!--START html-vocab-->
+<!--START w3c-html-->
<h2 id="syntax"><dfn>The HTML syntax</dfn></h2>
@@ -93106,7 +93106,7 @@
<p>Fragment identifiers have no meaning with
<code>text/ping</code> resources.</p>
-<!--END html-vocab-->
+<!--END w3c-html-->
<!--END complete--><!--END html--><!--START microdata-->
<h4><dfn><code>application/microdata+json</code></dfn></h4>
@@ -93185,7 +93185,7 @@
semantics as when used with <code>application/json</code>. <a
href="#refsJSON">[JSON]</a></p>
-<!--END microdata--><!--START html-vocab-->
+<!--END microdata--><!--START w3c-html-->
<h3><dfn title="http-ping-from"><code>Ping-From</code></dfn></h3>
@@ -94941,7 +94941,7 @@
<td> <code title="attr-img-ismap">img</code>
<td> Whether the image is a server-side image map
<td> <span>Boolean attribute</span>
-<!--END html-vocab-->
+<!--END w3c-html-->
<tr>
<th> <code title="">itemid</code>
<td> <span title="attr-itemid">HTML elements</span>
@@ -94967,7 +94967,7 @@
<td> <span title="attr-itemtype">HTML elements</span>
<td> <span>Item type</span> of a microdata item
<td> <span title="absolute url">Valid absolute URL</span>*
-<!--START html-vocab-->
+<!--START w3c-html-->
<tr>
<th> <code title="">keytype</code>
<td> <code title="attr-keygen-keytype">keygen</code>
@@ -96443,12 +96443,12 @@
events</a>, <a href="#appcacheevents">application cache events</a>,
and <a href="#dndevents">drag-and-drop events</a>.</p>
-<!--END html-vocab-->
+<!--END w3c-html-->
<!--START complete-->
-<!--START html-device--><!--START microdata--><!--START 2dcontext--><!--START postmsg--><!--START html-intro--><!--START html-core--><!--START html-vocab-->
+<!--START html-device--><!--START microdata--><!--START 2dcontext--><!--START postmsg--><!--START w3c-html-->
<!--START websocket-api--><!--START storage--><!--START database--><!--START eventsource--><!--START workers-->
<!--START vocabs--><!--START vCard--><!--START vEvent--><!--START work-->
@@ -96711,31 +96711,13 @@
<dt id="refsHTML5CORE">[HTML5CORE]</dt>
<!--
- <dd><cite><a href="http://www.w3.org/TR/html-core/">HTML5 Core</a></cite>,
+ <dd><cite><a href="http://www.w3.org/TR/html5/">HTML5</a></cite>,
I. Hickson, D. Hyatt. W3C, April 2009.</dd>
-->
<dd><cite><a
- href="http://dev.w3.org/html5/core/">HTML5 Core</a></cite>,
+ href="http://dev.w3.org/html5/spec/">HTML5</a></cite>,
I. Hickson, D. Hyatt. W3C, January 2010.</dd>
- <dt id="refsHTML5INTRO">[HTML5INTRO]</dt>
- <!--
- <dd><cite><a href="http://www.w3.org/TR/html5/">HTML5 Introduction</a></cite>,
- I. Hickson, D. Hyatt. W3C, April 2009.</dd>
- -->
- <dd><cite><a
- href="http://dev.w3.org/html5/spec/">HTML5 Introduction</a></cite>,
- I. Hickson, D. Hyatt. W3C, January 2010.</dd>
-
- <dt id="refsHTML5VOCAB">[HTML5VOCAB]</dt>
- <!--
- <dd><cite><a href="http://www.w3.org/TR/html-vocabulary/">HTML5 Vocabulary</a></cite>,
- I. Hickson, D. Hyatt. W3C, April 2009.</dd>
- -->
- <dd><cite><a
- href="http://dev.w3.org/html5/vocabulary/">HTML5 Vocabulary</a></cite>,
- I. Hickson, D. Hyatt. W3C, January 2010.</dd>
-
<dt id="refsHTMLDIFF">[HTMLDIFF]</dt>
<!--
<dd>(Non-normative) <cite><a
@@ -97263,9 +97245,9 @@
<!--END vocabs--><!--END vCard--><!--END vEvent--><!--END work-->
<!--END websocket-api--><!--END storage--><!--END database--><!--END eventsource--><!--END workers-->
-<!--END html-device--><!--END microdata--><!--END 2dcontext--><!--END postmsg--><!--END html-intro--><!--END html-core--><!--END html-vocab-->
+<!--END html-device--><!--END microdata--><!--END 2dcontext--><!--END postmsg--><!--END w3c-html-->
-<!--START html-intro-->
+<!--START w3c-html-->
<h2 class="no-num">Acknowledgements</h2> <!-- ACKS -->
@@ -97778,7 +97760,7 @@
<p>Thanks to the many sources that provided inspiration for the
examples used in the specification.</p>
- <!--END html--><!--END html-intro-->
+ <!--END html--><!--END w3c-html-->
<div itemscope itemtype="http://n.whatwg.org/work">
<p>The abstract is based on <a itemprop="work" href="http://www.flickr.com/photos/wonderlane/2986252088/">a photo</a>
@@ -97786,7 +97768,7 @@
(<a itemprop="license" href="http://creativecommons.org/licenses/by/2.0/">CC BY 2.0</a>)
</div>
- <!--START html--><!--START html-intro-->
+ <!--START html--><!--START w3c-html-->
<p>Thanks also to the Microsoft blogging community for some ideas,
to the attendees of the W3C Workshop on Web Applications and
@@ -97950,5 +97932,5 @@
-->
</body>
</html>
-<!--END html--><!--END html-intro-->
+<!--END html--><!--END w3c-html-->
<!--END complete-->
More information about the Commit-Watchers
mailing list