[cssom*] merge

Author: Simon Pieters

css3-page/Overview.html

@@ -9,11 +9,8 @@
    rel=dcterms.rights>
   <meta content=" CSS Paged Media Module Level 3" name=dcterms.title>
   <meta content=text name=dcterms.type>
-  <meta content=2013-03-13 name=dcterms.issued>
-  <meta content="Melinda Grant" name=dcterms.creator>
-  <meta content="Håkon Wium Lie" name=dcterms.creator>
-  <meta content="Elika J. Etemad" name=dcterms.creator>
-  <meta content="Simon Sapin" name=dcterms.creator>
+  <meta content=2013-03-15 name=dcterms.issued>
+  <meta content="http://dev.w3.org/csswg/css3-page/" name=dcterms.creator>
   <meta content=W3C name=dcterms.publisher>
   <meta content="http://dev.w3.org/csswg/css3-page/" name=dcterms.identifier>
   <meta content="text/html; charset=utf-8" http-equiv=Content-Type>
@@ -100,25 +97,30 @@
     <h1 class=p-name>CSS Paged Media Module Level 3</h1>
 
     <h2 class="no-num no-toc" id=w3c-working>Editor's Draft <span
-     class=dt-updated><span class=value-title title=20130313>13 March
+     class=dt-updated><span class=value-title title=20130315>15 March
      2013</span></span></h2>
 
     <dl>
      <dt>This version:
 
      <dd><a class=u-url
       href="http://dev.w3.org/csswg/css3-page/">http://dev.w3.org/csswg/css3-page/</a></dd>
-     <!-- <dd><a class="u-url" href="http://dev.w3.org/csswg/css3-page/">http://www.w3.org/TR/2013/WD-css3-page-20130313</a></dd> -->
+     <!-- <dd><a class="u-url" href="http://dev.w3.org/csswg/css3-page/">http://www.w3.org/TR/2013/WD-css3-page-20130315</a></dd> -->
 
      <dt>Latest version:
 
      <dd><a
       href="http://www.w3.org/TR/css3-page/">http://www.w3.org/TR/css3-page/</a>
 
+     <dt>Editor’s Draft:
+
+     <dd><a
+      href="http://dev.w3.org/csswg/css3-page/">http://dev.w3.org/csswg/css3-page/</a>
+
      <dt>Previous version:
 
-     <dd><a href="http://www.w3.org/TR/2006/WD-css3-page-20061010/"
-      rel=previous>http://www.w3.org/TR/2006/WD-css3-page-20061010/</a>
+     <dd><a href="http://www.w3.org/TR/2013/WD-css3-page-20130314/"
+      rel=previous>http://www.w3.org/TR/2013/WD-css3-page-20130314/</a>
 
      <dt>Issue Tracking:
 
@@ -197,20 +199,22 @@ <h2 class="no-num no-toc" id=status>Status of this Document</h2>
     text “css3-page” in the subject, preferably like this:
     “[<!---->css3-page<!---->] <em>…summary of comment…</em>”
 
-   <p>This document was produced by the <a href="/Style/CSS/members">CSS
-    Working Group</a> (part of the <a href="/Style/">Style Activity</a>).
+   <p>This document was produced by the <a
+    href="http://www.w3.org/Style/CSS/members">CSS Working Group</a> (part of
+    the <a href="http://www.w3.org/Style/">Style Activity</a>).
 
    <p>This document was produced by a group operating under the <a
-    href="/Consortium/Patent-Policy-20040205/">5 February 2004 W3C Patent
-    Policy</a>. W3C maintains a <a href="/2004/01/pp-impl/32061/status"
+    href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5 February
+    2004 W3C Patent Policy</a>. W3C maintains a <a
+    href="http://www.w3.org/2004/01/pp-impl/32061/status"
     rel=disclosure>public list of any patent disclosures</a> made in
     connection with the deliverables of the group; that page also includes
     instructions for disclosing a patent. An individual who has actual
     knowledge of a patent which the individual believes contains <a
-    href="/Consortium/Patent-Policy-20040205/#def-essential">Essential
+    href="http://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential">Essential
     Claim(s)</a> must disclose the information in accordance with <a
-    href="/Consortium/Patent-Policy-20040205/#sec-Disclosure">section 6 of
-    the W3C Patent Policy</a>.</p>
+    href="http://www.w3.org/Consortium/Patent-Policy-20040205/#sec-Disclosure">section
+    6 of the W3C Patent Policy</a>.</p>
    <!--end-status-->
    <h2 class="no-num no-toc" id=contents>Table of Contents</h2>
    <!--begin-toc-->

css3-page/Overview.src.html

@@ -85,12 +85,22 @@
 <h1 class="p-name">CSS Paged Media Module Level 3</h1>
 <h2 class="no-num no-toc" id="w3c-working">[LONGSTATUS] <span class="dt-updated"><span class="value-title" title="[CDATE]">[DATE]</span></span></h2>
 <dl>
-  <dt>This version:</dt>    <dd><a class="u-url" href="http://dev.w3.org/csswg/css3-page/">http://dev.w3.org/csswg/css3-page/</a></dd>
+  <dt>This version:</dt>
+  <dd><a class="u-url" href="http://dev.w3.org/csswg/css3-page/">http://dev.w3.org/csswg/css3-page/</a></dd>
     <!-- <dd><a class="u-url" href="[VERSION]">http://www.w3.org/TR/[YEAR]/WD-[SHORTNAME]-[CDATE]</a></dd> -->
-  <dt>Latest version:</dt>    <dd><a href="http://www.w3.org/TR/css3-page/">http://www.w3.org/TR/css3-page/</a></dd>
-  <dt>Previous version:</dt>    <dd><a rel="previous" href="http://www.w3.org/TR/2006/WD-css3-page-20061010/">http://www.w3.org/TR/2006/WD-css3-page-20061010/</a></dd>
+
+  <dt>Latest version:</dt>
+  <dd><a href="http://www.w3.org/TR/css3-page/">http://www.w3.org/TR/css3-page/</a></dd>
+
+  <dt>Editor’s Draft:</dt>
+  <dd><a href="http://dev.w3.org/csswg/css3-page/">http://dev.w3.org/csswg/css3-page/</a></dd>
+
+  <dt>Previous version:</dt>
+  <dd><a rel="previous" href="http://www.w3.org/TR/2013/WD-css3-page-20130314/">http://www.w3.org/TR/2013/WD-css3-page-20130314/</a></dd>
+
   <dt>Issue Tracking:</dt>
-    <dd><a rel="issues" href="http://www.w3.org/Style/CSS/Tracker/products/13">http://www.w3.org/Style/CSS/Tracker/products/13</a>
+  <dd><a rel="issues" href="http://www.w3.org/Style/CSS/Tracker/products/13">http://www.w3.org/Style/CSS/Tracker/products/13</a>
+
   <dt>Feedback:</dt>
     <dd><a href="mailto:www-style@w3.org?subject=%5B[SHORTNAME]%5D%20feedback"
          >www-style@w3.org</a>