HTML5 Tracker

Diff (omit for latest revision)
Filter

Short URL: http://html5.org/r/6619

SVNBugCommentTime (UTC)
6619Shake up the publication pipeline a bit. Merge the main two WHATWG specs. Update styles.2011-10-04 16:57
Index: source
===================================================================
--- source	(revision 6618)
+++ source	(revision 6619)
@@ -72,7 +72,7 @@
   <p>The WHATWG work is all published in one specification
 
 <!--END complete--><!--END epub-->
-  (known as "<a href="http://www.whatwg.org/specs/web-apps/current-work/complete/">Web Applications 1.0</a>"),
+  (known as "<a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/">HTML</a>"),
 <!--END html--><!--END dev-html-->
 <!--START complete--><!--START epub-->
   (the one you are reading right now),
@@ -82,19 +82,19 @@
   including an edition optimized for Web developers
 
 <!--END complete--><!--END epub--><!--END html-->
-  (which you are reading right now),
+  (which you are reading right now).
 <!--END dev-html-->
 <!--START complete--><!--START epub--><!--START html-->
-  (known as <a href="http://developers.whatwg.org/">HTML5</a>),
+  (known as <a href="http://developers.whatwg.org/">HTML5</a>).
 <!--START dev-html-->
 
-  and one which focuses mainly on the core HTML language
+  <!-- and one which focuses mainly on the core HTML language -->
 
 <!--END complete--><!--END epub--><!--END dev-html-->
-  (which you are reading right now).
+  <!-- (which you are reading right now). -->
 <!--END html-->
 <!--START complete--><!--START epub--><!--START dev-html-->
-  (known as the <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/">HTML Living Standard</a>).
+  <!-- (known as the <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/">HTML Living Standard</a>). -->
 <!--START html-->
 
   In addition, two subparts of the specification are republished as
@@ -110,11 +110,14 @@
 <!--END complete--><!--END epub--><!--END dev-html-->
   this specification (the HTML Living Standard).
 <!--END html-->
-<!--START complete--><!--START epub--><!--START dev-html-->
+<!--START complete--><!--START epub-->
+  this specification (the HTML Living Standard).
+<!--END complete--><!--END epub-->
+<!--START dev-html-->
   the <a
   href="http://www.whatwg.org/specs/web-apps/current-work/multipage/">HTML
   Living Standard</a>.
-<!--START html-->
+<!--START html--><!--START complete--><!--START epub-->
 
   </p>
 
@@ -132,6 +135,7 @@
   a whole reach a more mature state.</p>
 -->
 
+
   <h6 class="no-toc">How do the WHATWG and W3C specifications differ?</h6>
 
   <p>The features present in both the WHATWG and W3C specifications
@@ -471,8 +475,8 @@
 <!--START complete--><!--START epub--><!--START html--><!--START dev-html--><!--w3c-html--><!--VERSION-->
 
   <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
+  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></p>
 
 

|