merge from master fix conflicts

w3c · Oct 13, 2017 · 8fe61c6 · 8fe61c6
2 parents 622d11a + 4bb24bf
commit 8fe61c6
Show file tree

Hide file tree

Showing 93 changed files with 26,635 additions and 13,054 deletions.
diff --git a/.bikeshed-include/header.include b/.bikeshed-include/header.include
@@ -21,7 +21,6 @@
   <hr title="Separator for header">
 </div>
 
-<h2 class="no-num no-toc no-ref" id="abstract">Abstract</h2>
 <div class="p-summary" data-fill-with="abstract"></div>
 
 <h2 class="no-num no-toc no-ref" id="status">Status of this document</h2>

diff --git a/.bikeshed-include/status-ED.include b/.bikeshed-include/status-ED.include
@@ -37,7 +37,7 @@
   </p>
   <p>
     This document is governed by the
-        <a id="w3c_process_revision" href="https://www.w3.org/2017/Process-20170301/">1 March 2017
+    <a id="w3c_process_revision" href="https://www.w3.org/2015/Process-20150901/">1 September 2015
     <abbr title="World Wide Web Consortium">W3C</abbr> Process Document</a>.
   </p>
 

diff --git a/.bikeshed-include/status-WD.include b/.bikeshed-include/status-WD.include
@@ -37,7 +37,7 @@
   </p>
   <p>
     This document is governed by the
-    <a id="w3c_process_revision" href="https://www.w3.org/2017/Process-20170301/">1 March 2017
+    <a id="w3c_process_revision" href="https://www.w3.org/2015/Process-20150901/">1 September 2015
     <abbr title="World Wide Web Consortium">W3C</abbr> Process Document</a>.
   </p>