W3C home > Mailing lists > Public > public-html-diffs@w3.org > October 2011

hixie: Shake up the publication pipeline a bit. Merge the main two WHATWG specs. Update styles. (whatwg r6619)

From: poot <cvsmail@w3.org>
Date: Tue, 04 Oct 2011 13:01:13 -0400
To: public-html-diffs@w3.org
Message-Id: <E1RB8Mj-0007vF-Pa@jay.w3.org>
hixie: Shake up the publication pipeline a bit. Merge the main two
WHATWG specs. Update styles. (whatwg r6619)

http://dev.w3.org/cvsweb/html5/spec/Overview.html?r1=1.5308&r2=1.5309&f=h
http://html5.org/tools/web-apps-tracker?from=6618&to=6619

===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.5308
retrieving revision 1.5309
diff -u -d -r1.5308 -r1.5309
--- Overview.html	2 Oct 2011 17:27:30 -0000	1.5308
+++ Overview.html	4 Oct 2011 17:00:57 -0000	1.5309
@@ -50,6 +50,7 @@
    dl.domintro dt, dl.domintro dt * { color: black; text-decoration: none; }
    dl.domintro dd { margin: 0.5em 0 1em 2em; padding: 0; }
    dl.domintro dd p { margin: 0.5em 0; }
+   dl.domintro:before { display: table; margin: -1em -0.5em -0.5em auto; width: auto; content: 'This box is non-normative. Implementation requirements are given below this box.'; color: black; font-style: italic; border: solid 2px; background: white; padding: 0 0.25em; }
    dl.switch { padding-left: 2em; }
    dl.switch > dt { text-indent: -1.5em; }
    dl.switch > dt:before { content: '\21AA'; padding: 0 0.5em 0 0; display: inline-block; width: 1em; text-align: right; line-height: 0.5em; }
@@ -296,8 +297,6 @@
      src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
    }
 
-  </style><style type="text/css">
-   .domintro:before { display: table; margin: -1em -0.5em -0.5em auto; width: auto; content: 'This box is non-normative. Implementation requirements are given below this box.'; color: black; font-style: italic; border: solid 2px; background: white; padding: 0 0.25em; }
   </style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20{%20display:%20none;%20}%0Ahtml%20{%20border:%20solid%20yellow;%20}%20.domintro:before%20{%20display:%20none;%20}" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20{%20background:%20%23FFEEEE;%20}%20.domintro:before%20{%20background:%20%23FFEEEE;%20}" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script type="text/javascript">
    function getCookie(name) {
      var params = location.search.substr(1).split("&");
@@ -321,7 +320,7 @@
 
    <h1>HTML5</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-2-october-2011">Editor's Draft 2 October 2011</h2>
+   <h2 class="no-num no-toc" id="editor-s-draft-4-october-2011">Editor's Draft 4 October 2011</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>
@@ -467,7 +466,7 @@
   Group</a> is the W3C working group responsible for this
   specification's progress along the W3C Recommendation
   track.
-  This specification is the 2 October 2011 Editor's Draft.
+  This specification is the 4 October 2011 Editor's Draft.
   </p><!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><p>Work on this specification is also done at the <a href="http://www.whatwg.org/">WHATWG</a>. The W3C HTML working group
   actively pursues convergence with the WHATWG, as required by the <a href="http://www.w3.org/2007/03/HTML-WG-charter">W3C HTML working
   group charter</a>.</p><!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><p>This document was produced by a group operating under the <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5
@@ -1473,8 +1472,8 @@
   they are published as separate specifications. There are also some
   minor differences. For an exact list of differences, please see the
   WHATWG specification.</p><p>A separate document has been published by the W3C HTML working
-  group to document the differences between this specification and the
-  language described in the HTML4 specification. <a href="#refsHTMLDIFF">[HTMLDIFF]</a><h3 id="design-notes"><span class="secno">1.5 </span>Design notes</h3><p><i>This section is non-normative.</i><p>It must be admitted that many aspects of HTML appear at first
+  group to document the differences between the HTML specified in this
+  document and the language described in the HTML4 specification. <a href="#refsHTMLDIFF">[HTMLDIFF]</a><h3 id="design-notes"><span class="secno">1.5 </span>Design notes</h3><p><i>This section is non-normative.</i><p>It must be admitted that many aspects of HTML appear at first
   glance to be nonsensical and inconsistent.<p>HTML, its supporting DOM APIs, as well as many of its supporting
   technologies, have been developed over a period of several decades
   by a wide array of people with different priorities who, in many
@@ -15837,7 +15836,7 @@
    <dt>Contexts in which this element can be used:</dt>
    <dd>Before <code><a href="#the-dd-element">dd</a></code> or <code><a href="#the-dt-element">dt</a></code> elements inside <code><a href="#the-dl-element">dl</a></code> elements.</dd>
    <dt>Content model:</dt>
-   <dd><a href="#phrasing-content">Phrasing content</a>.</dd>
+   <dd><a href="#flow-content">Flow content</a>, but with no <code><a href="#the-header-element">header</a></code>, <code><a href="#the-footer-element">footer</a></code>, <a href="#sectioning-content">sectioning content</a>, or <a href="#heading-content">heading content</a> descendants.</dd>
    <dt>Content attributes:</dt>
    <dd><a href="#global-attributes">Global attributes</a></dd>
    <dt>DOM interface:</dt>
@@ -29633,7 +29632,8 @@
    <dt>Contexts in which this element can be used:</dt>
    <dd>As a child of a <code><a href="#the-tr-element">tr</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>, but with no <code><a href="#the-header-element">header</a></code>, <code><a href="#the-footer-element">footer</a></code>, <a href="#sectioning-content">sectioning content</a>, or <a href="#heading-content">heading content</a> descendants.</dd>
+   
    <dt>Content attributes:</dt>
    <dd><a href="#global-attributes">Global attributes</a></dd>
    <dd><code title="attr-tdth-colspan"><a href="#attr-tdth-colspan">colspan</a></code></dd>
@@ -69519,7 +69519,7 @@
      <td>Legend for corresponding <code><a href="#the-dd-element">dd</a></code> element(s)</td>
      <td>none</td>
      <td><code><a href="#the-dl-element">dl</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-em-element">em</a></code></th>
@@ -70224,7 +70224,7 @@
      <td>Table header cell</td>
      <td>none</td>
      <td><code><a href="#the-tr-element">tr</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>;
          <code title="attr-tdth-colspan"><a href="#attr-tdth-colspan">colspan</a></code>;
          <code title="attr-tdth-rowspan"><a href="#attr-tdth-rowspan">rowspan</a></code>;
Received on Tuesday, 4 October 2011 17:01:15 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Tuesday, 4 October 2011 17:01:16 GMT